aboutsummaryrefslogtreecommitdiff
path: root/keyboards/kprepublic
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kprepublic')
-rw-r--r--keyboards/kprepublic/bm16a/v1/keyboard.json (renamed from keyboards/kprepublic/bm16a/v1/info.json)3
-rw-r--r--keyboards/kprepublic/bm16a/v1/rules.mk1
-rw-r--r--keyboards/kprepublic/bm16a/v2/config.h4
-rw-r--r--keyboards/kprepublic/bm16a/v2/keyboard.json (renamed from keyboards/kprepublic/bm16a/v2/info.json)0
-rw-r--r--keyboards/kprepublic/bm16a/v2/rules.mk0
-rw-r--r--keyboards/kprepublic/bm16s/keyboard.json (renamed from keyboards/kprepublic/bm16s/info.json)9
-rwxr-xr-xkeyboards/kprepublic/bm16s/rules.mk12
-rw-r--r--keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json (renamed from keyboards/kprepublic/bm40hsrgb/rev1/info.json)9
-rwxr-xr-xkeyboards/kprepublic/bm40hsrgb/rev1/rules.mk12
-rw-r--r--keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json (renamed from keyboards/kprepublic/bm40hsrgb/rev2/info.json)4
-rw-r--r--keyboards/kprepublic/bm40hsrgb/rev2/rules.mk0
-rw-r--r--keyboards/kprepublic/bm43a/keyboard.json (renamed from keyboards/kprepublic/bm43a/info.json)8
-rw-r--r--keyboards/kprepublic/bm43a/rules.mk12
-rwxr-xr-xkeyboards/kprepublic/bm43hsrgb/keyboard.json (renamed from keyboards/kprepublic/bm43hsrgb/info.json)9
-rwxr-xr-xkeyboards/kprepublic/bm43hsrgb/rules.mk14
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev1/keyboard.json (renamed from keyboards/kprepublic/bm60hsrgb/rev1/info.json)12
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev1/rules.mk14
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json (renamed from keyboards/kprepublic/bm60hsrgb/rev2/info.json)10
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/rev2.c1
-rw-r--r--keyboards/kprepublic/bm60hsrgb/rev2/rules.mk15
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev1/keyboard.json (renamed from keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json)13
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk15
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev2/keyboard.json (renamed from keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json)14
-rw-r--r--keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk15
-rw-r--r--keyboards/kprepublic/bm60hsrgb_iso/rev1/keyboard.json (renamed from keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json)12
-rw-r--r--keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk14
-rw-r--r--keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json (renamed from keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json)10
-rw-r--r--keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c1
-rw-r--r--keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk17
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev1/keyboard.json (renamed from keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json)9
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk13
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json (renamed from keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json)10
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c1
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk16
-rw-r--r--keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json (renamed from keyboards/kprepublic/bm65hsrgb/rev1/info.json)12
-rw-r--r--keyboards/kprepublic/bm65hsrgb/rev1/rules.mk14
-rw-r--r--keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json (renamed from keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json)12
-rw-r--r--keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk14
-rw-r--r--keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json (renamed from keyboards/kprepublic/bm68hsrgb/rev1/info.json)12
-rw-r--r--keyboards/kprepublic/bm68hsrgb/rev1/rules.mk14
-rw-r--r--keyboards/kprepublic/bm68hsrgb/rev2/keyboard.json (renamed from keyboards/kprepublic/bm68hsrgb/rev2/info.json)13
-rw-r--r--keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c34
-rw-r--r--keyboards/kprepublic/bm68hsrgb/rev2/rules.mk14
-rw-r--r--keyboards/kprepublic/bm80hsrgb/keyboard.json (renamed from keyboards/kprepublic/bm80hsrgb/info.json)12
-rw-r--r--keyboards/kprepublic/bm80hsrgb/rules.mk14
-rw-r--r--keyboards/kprepublic/bm80v2/keyboard.json (renamed from keyboards/kprepublic/bm80v2/info.json)12
-rw-r--r--keyboards/kprepublic/bm80v2/rules.mk14
-rw-r--r--keyboards/kprepublic/bm80v2_iso/keyboard.json (renamed from keyboards/kprepublic/bm80v2_iso/info.json)12
-rw-r--r--keyboards/kprepublic/bm80v2_iso/rules.mk16
-rw-r--r--keyboards/kprepublic/bm980hsrgb/keyboard.json (renamed from keyboards/kprepublic/bm980hsrgb/info.json)12
-rw-r--r--keyboards/kprepublic/bm980hsrgb/rules.mk15
-rw-r--r--keyboards/kprepublic/cospad/keyboard.json (renamed from keyboards/kprepublic/cospad/info.json)10
-rw-r--r--keyboards/kprepublic/cospad/rules.mk12
-rw-r--r--keyboards/kprepublic/cstc40/daughterboard/keyboard.json (renamed from keyboards/kprepublic/cstc40/daughterboard/info.json)0
-rw-r--r--keyboards/kprepublic/cstc40/daughterboard/rules.mk1
-rw-r--r--keyboards/kprepublic/cstc40/single_pcb/keyboard.json (renamed from keyboards/kprepublic/cstc40/single_pcb/info.json)0
-rw-r--r--keyboards/kprepublic/cstc40/single_pcb/rules.mk1
-rw-r--r--keyboards/kprepublic/jj40/info.json211
-rw-r--r--keyboards/kprepublic/jj40/keymaps/default/keymap.c146
-rw-r--r--keyboards/kprepublic/jj40/keymaps/via/keymap.c136
-rw-r--r--keyboards/kprepublic/jj40/rev1/keyboard.json328
-rw-r--r--keyboards/kprepublic/jj40/rev1/matrix_diagram.md19
-rw-r--r--keyboards/kprepublic/jj40/rev1/readme.md (renamed from keyboards/kprepublic/jj40/readme.md)10
-rw-r--r--keyboards/kprepublic/jj40/rev1/rules.mk2
-rw-r--r--keyboards/kprepublic/jj40/rules.mk16
-rw-r--r--keyboards/kprepublic/jj4x4/keyboard.json (renamed from keyboards/kprepublic/jj4x4/info.json)10
-rw-r--r--keyboards/kprepublic/jj4x4/rules.mk12
-rw-r--r--keyboards/kprepublic/jj50/info.json118
-rw-r--r--keyboards/kprepublic/jj50/rev1/keyboard.json396
-rw-r--r--keyboards/kprepublic/jj50/rev1/matrix_diagram.md21
-rw-r--r--keyboards/kprepublic/jj50/rev1/readme.md (renamed from keyboards/kprepublic/jj50/readme.md)10
-rw-r--r--keyboards/kprepublic/jj50/rules.mk13
72 files changed, 1185 insertions, 842 deletions
diff --git a/keyboards/kprepublic/bm16a/v1/info.json b/keyboards/kprepublic/bm16a/v1/keyboard.json
index 9e99832b3e..85173a89cc 100644
--- a/keyboards/kprepublic/bm16a/v1/info.json
+++ b/keyboards/kprepublic/bm16a/v1/keyboard.json
@@ -18,8 +18,7 @@
"command": false,
"nkro": true,
"backlight": true,
- "rgblight": true,
- "audio": false
+ "rgblight": true
},
"matrix_pins": {
"rows": ["D3", "D5", "D1", "D2"],
diff --git a/keyboards/kprepublic/bm16a/v1/rules.mk b/keyboards/kprepublic/bm16a/v1/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/kprepublic/bm16a/v1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/kprepublic/bm16a/v2/config.h b/keyboards/kprepublic/bm16a/v2/config.h
index 3ef55f3d42..8014b69a98 100644
--- a/keyboards/kprepublic/bm16a/v2/config.h
+++ b/keyboards/kprepublic/bm16a/v2/config.h
@@ -5,5 +5,5 @@
#define WS2812_PWM_DRIVER PWMD4
#define WS2812_PWM_CHANNEL 4
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 7
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 7
diff --git a/keyboards/kprepublic/bm16a/v2/info.json b/keyboards/kprepublic/bm16a/v2/keyboard.json
index e922d0b9ee..e922d0b9ee 100644
--- a/keyboards/kprepublic/bm16a/v2/info.json
+++ b/keyboards/kprepublic/bm16a/v2/keyboard.json
diff --git a/keyboards/kprepublic/bm16a/v2/rules.mk b/keyboards/kprepublic/bm16a/v2/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/kprepublic/bm16a/v2/rules.mk
+++ /dev/null
diff --git a/keyboards/kprepublic/bm16s/info.json b/keyboards/kprepublic/bm16s/keyboard.json
index de0d51cc4b..c1dce5d300 100644
--- a/keyboards/kprepublic/bm16s/info.json
+++ b/keyboards/kprepublic/bm16s/keyboard.json
@@ -28,6 +28,15 @@
"ws2812": {
"pin": "E2"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F7", "F6", "D4", "D6"],
"rows": ["D1", "D0", "D3", "D2"]
diff --git a/keyboards/kprepublic/bm16s/rules.mk b/keyboards/kprepublic/bm16s/rules.mk
deleted file mode 100755
index 483ffc8106..0000000000
--- a/keyboards/kprepublic/bm16s/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/info.json b/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json
index c50ac648d0..83da66a0a1 100644
--- a/keyboards/kprepublic/bm40hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/rev1/keyboard.json
@@ -64,6 +64,15 @@
"rgblight": {
"max_brightness": 180
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["B3", "B2", "E6", "B5"]
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev1/rules.mk
deleted file mode 100755
index b0daa10a9c..0000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/info.json b/keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json
index 64b35fc25c..cfaabd5c9e 100644
--- a/keyboards/kprepublic/bm40hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/keyboard.json
@@ -12,9 +12,7 @@
"tri_layer": true,
"console": false,
"command": false,
- "nkro": false,
- "backlight": false,
- "audio": false
+ "nkro": false
},
"usb": {
"vid": "0x4B50",
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm40hsrgb/rev2/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/kprepublic/bm40hsrgb/rev2/rules.mk
+++ /dev/null
diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/keyboard.json
index 041da2164d..79c089c68c 100644
--- a/keyboards/kprepublic/bm43a/info.json
+++ b/keyboards/kprepublic/bm43a/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
"rows": ["D1", "F4", "F1", "F0"]
diff --git a/keyboards/kprepublic/bm43a/rules.mk b/keyboards/kprepublic/bm43a/rules.mk
deleted file mode 100644
index 309e55c9f4..0000000000
--- a/keyboards/kprepublic/bm43a/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/keyboard.json
index 93821f3b53..9fa40bdd9c 100755
--- a/keyboards/kprepublic/bm43hsrgb/info.json
+++ b/keyboards/kprepublic/bm43hsrgb/keyboard.json
@@ -29,6 +29,15 @@
"alternating": true
}
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["C6", "D2", "D1", "D0", "D7", "D6", "D4", "D5", "D3", "B7", "B3", "B2"],
"rows": ["E6", "B6", "B4", "B5"]
diff --git a/keyboards/kprepublic/bm43hsrgb/rules.mk b/keyboards/kprepublic/bm43hsrgb/rules.mk
deleted file mode 100755
index f8265c4c24..0000000000
--- a/keyboards/kprepublic/bm43hsrgb/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-KEY_LOCK_ENABLE = no
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/keyboard.json
index 31527a79fa..5fe5d21014 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev1/keyboard.json
@@ -63,6 +63,18 @@
"rgblight": {
"max_brightness": 180
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
deleted file mode 100644
index 4e7e766dda..0000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
index 9a77549e68..a82d5159cf 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
@@ -83,6 +83,16 @@
"diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
"debounce": 3,
"layouts": {
"LAYOUT_60_ansi_arrow": {
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index 3ee74755fa..5bd23a12b8 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -154,6 +154,7 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
static void rgb_matrix_driver_init(void) {
i2c_init();
is31fl3733_init(0);
+ ws2812_init();
for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
bool enabled = true;
is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
index 805593ed5b..bb6c11ea53 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk
@@ -1,18 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-NO_USB_STARTUP_CHECK = no
-LTO_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
WS2812_DRIVER_REQUIRED = yes
COMMON_VPATH += $(DRIVER_PATH)/led/issi
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/keyboard.json
index 675d148604..0a9b283131 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/keyboard.json
@@ -54,6 +54,19 @@
"driver": "ws2812",
"max_brightness": 140
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
deleted file mode 100644
index 6cd530668c..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keyboard.json
index 3b97f904ab..09124e03a9 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/keyboard.json
@@ -61,6 +61,20 @@
"animation": "rainbow_mood"
}
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
"rows": ["E6", "D2", "D3", "D5", "F6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
deleted file mode 100644
index a4b968313c..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keyboard.json
index 297c2dc48f..4cd2c48440 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keyboard.json
@@ -60,6 +60,18 @@
"driver": "ws2812",
"max_brightness": 180
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
deleted file mode 100644
index bb8155a9b8..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
index 111534b0f8..e84817122e 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
@@ -91,6 +91,16 @@
"diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
"debounce": 3,
"layouts": {
"LAYOUT_60_iso_arrow": {
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
index e7641bf4e5..794dea5176 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
@@ -154,6 +154,7 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
static void rgb_matrix_driver_init(void) {
i2c_init();
is31fl3733_init(0);
+ ws2812_init();
for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
bool enabled = true;
is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
index d84cbc0bf1..7012deda8c 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
@@ -1,20 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
-
-# RGB Matrix is required to support per-key LEDs connected to IS31FL3733.
-RGB_MATRIX_ENABLE = yes
-
# The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
# normally done by common_features.mk for both of these drivers need to be done
# here manually.
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keyboard.json
index 5840054b8c..d7923b8432 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keyboard.json
@@ -78,6 +78,15 @@
"twinkle": true
}
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
deleted file mode 100644
index 7b60a21412..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
index 9f16eb2121..62ff452a68 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
@@ -87,6 +87,16 @@
"diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
index 5cb6d850c9..3586dc8e80 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -150,6 +150,7 @@ rgb_led_t rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
static void rgb_matrix_driver_init(void) {
i2c_init();
is31fl3733_init(0);
+ ws2812_init();
for (uint8_t index = 0; index < IS31FL3733_LED_COUNT; index++) {
bool enabled = true;
is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
index 92b33edc1f..7012deda8c 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
@@ -1,19 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
-# RGB Matrix is required to support per-key LEDs connected to IS31FL3733.
-RGB_MATRIX_ENABLE = yes
-
# The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
# normally done by common_features.mk for both of these drivers need to be done
# here manually.
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/info.json b/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json
index 563d90ce32..fcc2101b01 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/keyboard.json
@@ -14,6 +14,18 @@
"rgb_matrix": {
"driver": "ws2812"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
deleted file mode 100644
index 5bdc9f5d4a..0000000000
--- a/keyboards/kprepublic/bm65hsrgb/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json
index 8e20dcdbd5..53b132713c 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json
@@ -81,6 +81,18 @@
"driver": "ws2812",
"max_brightness": 140
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
deleted file mode 100644
index 5bdc9f5d4a..0000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json
index 838df92b9e..ca68c78756 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keyboard.json
@@ -60,6 +60,18 @@
"driver": "ws2812",
"max_brightness": 180
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
"rows": ["B0", "B1", "B2", "B3", "E6"]
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
deleted file mode 100644
index 5bdc9f5d4a..0000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/keyboard.json
index 41cb0fc4ee..7df1af5902 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/keyboard.json
@@ -67,6 +67,19 @@
"animation": "rainbow_mood"
}
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "B0", "B1", "B2", "B3", "E6", "B7", "D2", "D7", "B4", "B5", "B6", "C6", "C7"],
"rows": ["D6", "D4", "D5", "D3", "F6"]
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c
index 3db3a9a7af..1be0806771 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c
@@ -15,53 +15,53 @@
*/
#include QMK_KEYBOARD_H
enum my_keycodes {
- RM_TOGG = SAFE_RANGE,
- RM_MOD,
- RM_HUI,
- RM_HUD,
- RM_SAI,
- RM_SAD,
- RM_VAI,
- RM_VAD
+ RMT = SAFE_RANGE,
+ RMS,
+ RMIH,
+ RMDH,
+ RMIS,
+ RMDS,
+ RMIV,
+ RMDV
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case RM_TOGG:
+ case RMT:
if (record->event.pressed)
{rgb_matrix_toggle();
}
return false;
- case RM_MOD:
+ case RMS:
if (record->event.pressed)
{rgb_matrix_step();
}
return false;
- case RM_HUI:
+ case RMIH:
if (record->event.pressed)
{rgb_matrix_increase_hue();
}
return false;
- case RM_HUD:
+ case RMDH:
if (record->event.pressed)
{rgb_matrix_decrease_hue();
}
return false;
- case RM_SAI:
+ case RMIS:
if (record->event.pressed)
{rgb_matrix_increase_sat();
}
return false;
- case RM_SAD:
+ case RMDS:
if (record->event.pressed)
{rgb_matrix_decrease_sat();
}
return false;
- case RM_VAI:
+ case RMIV:
if (record->event.pressed)
{rgb_matrix_increase_val();
}
return false;
- case RM_VAD:
+ case RMDV:
if (record->event.pressed)
{rgb_matrix_decrease_val();
}
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT_65_ansi(
QK_GESC, 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_DEL, QK_BOOT,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______,
- KC_CAPS, RM_TOGG, RM_MOD, RM_HUI, RM_HUD, RM_SAI, RM_SAD, RM_VAI, RM_VAD, _______, _______, _______, _______, _______,
+ KC_CAPS, RMT, RMS, RMIH, RMDH, RMIS, RMDS, RMIV, RMDV, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______
),
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
deleted file mode 100644
index 0dba15144c..0000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80hsrgb/info.json b/keyboards/kprepublic/bm80hsrgb/keyboard.json
index 91fa89ec3b..5a4d65fbcd 100644
--- a/keyboards/kprepublic/bm80hsrgb/info.json
+++ b/keyboards/kprepublic/bm80hsrgb/keyboard.json
@@ -58,6 +58,18 @@
},
"driver": "ws2812"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "D7", "D6", "D4", "D5", "D3", "D2", "F5", "F6", "F7", "D1", "D0", "B4", "B5", "B6"],
"rows": ["B3", "B2", "B1", "B0", "C6", "C7"]
diff --git a/keyboards/kprepublic/bm80hsrgb/rules.mk b/keyboards/kprepublic/bm80hsrgb/rules.mk
deleted file mode 100644
index 5bdc9f5d4a..0000000000
--- a/keyboards/kprepublic/bm80hsrgb/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80v2/info.json b/keyboards/kprepublic/bm80v2/keyboard.json
index a8b5f3fd8a..dd985550bb 100644
--- a/keyboards/kprepublic/bm80v2/info.json
+++ b/keyboards/kprepublic/bm80v2/keyboard.json
@@ -49,6 +49,18 @@
"max_brightness": 180,
"sleep": true
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
"rows": ["C7", "C6", "B6", "F5", "F7", "F6"]
diff --git a/keyboards/kprepublic/bm80v2/rules.mk b/keyboards/kprepublic/bm80v2/rules.mk
deleted file mode 100644
index ab9a06f5b2..0000000000
--- a/keyboards/kprepublic/bm80v2/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Light
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80v2_iso/info.json b/keyboards/kprepublic/bm80v2_iso/keyboard.json
index 3ff78b6c89..46ab7a5e8b 100644
--- a/keyboards/kprepublic/bm80v2_iso/info.json
+++ b/keyboards/kprepublic/bm80v2_iso/keyboard.json
@@ -49,6 +49,18 @@
"max_brightness": 180,
"sleep": true
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "D7", "D6", "B7", "B1", "B0", "B2", "B3", "D3", "D5", "D4", "D2", "B4", "B5"],
"rows": ["C7", "C6", "B6", "F5", "F7", "F6"]
diff --git a/keyboards/kprepublic/bm80v2_iso/rules.mk b/keyboards/kprepublic/bm80v2_iso/rules.mk
deleted file mode 100644
index e74a388dc0..0000000000
--- a/keyboards/kprepublic/bm80v2_iso/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
-
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/keyboard.json
index 29944ba474..717a514fe8 100644
--- a/keyboards/kprepublic/bm980hsrgb/info.json
+++ b/keyboards/kprepublic/bm980hsrgb/keyboard.json
@@ -11,6 +11,18 @@
"rgb_matrix": {
"driver": "ws2812"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "E6", "F0", "F1", "F4", "F5", "D6"],
"rows": ["D4", "B6", "B5", "B4", "F7", "F6", "D7"]
diff --git a/keyboards/kprepublic/bm980hsrgb/rules.mk b/keyboards/kprepublic/bm980hsrgb/rules.mk
deleted file mode 100644
index 84a2d5cbe6..0000000000
--- a/keyboards/kprepublic/bm980hsrgb/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/cospad/info.json b/keyboards/kprepublic/cospad/keyboard.json
index 02551a2f46..233e258e1d 100644
--- a/keyboards/kprepublic/cospad/info.json
+++ b/keyboards/kprepublic/cospad/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0xB1E5",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7"],
"rows": ["D0", "D1", "D2", "D3", "D4", "D5"]
diff --git a/keyboards/kprepublic/cospad/rules.mk b/keyboards/kprepublic/cospad/rules.mk
deleted file mode 100644
index 1955f1d315..0000000000
--- a/keyboards/kprepublic/cospad/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/kprepublic/cstc40/daughterboard/info.json b/keyboards/kprepublic/cstc40/daughterboard/keyboard.json
index cdba7942df..cdba7942df 100644
--- a/keyboards/kprepublic/cstc40/daughterboard/info.json
+++ b/keyboards/kprepublic/cstc40/daughterboard/keyboard.json
diff --git a/keyboards/kprepublic/cstc40/daughterboard/rules.mk b/keyboards/kprepublic/cstc40/daughterboard/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/kprepublic/cstc40/daughterboard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/single_pcb/info.json b/keyboards/kprepublic/cstc40/single_pcb/keyboard.json
index 330ada7bac..330ada7bac 100644
--- a/keyboards/kprepublic/cstc40/single_pcb/info.json
+++ b/keyboards/kprepublic/cstc40/single_pcb/keyboard.json
diff --git a/keyboards/kprepublic/cstc40/single_pcb/rules.mk b/keyboards/kprepublic/cstc40/single_pcb/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/kprepublic/cstc40/single_pcb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/kprepublic/jj40/info.json b/keyboards/kprepublic/jj40/info.json
deleted file mode 100644
index 79c9d4a759..0000000000
--- a/keyboards/kprepublic/jj40/info.json
+++ /dev/null
@@ -1,211 +0,0 @@
-{
- "keyboard_name": "JJ40",
- "manufacturer": "KPrepublic",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x4B50",
- "pid": "0x0040",
- "device_version": "2.0.0",
- "max_power": 100
- },
- "matrix_pins": {
- "cols": ["C4", "C5", "C6", "C7", "A4", "A5", "A6", "A7", "A3", "A2", "A1", "A0"],
- "rows": ["B0", "B1", "B3", "B4"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "D4",
- "levels": 12,
- "breathing": true
- },
- "rgblight": {
- "led_count": 5,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "rgb_test": true,
- "alternating": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "driver": "i2c"
- },
- "processor": "atmega32a",
- "bootloader": "bootloadhid",
- "community_layouts": ["ortho_4x12", "planck_mit"],
- "layout_aliases": {
- "LAYOUT": "LAYOUT_planck_mit"
- },
- "layouts": {
- "LAYOUT_planck_mit": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [1, 8], "x": 8, "y": 1},
- {"matrix": [1, 9], "x": 9, "y": 1},
- {"matrix": [1, 10], "x": 10, "y": 1},
- {"matrix": [1, 11], "x": 11, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2},
- {"matrix": [2, 5], "x": 5, "y": 2},
- {"matrix": [2, 6], "x": 6, "y": 2},
- {"matrix": [2, 7], "x": 7, "y": 2},
- {"matrix": [2, 8], "x": 8, "y": 2},
- {"matrix": [2, 9], "x": 9, "y": 2},
- {"matrix": [2, 10], "x": 10, "y": 2},
- {"matrix": [2, 11], "x": 11, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
- {"matrix": [3, 7], "x": 7, "y": 3},
- {"matrix": [3, 8], "x": 8, "y": 3},
- {"matrix": [3, 9], "x": 9, "y": 3},
- {"matrix": [3, 10], "x": 10, "y": 3},
- {"matrix": [3, 11], "x": 11, "y": 3}
- ]
- },
- "LAYOUT_ortho_4x12": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [1, 8], "x": 8, "y": 1},
- {"matrix": [1, 9], "x": 9, "y": 1},
- {"matrix": [1, 10], "x": 10, "y": 1},
- {"matrix": [1, 11], "x": 11, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2},
- {"matrix": [2, 5], "x": 5, "y": 2},
- {"matrix": [2, 6], "x": 6, "y": 2},
- {"matrix": [2, 7], "x": 7, "y": 2},
- {"matrix": [2, 8], "x": 8, "y": 2},
- {"matrix": [2, 9], "x": 9, "y": 2},
- {"matrix": [2, 10], "x": 10, "y": 2},
- {"matrix": [2, 11], "x": 11, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3},
- {"matrix": [3, 6], "x": 6, "y": 3},
- {"matrix": [3, 7], "x": 7, "y": 3},
- {"matrix": [3, 8], "x": 8, "y": 3},
- {"matrix": [3, 9], "x": 9, "y": 3},
- {"matrix": [3, 10], "x": 10, "y": 3},
- {"matrix": [3, 11], "x": 11, "y": 3}
- ]
- },
- "LAYOUT_planck_1x2uR": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [1, 8], "x": 8, "y": 1},
- {"matrix": [1, 9], "x": 9, "y": 1},
- {"matrix": [1, 10], "x": 10, "y": 1},
- {"matrix": [1, 11], "x": 11, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2},
- {"matrix": [2, 5], "x": 5, "y": 2},
- {"matrix": [2, 6], "x": 6, "y": 2},
- {"matrix": [2, 7], "x": 7, "y": 2},
- {"matrix": [2, 8], "x": 8, "y": 2},
- {"matrix": [2, 9], "x": 9, "y": 2},
- {"matrix": [2, 10], "x": 10, "y": 2},
- {"matrix": [2, 11], "x": 11, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3},
- {"matrix": [3, 6], "x": 6, "y": 3, "w": 2},
- {"matrix": [3, 8], "x": 8, "y": 3},
- {"matrix": [3, 9], "x": 9, "y": 3},
- {"matrix": [3, 10], "x": 10, "y": 3},
- {"matrix": [3, 11], "x": 11, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/kprepublic/jj40/keymaps/default/keymap.c b/keyboards/kprepublic/jj40/keymaps/default/keymap.c
index c82106e187..24218dddfc 100644
--- a/keyboards/kprepublic/jj40/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/default/keymap.c
@@ -16,89 +16,89 @@
#include QMK_KEYBOARD_H
enum layers {
- _QWERTY = 0,
- _LOWER,
- _RAISE,
- _ADJUST,
+ _QWERTY = 0,
+ _LOWER,
+ _RAISE,
+ _ADJUST,
};
#define LOWER MO(_LOWER)
#define RAISE MO(_RAISE)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_mit(
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
- KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-),
+ /* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+ [_QWERTY] = LAYOUT_ortho_4x12(
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
+ _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ ),
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_mit(
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
- KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
+ /* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+ [_LOWER] = LAYOUT_ortho_4x12(
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ ),
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_mit(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
+ /* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+ [_RAISE] = LAYOUT_ortho_4x12(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ ),
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | | Reset| | | | | | | | | | Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | | | | | | | | | | | | |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | | | | | | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_4x12(
- _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
- _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
+ /* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * | | Reset| | | | | | | | | | Del |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | | |BL Tog|BL Mod| | | | | | | | |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | | |RGBTog|RGBMod| | | | | | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | | | | | |
+ * `-----------------------------------------------------------------------------------'
+ */
+ [_ADJUST] = LAYOUT_ortho_4x12(
+ _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+ _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
};
layer_state_t layer_state_set_user(layer_state_t state) {
- return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+ return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}
diff --git a/keyboards/kprepublic/jj40/keymaps/via/keymap.c b/keyboards/kprepublic/jj40/keymaps/via/keymap.c
index 84e2708849..b52e92ab7a 100644
--- a/keyboards/kprepublic/jj40/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/jj40/keymaps/via/keymap.c
@@ -19,75 +19,75 @@
#define RAISE TL_UPPR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[0] = LAYOUT_planck_mit(
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
- KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
-),
+ /* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc | A | S | D | F | G | H | J | K | L | ; | " |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | Ctrl | Alt | GUI |Lower |Space |Space |Raise | Left | Down | Up |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+ [0] = LAYOUT_ortho_4x12(
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
+ _______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ ),
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[1] = LAYOUT_planck_mit(
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
- KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
+ /* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | | \ | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+ [1] = LAYOUT_ortho_4x12(
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ ),
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[2] = LAYOUT_planck_mit(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
+ /* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+ [2] = LAYOUT_ortho_4x12(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ ),
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | | Reset| | | | | | | | | | Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | | | | | | | | | | | | |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | | | | | | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | |
- * `-----------------------------------------------------------------------------------'
- */
-[3] = LAYOUT_planck_mit(
- _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
- _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
+ /* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * | | Reset| | | | | | | | | | Del |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | | | | | | | | | | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | | | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | | | | | |
+ * `-----------------------------------------------------------------------------------'
+ */
+ [3] = LAYOUT_ortho_4x12(
+ _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+ _______, _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
};
diff --git a/keyboards/kprepublic/jj40/rev1/keyboard.json b/keyboards/kprepublic/jj40/rev1/keyboard.json
new file mode 100644
index 0000000000..3ac3e2f02c
--- /dev/null
+++ b/keyboards/kprepublic/jj40/rev1/keyboard.json
@@ -0,0 +1,328 @@
+{
+ "keyboard_name": "JJ40 rev1",
+ "manufacturer": "KPrepublic",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4B50",
+ "pid": "0x0040",
+ "device_version": "2.0.0",
+ "max_power": 100
+ },
+ "matrix_pins": {
+ "cols": ["C4", "C5", "C6", "C7", "A4", "A5", "A6", "A7", "A3", "A2", "A1", "A0"],
+ "rows": ["B0", "B1", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "D4",
+ "levels": 12,
+ "breathing": true
+ },
+ "rgblight": {
+ "led_count": 5,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "driver": "i2c"
+ },
+ "processor": "atmega32a",
+ "bootloader": "bootloadhid",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": false,
+ "backlight": true,
+ "rgblight": true
+ },
+ "community_layouts": ["ortho_4x12", "planck_mit"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_4x12_1x2u_c",
+ "LAYOUT_planck_mit": "LAYOUT_ortho_4x12_1x2u_c",
+ "LAYOUT_planck_1x2uR": "LAYOUT_ortho_4x12_1x2u_r"
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
+ ]
+ },
+ "LAYOUT_ortho_4x12_1x2u_c": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
+ ]
+ },
+ "LAYOUT_ortho_4x12_1x2u_l": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
+ ]
+ },
+ "LAYOUT_ortho_4x12_1x2u_r": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
+ ]
+ },
+ "LAYOUT_ortho_4x12_2x2u": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+ {"matrix": [3, 6], "x": 6, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kprepublic/jj40/rev1/matrix_diagram.md b/keyboards/kprepublic/jj40/rev1/matrix_diagram.md
new file mode 100644
index 0000000000..33858c5714
--- /dev/null
+++ b/keyboards/kprepublic/jj40/rev1/matrix_diagram.md
@@ -0,0 +1,19 @@
+# Matrix Diagram for KPrepublic JJ40 rev1
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │
+└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ ┌───────┐
+ │35 │ 1x2u_c (MIT)
+ └───────┘
+ ┌───────┬───────┐
+ │34 │36 │ 2x2u_c
+ └───────┴───────┘
+```
diff --git a/keyboards/kprepublic/jj40/readme.md b/keyboards/kprepublic/jj40/rev1/readme.md
index 06ca2e657e..12d65869da 100644
--- a/keyboards/kprepublic/jj40/readme.md
+++ b/keyboards/kprepublic/jj40/rev1/readme.md
@@ -1,20 +1,20 @@
-# jj40
+# JJ40 rev1
-![jj40](https://ae01.alicdn.com/kf/HTB18bq6bOERMeJjSspiq6zZLFXar.jpg?size=359506&height=562&width=750&hash=663a22d0109e2416ec8f54a7658686da)
+![JJ40 rev1](https://ae01.alicdn.com/kf/HTB18bq6bOERMeJjSspiq6zZLFXar.jpg?size=359506&height=562&width=750&hash=663a22d0109e2416ec8f54a7658686da)
A compact 40% (12x4) ortholinear keyboard kit made and KPRepublic on AliExpress.
* Keyboard Maintainer: [QMK Community](https://github.com/qmk)
-* Hardware Supported: Atmega32A
+* Hardware Supported: JJ40 rev1 (Atmega32A)
* Hardware Availability: [AliExpress](https://www.aliexpress.com/store/product/jj40-Custom-Mechanical-Keyboard-40-PCB-programmed-40-planck-layouts-bface-firmware-gh40/3034003_32828781103.html)
Make example for this keyboard (after setting up your build environment):
- make kprepublic/jj40:default
+ make kprepublic/jj40/rev1:default
Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
- make kprepublic/jj40:default:flash
+ make kprepublic/jj40/rev1:default:flash
**Reset Key**: Hold down the *Top Right Key* key, commonly programmed as *Backspace* while plugging in the keyboard.
diff --git a/keyboards/kprepublic/jj40/rev1/rules.mk b/keyboards/kprepublic/jj40/rev1/rules.mk
new file mode 100644
index 0000000000..271780b75e
--- /dev/null
+++ b/keyboards/kprepublic/jj40/rev1/rules.mk
@@ -0,0 +1,2 @@
+# Disable unsupported hardware
+AUDIO_SUPPORTED = no
diff --git a/keyboards/kprepublic/jj40/rules.mk b/keyboards/kprepublic/jj40/rules.mk
index 13588c113c..fa09523958 100644
--- a/keyboards/kprepublic/jj40/rules.mk
+++ b/keyboards/kprepublic/jj40/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# Disable unsupported hardware
-AUDIO_SUPPORTED = no
+DEFAULT_FOLDER = kprepublic/jj40/rev1
diff --git a/keyboards/kprepublic/jj4x4/info.json b/keyboards/kprepublic/jj4x4/keyboard.json
index 5fc9c49343..2f53db2e88 100644
--- a/keyboards/kprepublic/jj4x4/info.json
+++ b/keyboards/kprepublic/jj4x4/keyboard.json
@@ -9,6 +9,16 @@
"device_version": "2.0.0",
"max_power": 100
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A1", "A0", "A2", "A3"],
"rows": ["B5", "B0", "B3", "B4"]
diff --git a/keyboards/kprepublic/jj4x4/rules.mk b/keyboards/kprepublic/jj4x4/rules.mk
deleted file mode 100644
index 5b9cc80e47..0000000000
--- a/keyboards/kprepublic/jj4x4/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json
deleted file mode 100644
index 492d106f21..0000000000
--- a/keyboards/kprepublic/jj50/info.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
- "keyboard_name": "JJ50",
- "manufacturer": "KPrepublic",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x4B50",
- "pid": "0x0050",
- "device_version": "2.0.0"
- },
- "matrix_pins": {
- "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"],
- "rows": ["B0", "B1", "B2", "B3", "B4"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "D4",
- "levels": 12,
- "breathing": true
- },
- "rgblight": {
- "hue_steps": 12,
- "saturation_steps": 15,
- "brightness_steps": 18,
- "led_count": 12,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "rgb_test": true,
- "alternating": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "driver": "i2c"
- },
- "processor": "atmega32a",
- "bootloader": "bootloadhid",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_ortho_5x12"
- },
- "community_layouts": ["ortho_5x12"],
- "layouts": {
- "LAYOUT_ortho_5x12": {
- "layout": [
- {"matrix": [2, 11], "x": 0, "y": 0},
- {"matrix": [2, 10], "x": 1, "y": 0},
- {"matrix": [2, 9], "x": 2, "y": 0},
- {"matrix": [2, 8], "x": 3, "y": 0},
- {"matrix": [2, 4], "x": 4, "y": 0},
- {"matrix": [2, 5], "x": 5, "y": 0},
- {"matrix": [2, 6], "x": 6, "y": 0},
- {"matrix": [2, 7], "x": 7, "y": 0},
- {"matrix": [2, 3], "x": 8, "y": 0},
- {"matrix": [2, 2], "x": 9, "y": 0},
- {"matrix": [2, 1], "x": 10, "y": 0},
- {"matrix": [2, 0], "x": 11, "y": 0},
-
- {"matrix": [0, 11], "x": 0, "y": 1},
- {"matrix": [0, 10], "x": 1, "y": 1},
- {"matrix": [0, 9], "x": 2, "y": 1},
- {"matrix": [0, 8], "x": 3, "y": 1},
- {"matrix": [0, 4], "x": 4, "y": 1},
- {"matrix": [0, 5], "x": 5, "y": 1},
- {"matrix": [0, 6], "x": 6, "y": 1},
- {"matrix": [0, 7], "x": 7, "y": 1},
- {"matrix": [0, 3], "x": 8, "y": 1},
- {"matrix": [0, 2], "x": 9, "y": 1},
- {"matrix": [0, 1], "x": 10, "y": 1},
- {"matrix": [0, 0], "x": 11, "y": 1},
-
- {"matrix": [1, 11], "x": 0, "y": 2},
- {"matrix": [1, 10], "x": 1, "y": 2},
- {"matrix": [1, 9], "x": 2, "y": 2},
- {"matrix": [1, 8], "x": 3, "y": 2},
- {"matrix": [1, 4], "x": 4, "y": 2},
- {"matrix": [1, 5], "x": 5, "y": 2},
- {"matrix": [1, 6], "x": 6, "y": 2},
- {"matrix": [1, 7], "x": 7, "y": 2},
- {"matrix": [1, 3], "x": 8, "y": 2},
- {"matrix": [1, 2], "x": 9, "y": 2},
- {"matrix": [1, 1], "x": 10, "y": 2},
- {"matrix": [1, 0], "x": 11, "y": 2},
-
- {"matrix": [3, 11], "x": 0, "y": 3},
- {"matrix": [3, 10], "x": 1, "y": 3},
- {"matrix": [3, 9], "x": 2, "y": 3},
- {"matrix": [3, 8], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3},
- {"matrix": [3, 6], "x": 6, "y": 3},
- {"matrix": [3, 7], "x": 7, "y": 3},
- {"matrix": [3, 3], "x": 8, "y": 3},
- {"matrix": [3, 2], "x": 9, "y": 3},
- {"matrix": [3, 1], "x": 10, "y": 3},
- {"matrix": [3, 0], "x": 11, "y": 3},
-
- {"matrix": [4, 11], "x": 0, "y": 4},
- {"matrix": [4, 10], "x": 1, "y": 4},
- {"matrix": [4, 9], "x": 2, "y": 4},
- {"matrix": [4, 8], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
- {"matrix": [4, 6], "x": 6, "y": 4},
- {"matrix": [4, 7], "x": 7, "y": 4},
- {"matrix": [4, 3], "x": 8, "y": 4},
- {"matrix": [4, 2], "x": 9, "y": 4},
- {"matrix": [4, 1], "x": 10, "y": 4},
- {"matrix": [4, 0], "x": 11, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/kprepublic/jj50/rev1/keyboard.json b/keyboards/kprepublic/jj50/rev1/keyboard.json
new file mode 100644
index 0000000000..c9f191ef9c
--- /dev/null
+++ b/keyboards/kprepublic/jj50/rev1/keyboard.json
@@ -0,0 +1,396 @@
+{
+ "keyboard_name": "JJ50 rev1",
+ "manufacturer": "KPrepublic",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4B50",
+ "pid": "0x0050",
+ "device_version": "2.0.0"
+ },
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"],
+ "rows": ["B0", "B1", "B2", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": false,
+ "backlight": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
+ "backlight": {
+ "pin": "D4",
+ "levels": 12,
+ "breathing": true
+ },
+ "rgblight": {
+ "hue_steps": 12,
+ "saturation_steps": 15,
+ "brightness_steps": 18,
+ "led_count": 12,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "driver": "i2c"
+ },
+ "processor": "atmega32a",
+ "bootloader": "bootloadhid",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_5x12"
+ },
+ "community_layouts": ["ortho_5x12"],
+ "layouts": {
+ "LAYOUT_ortho_5x12": {
+ "layout": [
+ {"matrix": [2, 11], "x": 0, "y": 0},
+ {"matrix": [2, 10], "x": 1, "y": 0},
+ {"matrix": [2, 9], "x": 2, "y": 0},
+ {"matrix": [2, 8], "x": 3, "y": 0},
+ {"matrix": [2, 4], "x": 4, "y": 0},
+ {"matrix": [2, 5], "x": 5, "y": 0},
+ {"matrix": [2, 6], "x": 6, "y": 0},
+ {"matrix": [2, 7], "x": 7, "y": 0},
+ {"matrix": [2, 3], "x": 8, "y": 0},
+ {"matrix": [2, 2], "x": 9, "y": 0},
+ {"matrix": [2, 1], "x": 10, "y": 0},
+ {"matrix": [2, 0], "x": 11, "y": 0},
+
+ {"matrix": [0, 11], "x": 0, "y": 1},
+ {"matrix": [0, 10], "x": 1, "y": 1},
+ {"matrix": [0, 9], "x": 2, "y": 1},
+ {"matrix": [0, 8], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 3], "x": 8, "y": 1},
+ {"matrix": [0, 2], "x": 9, "y": 1},
+ {"matrix": [0, 1], "x": 10, "y": 1},
+ {"matrix": [0, 0], "x": 11, "y": 1},
+
+ {"matrix": [1, 11], "x": 0, "y": 2},
+ {"matrix": [1, 10], "x": 1, "y": 2},
+ {"matrix": [1, 9], "x": 2, "y": 2},
+ {"matrix": [1, 8], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 3], "x": 8, "y": 2},
+ {"matrix": [1, 2], "x": 9, "y": 2},
+ {"matrix": [1, 1], "x": 10, "y": 2},
+ {"matrix": [1, 0], "x": 11, "y": 2},
+
+ {"matrix": [3, 11], "x": 0, "y": 3},
+ {"matrix": [3, 10], "x": 1, "y": 3},
+ {"matrix": [3, 9], "x": 2, "y": 3},
+ {"matrix": [3, 8], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 3], "x": 8, "y": 3},
+ {"matrix": [3, 2], "x": 9, "y": 3},
+ {"matrix": [3, 1], "x": 10, "y": 3},
+ {"matrix": [3, 0], "x": 11, "y": 3},
+
+ {"matrix": [4, 11], "x": 0, "y": 4},
+ {"matrix": [4, 10], "x": 1, "y": 4},
+ {"matrix": [4, 9], "x": 2, "y": 4},
+ {"matrix": [4, 8], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 3], "x": 8, "y": 4},
+ {"matrix": [4, 2], "x": 9, "y": 4},
+ {"matrix": [4, 1], "x": 10, "y": 4},
+ {"matrix": [4, 0], "x": 11, "y": 4}
+ ]
+ },
+ "LAYOUT_ortho_5x12_1x2u_c": {
+ "layout": [
+ {"matrix": [2, 11], "x": 0, "y": 0},
+ {"matrix": [2, 10], "x": 1, "y": 0},
+ {"matrix": [2, 9], "x": 2, "y": 0},
+ {"matrix": [2, 8], "x": 3, "y": 0},
+ {"matrix": [2, 4], "x": 4, "y": 0},
+ {"matrix": [2, 5], "x": 5, "y": 0},
+ {"matrix": [2, 6], "x": 6, "y": 0},
+ {"matrix": [2, 7], "x": 7, "y": 0},
+ {"matrix": [2, 3], "x": 8, "y": 0},
+ {"matrix": [2, 2], "x": 9, "y": 0},
+ {"matrix": [2, 1], "x": 10, "y": 0},
+ {"matrix": [2, 0], "x": 11, "y": 0},
+
+ {"matrix": [0, 11], "x": 0, "y": 1},
+ {"matrix": [0, 10], "x": 1, "y": 1},
+ {"matrix": [0, 9], "x": 2, "y": 1},
+ {"matrix": [0, 8], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 3], "x": 8, "y": 1},
+ {"matrix": [0, 2], "x": 9, "y": 1},
+ {"matrix": [0, 1], "x": 10, "y": 1},
+ {"matrix": [0, 0], "x": 11, "y": 1},
+
+ {"matrix": [1, 11], "x": 0, "y": 2},
+ {"matrix": [1, 10], "x": 1, "y": 2},
+ {"matrix": [1, 9], "x": 2, "y": 2},
+ {"matrix": [1, 8], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 3], "x": 8, "y": 2},
+ {"matrix": [1, 2], "x": 9, "y": 2},
+ {"matrix": [1, 1], "x": 10, "y": 2},
+ {"matrix": [1, 0], "x": 11, "y": 2},
+
+ {"matrix": [3, 11], "x": 0, "y": 3},
+ {"matrix": [3, 10], "x": 1, "y": 3},
+ {"matrix": [3, 9], "x": 2, "y": 3},
+ {"matrix": [3, 8], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 3], "x": 8, "y": 3},
+ {"matrix": [3, 2], "x": 9, "y": 3},
+ {"matrix": [3, 1], "x": 10, "y": 3},
+ {"matrix": [3, 0], "x": 11, "y": 3},
+
+ {"matrix": [4, 11], "x": 0, "y": 4},
+ {"matrix": [4, 10], "x": 1, "y": 4},
+ {"matrix": [4, 9], "x": 2, "y": 4},
+ {"matrix": [4, 8], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 3], "x": 8, "y": 4},
+ {"matrix": [4, 2], "x": 9, "y": 4},
+ {"matrix": [4, 1], "x": 10, "y": 4},
+ {"matrix": [4, 0], "x": 11, "y": 4}
+ ]
+ },
+ "LAYOUT_ortho_5x12_1x2u_l": {
+ "layout": [
+ {"matrix": [2, 11], "x": 0, "y": 0},
+ {"matrix": [2, 10], "x": 1, "y": 0},
+ {"matrix": [2, 9], "x": 2, "y": 0},
+ {"matrix": [2, 8], "x": 3, "y": 0},
+ {"matrix": [2, 4], "x": 4, "y": 0},
+ {"matrix": [2, 5], "x": 5, "y": 0},
+ {"matrix": [2, 6], "x": 6, "y": 0},
+ {"matrix": [2, 7], "x": 7, "y": 0},
+ {"matrix": [2, 3], "x": 8, "y": 0},
+ {"matrix": [2, 2], "x": 9, "y": 0},
+ {"matrix": [2, 1], "x": 10, "y": 0},
+ {"matrix": [2, 0], "x": 11, "y": 0},
+
+ {"matrix": [0, 11], "x": 0, "y": 1},
+ {"matrix": [0, 10], "x": 1, "y": 1},
+ {"matrix": [0, 9], "x": 2, "y": 1},
+ {"matrix": [0, 8], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 3], "x": 8, "y": 1},
+ {"matrix": [0, 2], "x": 9, "y": 1},
+ {"matrix": [0, 1], "x": 10, "y": 1},
+ {"matrix": [0, 0], "x": 11, "y": 1},
+
+ {"matrix": [1, 11], "x": 0, "y": 2},
+ {"matrix": [1, 10], "x": 1, "y": 2},
+ {"matrix": [1, 9], "x": 2, "y": 2},
+ {"matrix": [1, 8], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 3], "x": 8, "y": 2},
+ {"matrix": [1, 2], "x": 9, "y": 2},
+ {"matrix": [1, 1], "x": 10, "y": 2},
+ {"matrix": [1, 0], "x": 11, "y": 2},
+
+ {"matrix": [3, 11], "x": 0, "y": 3},
+ {"matrix": [3, 10], "x": 1, "y": 3},
+ {"matrix": [3, 9], "x": 2, "y": 3},
+ {"matrix": [3, 8], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 3], "x": 8, "y": 3},
+ {"matrix": [3, 2], "x": 9, "y": 3},
+ {"matrix": [3, 1], "x": 10, "y": 3},
+ {"matrix": [3, 0], "x": 11, "y": 3},
+
+ {"matrix": [4, 11], "x": 0, "y": 4},
+ {"matrix": [4, 10], "x": 1, "y": 4},
+ {"matrix": [4, 9], "x": 2, "y": 4},
+ {"matrix": [4, 8], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 3], "x": 8, "y": 4},
+ {"matrix": [4, 2], "x": 9, "y": 4},
+ {"matrix": [4, 1], "x": 10, "y": 4},
+ {"matrix": [4, 0], "x": 11, "y": 4}
+ ]
+ },
+ "LAYOUT_ortho_5x12_1x2u_r": {
+ "layout": [
+ {"matrix": [2, 11], "x": 0, "y": 0},
+ {"matrix": [2, 10], "x": 1, "y": 0},
+ {"matrix": [2, 9], "x": 2, "y": 0},
+ {"matrix": [2, 8], "x": 3, "y": 0},
+ {"matrix": [2, 4], "x": 4, "y": 0},
+ {"matrix": [2, 5], "x": 5, "y": 0},
+ {"matrix": [2, 6], "x": 6, "y": 0},
+ {"matrix": [2, 7], "x": 7, "y": 0},
+ {"matrix": [2, 3], "x": 8, "y": 0},
+ {"matrix": [2, 2], "x": 9, "y": 0},
+ {"matrix": [2, 1], "x": 10, "y": 0},
+ {"matrix": [2, 0], "x": 11, "y": 0},
+
+ {"matrix": [0, 11], "x": 0, "y": 1},
+ {"matrix": [0, 10], "x": 1, "y": 1},
+ {"matrix": [0, 9], "x": 2, "y": 1},
+ {"matrix": [0, 8], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 3], "x": 8, "y": 1},
+ {"matrix": [0, 2], "x": 9, "y": 1},
+ {"matrix": [0, 1], "x": 10, "y": 1},
+ {"matrix": [0, 0], "x": 11, "y": 1},
+
+ {"matrix": [1, 11], "x": 0, "y": 2},
+ {"matrix": [1, 10], "x": 1, "y": 2},
+ {"matrix": [1, 9], "x": 2, "y": 2},
+ {"matrix": [1, 8], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 3], "x": 8, "y": 2},
+ {"matrix": [1, 2], "x": 9, "y": 2},
+ {"matrix": [1, 1], "x": 10, "y": 2},
+ {"matrix": [1, 0], "x": 11, "y": 2},
+
+ {"matrix": [3, 11], "x": 0, "y": 3},
+ {"matrix": [3, 10], "x": 1, "y": 3},
+ {"matrix": [3, 9], "x": 2, "y": 3},
+ {"matrix": [3, 8], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 3], "x": 8, "y": 3},
+ {"matrix": [3, 2], "x": 9, "y": 3},
+ {"matrix": [3, 1], "x": 10, "y": 3},
+ {"matrix": [3, 0], "x": 11, "y": 3},
+
+ {"matrix": [4, 11], "x": 0, "y": 4},
+ {"matrix": [4, 10], "x": 1, "y": 4},
+ {"matrix": [4, 9], "x": 2, "y": 4},
+ {"matrix": [4, 8], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
+ {"matrix": [4, 3], "x": 8, "y": 4},
+ {"matrix": [4, 2], "x": 9, "y": 4},
+ {"matrix": [4, 1], "x": 10, "y": 4},
+ {"matrix": [4, 0], "x": 11, "y": 4}
+ ]
+ },
+ "LAYOUT_ortho_5x12_2x2u": {
+ "layout": [
+ {"matrix": [2, 11], "x": 0, "y": 0},
+ {"matrix": [2, 10], "x": 1, "y": 0},
+ {"matrix": [2, 9], "x": 2, "y": 0},
+ {"matrix": [2, 8], "x": 3, "y": 0},
+ {"matrix": [2, 4], "x": 4, "y": 0},
+ {"matrix": [2, 5], "x": 5, "y": 0},
+ {"matrix": [2, 6], "x": 6, "y": 0},
+ {"matrix": [2, 7], "x": 7, "y": 0},
+ {"matrix": [2, 3], "x": 8, "y": 0},
+ {"matrix": [2, 2], "x": 9, "y": 0},
+ {"matrix": [2, 1], "x": 10, "y": 0},
+ {"matrix": [2, 0], "x": 11, "y": 0},
+
+ {"matrix": [0, 11], "x": 0, "y": 1},
+ {"matrix": [0, 10], "x": 1, "y": 1},
+ {"matrix": [0, 9], "x": 2, "y": 1},
+ {"matrix": [0, 8], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 3], "x": 8, "y": 1},
+ {"matrix": [0, 2], "x": 9, "y": 1},
+ {"matrix": [0, 1], "x": 10, "y": 1},
+ {"matrix": [0, 0], "x": 11, "y": 1},
+
+ {"matrix": [1, 11], "x": 0, "y": 2},
+ {"matrix": [1, 10], "x": 1, "y": 2},
+ {"matrix": [1, 9], "x": 2, "y": 2},
+ {"matrix": [1, 8], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 3], "x": 8, "y": 2},
+ {"matrix": [1, 2], "x": 9, "y": 2},
+ {"matrix": [1, 1], "x": 10, "y": 2},
+ {"matrix": [1, 0], "x": 11, "y": 2},
+
+ {"matrix": [3, 11], "x": 0, "y": 3},
+ {"matrix": [3, 10], "x": 1, "y": 3},
+ {"matrix": [3, 9], "x": 2, "y": 3},
+ {"matrix": [3, 8], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 3], "x": 8, "y": 3},
+ {"matrix": [3, 2], "x": 9, "y": 3},
+ {"matrix": [3, 1], "x": 10, "y": 3},
+ {"matrix": [3, 0], "x": 11, "y": 3},
+
+ {"matrix": [4, 11], "x": 0, "y": 4},
+ {"matrix": [4, 10], "x": 1, "y": 4},
+ {"matrix": [4, 9], "x": 2, "y": 4},
+ {"matrix": [4, 8], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 2},
+ {"matrix": [4, 3], "x": 8, "y": 4},
+ {"matrix": [4, 2], "x": 9, "y": 4},
+ {"matrix": [4, 1], "x": 10, "y": 4},
+ {"matrix": [4, 0], "x": 11, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kprepublic/jj50/rev1/matrix_diagram.md b/keyboards/kprepublic/jj50/rev1/matrix_diagram.md
new file mode 100644
index 0000000000..c13292d336
--- /dev/null
+++ b/keyboards/kprepublic/jj50/rev1/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for KPrepublic JJ50 rev1
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│2B │2A │29 │28 │24 │25 │26 │27 │23 │22 │21 │20 │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│0B │0A │09 │08 │04 │05 │06 │07 │03 │02 │01 │00 │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│1B │1A │19 │18 │14 │15 │16 │17 │13 │12 │11 │10 │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│3B │3A │39 │38 │34 │35 │36 │37 │33 │32 │31 │30 │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│4B │4A │49 │48 │44 │45 │46 │47 │43 │42 │41 │40 │
+└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ ┌───────┐
+ │45 │ 1x2u_c (MIT)
+ └───────┘
+ ┌───────┬───────┐
+ │44 │46 │ 2x2u_c
+ └───────┴───────┘
+```
diff --git a/keyboards/kprepublic/jj50/readme.md b/keyboards/kprepublic/jj50/rev1/readme.md
index c34b5d8eeb..643dfc54da 100644
--- a/keyboards/kprepublic/jj50/readme.md
+++ b/keyboards/kprepublic/jj50/rev1/readme.md
@@ -1,20 +1,20 @@
-# JJ50
+# JJ50 rev1
-![JJ50 + SA Vilebloom (w/ Sakurios) by u/rendleshift](https://i.imgur.com/SwYZ4wol.jpg)
+![JJ50 rev1 + SA Vilebloom (w/ Sakurios) by u/rendleshift](https://i.imgur.com/SwYZ4wol.jpg)
A compact 50% (5x12) ortholinear keyboard made and sold by KPrepublic.
* Keyboard Maintainer: [QMK Community](https://github.com/qmk)
-* Hardware Supported: Atmega32A
+* Hardware Supported: JJ50 rev1 (ATmega32A)
* Hardware Availability: [AliExpress](https://www.aliexpress.com/item/jj50-v1-0-Custom-Mechanical-Keyboard-50-PCB-programmed-50-preonic-layouts-bface-firmware-with-rgb/32848915277.html); [KPrepublic](https://kprepublic.com/collections/jj50-50/products/jj50-50-custom-keyboard-pcb-similar-with-preonic)
Make example for this keyboard (after setting up your build environment):
- make kprepublic/jj50:default
+ make kprepublic/jj50/rev1:default
Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
- make kprepublic/jj50:default:flash
+ make kprepublic/jj50/rev1:default:flash
**Reset Key**: Hold down the key `Backspace` (`Key below the top right key`) while plugging in the keyboard.
diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk
index 2e721d00cd..8f77c68db2 100644
--- a/keyboards/kprepublic/jj50/rules.mk
+++ b/keyboards/kprepublic/jj50/rules.mk
@@ -1,12 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-LTO_ENABLE = yes # Enable link time optimization
+DEFAULT_FOLDER = kprepublic/jj50/rev1