aboutsummaryrefslogtreecommitdiff
path: root/keyboards/jian
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/jian')
-rw-r--r--keyboards/jian/handwired/keyboard.json (renamed from keyboards/jian/handwired/info.json)0
-rw-r--r--keyboards/jian/handwired/rules.mk6
-rw-r--r--keyboards/jian/info.json3
-rw-r--r--keyboards/jian/nsrev2/config.h28
-rw-r--r--keyboards/jian/nsrev2/keyboard.json (renamed from keyboards/jian/nsrev2/info.json)3
-rw-r--r--keyboards/jian/nsrev2/nsrev2.c6
-rw-r--r--keyboards/jian/nsrev2/rules.mk7
-rw-r--r--keyboards/jian/rev1/config.h28
-rw-r--r--keyboards/jian/rev1/keyboard.json (renamed from keyboards/jian/rev1/info.json)8
-rw-r--r--keyboards/jian/rev1/rev1.c6
-rw-r--r--keyboards/jian/rev1/rules.mk8
-rw-r--r--keyboards/jian/rev2/config.h28
-rw-r--r--keyboards/jian/rev2/keyboard.json (renamed from keyboards/jian/rev2/info.json)5
-rw-r--r--keyboards/jian/rev2/rev2.c6
-rw-r--r--keyboards/jian/rev2/rules.mk7
-rw-r--r--keyboards/jian/rules.mk1
16 files changed, 70 insertions, 80 deletions
diff --git a/keyboards/jian/handwired/info.json b/keyboards/jian/handwired/keyboard.json
index dc68963b6b..dc68963b6b 100644
--- a/keyboards/jian/handwired/info.json
+++ b/keyboards/jian/handwired/keyboard.json
diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk
deleted file mode 100644
index 947cf02038..0000000000
--- a/keyboards/jian/handwired/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-SPLIT_KEYBOARD = no
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/info.json b/keyboards/jian/info.json
index f0b0261dc9..c9f6f46c1a 100644
--- a/keyboards/jian/info.json
+++ b/keyboards/jian/info.json
@@ -5,5 +5,8 @@
"usb": {
"vid": "0xC0DE",
"pid": "0x1337"
+ },
+ "build": {
+ "lto": true
}
}
diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
index 7df400367f..48d76bd8a3 100644
--- a/keyboards/jian/nsrev2/config.h
+++ b/keyboards/jian/nsrev2/config.h
@@ -57,33 +57,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// (Doesn't work on mac. There is no num lock, so it will be always off and lit)
#ifdef NUM_NMOSFET
-#define RESET_NUM_LOCK_LED() writePinLow(NUM_LOCK_LED_PIN)
+#define RESET_NUM_LOCK_LED() gpio_write_pin_low(NUM_LOCK_LED_PIN)
#ifdef NUM_INVERT
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock)
#else
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock)
#endif // NUM_INVERT
#else
-#define RESET_NUM_LOCK_LED() writePinHigh(NUM_LOCK_LED_PIN)
+#define RESET_NUM_LOCK_LED() gpio_write_pin_high(NUM_LOCK_LED_PIN)
#ifdef NUM_INVERT
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock)
#else
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock)
#endif // NUM_INVERT
#endif // NUM_NMOSFET
#ifdef CAPS_NMOSFET
-#define RESET_CAPS_LOCK_LED() writePinLow(CAPS_LOCK_LED_PIN)
-#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock)
+#define RESET_CAPS_LOCK_LED() gpio_write_pin_low(CAPS_LOCK_LED_PIN)
+#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, led_state.caps_lock)
#else
-#define RESET_CAPS_LOCK_LED() writePinHigh(CAPS_LOCK_LED_PIN)
-#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock)
+#define RESET_CAPS_LOCK_LED() gpio_write_pin_high(CAPS_LOCK_LED_PIN)
+#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock)
#endif // CAPS_NMOSFET
#ifdef SCROLL_NMOSFET
-#define RESET_SCROLL_LOCK_LED() writePinLow(SCROLL_LOCK_LED_PIN)
-#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock)
+#define RESET_SCROLL_LOCK_LED() gpio_write_pin_low(SCROLL_LOCK_LED_PIN)
+#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock)
#else
-#define RESET_SCROLL_LOCK_LED() writePinHigh(SCROLL_LOCK_LED_PIN)
-#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock)
+#define RESET_SCROLL_LOCK_LED() gpio_write_pin_high(SCROLL_LOCK_LED_PIN)
+#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock)
#endif // SCROLL_NMOSFET
diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/keyboard.json
index 4ea315f51e..2981adf9b5 100644
--- a/keyboards/jian/nsrev2/info.json
+++ b/keyboards/jian/nsrev2/keyboard.json
@@ -40,6 +40,9 @@
},
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
+ "features": {
+ "backlight": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jian/nsrev2/nsrev2.c b/keyboards/jian/nsrev2/nsrev2.c
index 1b65d4f016..50883ff211 100644
--- a/keyboards/jian/nsrev2/nsrev2.c
+++ b/keyboards/jian/nsrev2/nsrev2.c
@@ -36,15 +36,15 @@ void suspend_wakeup_init_kb(void) {
void led_init_kb(void)
{
#ifdef NUM_LOCK_LED_PIN
- setPinOutput(NUM_LOCK_LED_PIN);
+ gpio_set_pin_output(NUM_LOCK_LED_PIN);
RESET_NUM_LOCK_LED();
#endif // NUM_LOCK_LED_PIN
#ifdef CAPS_LOCK_LED_PIN
- setPinOutput(CAPS_LOCK_LED_PIN);
+ gpio_set_pin_output(CAPS_LOCK_LED_PIN);
RESET_CAPS_LOCK_LED();
#endif // CAPS_LOCK_LED_PIN
#ifdef SCROLL_LOCK_LED_PIN
- setPinOutput(SCROLL_LOCK_LED_PIN);
+ gpio_set_pin_output(SCROLL_LOCK_LED_PIN);
RESET_SCROLL_LOCK_LED();
#endif // SCROLL_LOCK_LED_PIN
}
diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk
deleted file mode 100644
index 3d0af8ae98..0000000000
--- a/keyboards/jian/nsrev2/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-CONSOLE_ENABLE = no
-SPLIT_KEYBOARD = no
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
index fcdf59f044..7ee2effd51 100644
--- a/keyboards/jian/rev1/config.h
+++ b/keyboards/jian/rev1/config.h
@@ -39,35 +39,35 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// (Doesn't work on mac. There is no num lock, so it will be always off and lit)
#ifdef NUM_NMOSFET
-#define RESET_NUM_LOCK_LED() writePinLow(NUM_LOCK_LED_PIN)
+#define RESET_NUM_LOCK_LED() gpio_write_pin_low(NUM_LOCK_LED_PIN)
#ifdef NUM_INVERT
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock)
#else
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock)
#endif // NUM_INVERT
#else
-#define RESET_NUM_LOCK_LED() writePinHigh(NUM_LOCK_LED_PIN)
+#define RESET_NUM_LOCK_LED() gpio_write_pin_high(NUM_LOCK_LED_PIN)
#ifdef NUM_INVERT
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock)
#else
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock)
#endif // NUM_INVERT
#endif // NUM_NMOSFET
#ifdef CAPS_NMOSFET
-#define RESET_CAPS_LOCK_LED() writePinLow(CAPS_LOCK_LED_PIN)
-#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock)
+#define RESET_CAPS_LOCK_LED() gpio_write_pin_low(CAPS_LOCK_LED_PIN)
+#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, led_state.caps_lock)
#else
-#define RESET_CAPS_LOCK_LED() writePinHigh(CAPS_LOCK_LED_PIN)
-#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock)
+#define RESET_CAPS_LOCK_LED() gpio_write_pin_high(CAPS_LOCK_LED_PIN)
+#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock)
#endif // CAPS_NMOSFET
#ifdef SCROLL_NMOSFET
-#define RESET_SCROLL_LOCK_LED() writePinLow(SCROLL_LOCK_LED_PIN)
-#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock)
+#define RESET_SCROLL_LOCK_LED() gpio_write_pin_low(SCROLL_LOCK_LED_PIN)
+#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock)
#else
-#define RESET_SCROLL_LOCK_LED() writePinHigh(SCROLL_LOCK_LED_PIN)
-#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock)
+#define RESET_SCROLL_LOCK_LED() gpio_write_pin_high(SCROLL_LOCK_LED_PIN)
+#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock)
#endif // SCROLL_NMOSFET
#define RGBLIGHT_TIMER
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/keyboard.json
index 68a6efe47b..1a8957d8b3 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/keyboard.json
@@ -3,6 +3,9 @@
"usb": {
"device_version": "1.0.0"
},
+ "split": {
+ "enabled": true
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D3", "D2", "E6", "B4"]
@@ -41,6 +44,11 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "backlight": true,
+ "rgblight": true,
+ "dip_switch": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jian/rev1/rev1.c b/keyboards/jian/rev1/rev1.c
index 1b77aa53c4..1563c40916 100644
--- a/keyboards/jian/rev1/rev1.c
+++ b/keyboards/jian/rev1/rev1.c
@@ -36,15 +36,15 @@ void suspend_wakeup_init_kb(void) {
void led_init_kb(void)
{
#ifdef NUM_LOCK_LED_PIN
- setPinOutput(NUM_LOCK_LED_PIN);
+ gpio_set_pin_output(NUM_LOCK_LED_PIN);
RESET_NUM_LOCK_LED();
#endif // NUM_LOCK_LED_PIN
#ifdef CAPS_LOCK_LED_PIN
- setPinOutput(CAPS_LOCK_LED_PIN);
+ gpio_set_pin_output(CAPS_LOCK_LED_PIN);
RESET_CAPS_LOCK_LED();
#endif // CAPS_LOCK_LED_PIN
#ifdef SCROLL_LOCK_LED_PIN
- setPinOutput(SCROLL_LOCK_LED_PIN);
+ gpio_set_pin_output(SCROLL_LOCK_LED_PIN);
RESET_SCROLL_LOCK_LED();
#endif // SCROLL_LOCK_LED_PIN
}
diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk
deleted file mode 100644
index 33588c1755..0000000000
--- a/keyboards/jian/rev1/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-CONSOLE_ENABLE = no
-SPLIT_KEYBOARD = yes
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
index 091605665e..33ba0ecbc5 100644
--- a/keyboards/jian/rev2/config.h
+++ b/keyboards/jian/rev2/config.h
@@ -45,33 +45,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// (Doesn't work on mac. There is no num lock, so it will be always off and lit)
#ifdef NUM_NMOSFET
-#define RESET_NUM_LOCK_LED() writePinLow(NUM_LOCK_LED_PIN)
+#define RESET_NUM_LOCK_LED() gpio_write_pin_low(NUM_LOCK_LED_PIN)
#ifdef NUM_INVERT
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock)
#else
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock)
#endif // NUM_INVERT
#else
-#define RESET_NUM_LOCK_LED() writePinHigh(NUM_LOCK_LED_PIN)
+#define RESET_NUM_LOCK_LED() gpio_write_pin_high(NUM_LOCK_LED_PIN)
#ifdef NUM_INVERT
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, led_state.num_lock)
#else
-#define UPDATE_NUM_LOCK_LED() writePin(NUM_LOCK_LED_PIN, !led_state.num_lock)
+#define UPDATE_NUM_LOCK_LED() gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock)
#endif // NUM_INVERT
#endif // NUM_NMOSFET
#ifdef CAPS_NMOSFET
-#define RESET_CAPS_LOCK_LED() writePinLow(CAPS_LOCK_LED_PIN)
-#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, led_state.caps_lock)
+#define RESET_CAPS_LOCK_LED() gpio_write_pin_low(CAPS_LOCK_LED_PIN)
+#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, led_state.caps_lock)
#else
-#define RESET_CAPS_LOCK_LED() writePinHigh(CAPS_LOCK_LED_PIN)
-#define UPDATE_CAPS_LOCK_LED() writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock)
+#define RESET_CAPS_LOCK_LED() gpio_write_pin_high(CAPS_LOCK_LED_PIN)
+#define UPDATE_CAPS_LOCK_LED() gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock)
#endif // CAPS_NMOSFET
#ifdef SCROLL_NMOSFET
-#define RESET_SCROLL_LOCK_LED() writePinLow(SCROLL_LOCK_LED_PIN)
-#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock)
+#define RESET_SCROLL_LOCK_LED() gpio_write_pin_low(SCROLL_LOCK_LED_PIN)
+#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, led_state.scroll_lock)
#else
-#define RESET_SCROLL_LOCK_LED() writePinHigh(SCROLL_LOCK_LED_PIN)
-#define UPDATE_SCROLL_LOCK_LED() writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock)
+#define RESET_SCROLL_LOCK_LED() gpio_write_pin_high(SCROLL_LOCK_LED_PIN)
+#define UPDATE_SCROLL_LOCK_LED() gpio_write_pin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock)
#endif // SCROLL_NMOSFET
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/keyboard.json
index cfcfc8e2fa..e64df224a5 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/keyboard.json
@@ -38,10 +38,15 @@
"esc_output": "D3"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D1"
},
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
+ "features": {
+ "backlight": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/jian/rev2/rev2.c b/keyboards/jian/rev2/rev2.c
index 1b65d4f016..50883ff211 100644
--- a/keyboards/jian/rev2/rev2.c
+++ b/keyboards/jian/rev2/rev2.c
@@ -36,15 +36,15 @@ void suspend_wakeup_init_kb(void) {
void led_init_kb(void)
{
#ifdef NUM_LOCK_LED_PIN
- setPinOutput(NUM_LOCK_LED_PIN);
+ gpio_set_pin_output(NUM_LOCK_LED_PIN);
RESET_NUM_LOCK_LED();
#endif // NUM_LOCK_LED_PIN
#ifdef CAPS_LOCK_LED_PIN
- setPinOutput(CAPS_LOCK_LED_PIN);
+ gpio_set_pin_output(CAPS_LOCK_LED_PIN);
RESET_CAPS_LOCK_LED();
#endif // CAPS_LOCK_LED_PIN
#ifdef SCROLL_LOCK_LED_PIN
- setPinOutput(SCROLL_LOCK_LED_PIN);
+ gpio_set_pin_output(SCROLL_LOCK_LED_PIN);
RESET_SCROLL_LOCK_LED();
#endif // SCROLL_LOCK_LED_PIN
}
diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk
deleted file mode 100644
index 8e6da2d84f..0000000000
--- a/keyboards/jian/rev2/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-CONSOLE_ENABLE = no
-SPLIT_KEYBOARD = yes
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/jian/rules.mk b/keyboards/jian/rules.mk
index 7227083305..c19fa00b5c 100644
--- a/keyboards/jian/rules.mk
+++ b/keyboards/jian/rules.mk
@@ -1,2 +1 @@
DEFAULT_FOLDER = jian/rev2
-LTO_ENABLE = yes