aboutsummaryrefslogtreecommitdiff
path: root/keyboards/org60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/org60')
-rw-r--r--keyboards/org60/keyboard.json (renamed from keyboards/org60/info.json)10
-rw-r--r--keyboards/org60/keymaps/default/keymap.c2
-rw-r--r--keyboards/org60/org60.h21
-rw-r--r--keyboards/org60/rules.mk12
4 files changed, 28 insertions, 17 deletions
diff --git a/keyboards/org60/info.json b/keyboards/org60/keyboard.json
index 2e45997524..d4994346af 100644
--- a/keyboards/org60/info.json
+++ b/keyboards/org60/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/org60/keymaps/default/keymap.c b/keyboards/org60/keymaps/default/keymap.c
index 91f21d2d6b..666f61ca83 100644
--- a/keyboards/org60/keymaps/default/keymap.c
+++ b/keyboards/org60/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// 1: Function Layer
LAYOUT(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
+ QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP,KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_RSFT, KC_NO ,KC_PGUP, KC_INS,
diff --git a/keyboards/org60/org60.h b/keyboards/org60/org60.h
index 49687c8716..1fa92dceb2 100644
--- a/keyboards/org60/org60.h
+++ b/keyboards/org60/org60.h
@@ -3,6 +3,9 @@
#include "quantum.h"
#include "led.h"
+#define ORG60_CAPS_LOCK_LED_PIN B2
+#define ORG60_BACKLIGHT_PIN F5
+
/* Org60 LEDs
* GPIO pads
* 0 F7 not connected
@@ -12,8 +15,18 @@
* B2 Capslock LED
* B0 not connected
*/
-inline void org60_caps_led_on(void) { DDRB |= (1<<2); PORTB &= ~(1<<2); }
-inline void org60_bl_led_on(void) { DDRF |= (1<<5); PORTF &= ~(1<<5); }
+inline void org60_caps_led_on(void) {
+ gpio_set_pin_output(ORG60_CAPS_LOCK_LED_PIN);
+ gpio_write_pin_low(ORG60_CAPS_LOCK_LED_PIN);
+}
+inline void org60_bl_led_on(void) {
+ gpio_set_pin_output(ORG60_BACKLIGHT_PIN);
+ gpio_write_pin_low(ORG60_BACKLIGHT_PIN);
+}
-inline void org60_caps_led_off(void) { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
-inline void org60_bl_led_off(void) { DDRF &= ~(1<<5); PORTF &= ~(1<<5); }
+inline void org60_caps_led_off(void) {
+ gpio_set_pin_input(ORG60_CAPS_LOCK_LED_PIN);
+}
+inline void org60_bl_led_off(void) {
+ gpio_set_pin_input(ORG60_BACKLIGHT_PIN);
+}
diff --git a/keyboards/org60/rules.mk b/keyboards/org60/rules.mk
deleted file mode 100644
index d22d1cd2f4..0000000000
--- a/keyboards/org60/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-AUDIO_ENABLE = no # Audio output
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-COMMAND_ENABLE = no # Commands for debug and configuration
-CONSOLE_ENABLE = no # Console for debug
-EXTRAKEY_ENABLE = yes # Audio control and System control
-MOUSEKEY_ENABLE = yes # Mouse keys
-NKRO_ENABLE = yes # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.