diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
deleted file mode 100644
index 17ebcaf4587..00000000000
--- a/keyboards/10bleoledhub/info.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
- "keyboard_name": "10bleoledhub",
- "manufacturer": "haierwangwei2005",
- "url": "https://github.com/haierwangwei2005/10BLE-OLED-HUB",
- "maintainer": "haierwangwei2005",
- "usb": {
- "vid": "0x7C88",
- "pid": "0x7C99",
- "device_version": "0.0.1"
- },
- "bluetooth": {
- "driver": "bluefruit_le"
- },
- "rgblight": {
- "led_count": 4,
- "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": {
- "pin": "B7"
- },
- "matrix_pins": {
- "cols": ["D6", "D7", "B5"],
- "rows": ["F0", "F5", "F4", "F6"]
- },
- "diode_direction": "ROW2COL",
- "encoder": {
- "rotary": [
- {"pin_a": "C7", "pin_b": "F7"}
- ]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/10bleoledhub/keyboard.json b/keyboards/10bleoledhub/keyboard.json
new file mode 100644
index 00000000000..8f48e09127f
--- /dev/null
+++ b/keyboards/10bleoledhub/keyboard.json
@@ -0,0 +1,72 @@
+{
+ "keyboard_name": "10bleoledhub",
+ "manufacturer": "haierwangwei2005",
+ "url": "https://github.com/haierwangwei2005/10BLE-OLED-HUB",
+ "maintainer": "haierwangwei2005",
+ "usb": {
+ "vid": "0x7C88",
+ "pid": "0x7C99",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bluetooth": true,
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "oled": true
+ },
+ "bluetooth": {
+ "driver": "bluefruit_le"
+ },
+ "rgblight": {
+ "led_count": 4,
+ "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": {
+ "pin": "B7"
+ },
+ "matrix_pins": {
+ "cols": ["D6", "D7", "B5"],
+ "rows": ["F0", "F5", "F4", "F6"]
+ },
+ "diode_direction": "ROW2COL",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "C7", "pin_b": "F7"}
+ ]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/10bleoledhub/rules.mk b/keyboards/10bleoledhub/rules.mk
index 12bfe122d62..3437a35bdf1 100644
--- a/keyboards/10bleoledhub/rules.mk
+++ b/keyboards/10bleoledhub/rules.mk
@@ -1,18 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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
-BLUETOOTH_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json
deleted file mode 100644
index 34f33d50595..00000000000
--- a/keyboards/1k/info.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "keyboard_name": "1K",
- "manufacturer": "MakotoKurauchi",
- "url": "",
- "maintainer": "MakotoKurauchi",
- "usb": {
- "vid": "0x0009",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 1
- },
- "ws2812": {
- "pin": "B2"
- },
- "matrix_pins": {
- "direct": [
- ["B0"]
- ]
- },
- "layouts": {
- "LAYOUT_ortho_1x1": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]}
- ]
- }
- }
-}
diff --git a/keyboards/1k/keyboard.json b/keyboards/1k/keyboard.json
new file mode 100644
index 00000000000..440856d0bd4
--- /dev/null
+++ b/keyboards/1k/keyboard.json
@@ -0,0 +1,39 @@
+{
+ "keyboard_name": "1K",
+ "manufacturer": "MakotoKurauchi",
+ "url": "",
+ "maintainer": "MakotoKurauchi",
+ "usb": {
+ "vid": "0x0009",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "processor": "attiny85",
+ "bootloader": "custom",
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "grave_esc": false,
+ "magic": false,
+ "space_cadet": false
+ },
+ "rgblight": {
+ "led_count": 1
+ },
+ "ws2812": {
+ "pin": "B2"
+ },
+ "matrix_pins": {
+ "direct": [
+ ["B0"]
+ ]
+ },
+ "layouts": {
+ "LAYOUT_ortho_1x1": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]}
+ ]
+ }
+ }
+}
diff --git a/keyboards/1k/rules.mk b/keyboards/1k/rules.mk
index b3bd401f6ba..4078fe342aa 100644
--- a/keyboards/1k/rules.mk
+++ b/keyboards/1k/rules.mk
@@ -1,26 +1,2 @@
-# MCU name
-MCU = attiny85
-
-# Bootloader selection
-BOOTLOADER = custom
BOOTLOADER_SIZE = 1862
PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-
-# Save as much space as we can...
-LTO_ENABLE = yes
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/keyboard.json
similarity index 100%
rename from keyboards/1upkeyboards/1upslider8/info.json
rename to keyboards/1upkeyboards/1upslider8/keyboard.json
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
index 3512838186a..63f76eb1a65 100644
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json
@@ -24,6 +24,7 @@
"extrakey": true,
"mousekey": true,
"nkro": false,
+ "oled": true,
"rgb_matrix": true
},
"matrix_pins": {
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
index 230ce3d8574..ed1f1391261 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json
@@ -24,6 +24,7 @@
"extrakey": true,
"mousekey": true,
"nkro": false,
+ "oled": true,
"rgb_matrix": true
},
"matrix_pins": {
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
index 47625ecc4dd..aa19a502b98 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json
@@ -24,6 +24,7 @@
"extrakey": true,
"mousekey": true,
"nkro": false,
+ "oled": true,
"rgb_matrix": true
},
"matrix_pins": {
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index 3451f44976a..48aea570e01 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,3 +1 @@
-OLED_ENABLE = yes
-
DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
index a8c773a3054..1edcb0a3455 100644
--- a/keyboards/25keys/zinc/rules.mk
+++ b/keyboards/25keys/zinc/rules.mk
@@ -1,4 +1 @@
DEFAULT_FOLDER = 25keys/zinc/rev1
-
-#SRC += i2c.c
-SRC += serial.c
diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json
deleted file mode 100644
index 2db9363564d..00000000000
--- a/keyboards/3w6/rev1/info.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.8},
- {"matrix": [0, 1], "x": 1, "y": 0.2},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.2},
- {"matrix": [0, 4], "x": 4, "y": 0.4},
-
- {"matrix": [4, 0], "x": 8, "y": 0.4},
- {"matrix": [4, 1], "x": 9, "y": 0.2},
- {"matrix": [4, 2], "x": 10, "y": 0},
- {"matrix": [4, 3], "x": 11, "y": 0.2},
- {"matrix": [4, 4], "x": 12, "y": 0.8},
-
- {"matrix": [1, 0], "x": 0, "y": 1.8},
- {"matrix": [1, 1], "x": 1, "y": 1.2},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.2},
- {"matrix": [1, 4], "x": 4, "y": 1.4},
-
- {"matrix": [5, 0], "x": 8, "y": 1.4},
- {"matrix": [5, 1], "x": 9, "y": 1.2},
- {"matrix": [5, 2], "x": 10, "y": 1},
- {"matrix": [5, 3], "x": 11, "y": 1.2},
- {"matrix": [5, 4], "x": 12, "y": 1.8},
-
- {"matrix": [2, 0], "x": 0, "y": 2.8},
- {"matrix": [2, 1], "x": 1, "y": 2.2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.2},
- {"matrix": [2, 4], "x": 4, "y": 2.4},
-
- {"matrix": [6, 0], "x": 8, "y": 2.4},
- {"matrix": [6, 1], "x": 9, "y": 2.2},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 3], "x": 11, "y": 2.2},
- {"matrix": [6, 4], "x": 12, "y": 2.8},
-
- {"matrix": [3, 2], "x": 3.2, "y": 3.6},
- {"matrix": [3, 3], "x": 4.2, "y": 3.6},
- {"matrix": [3, 4], "x": 5.2, "y": 3.8},
-
- {"matrix": [7, 0], "x": 6.8, "y": 3.8},
- {"matrix": [7, 1], "x": 7.8, "y": 3.6},
- {"matrix": [7, 2], "x": 8.8, "y": 3.6}
- ]
- }
- }
-}
diff --git a/keyboards/3w6/rev1/keyboard.json b/keyboards/3w6/rev1/keyboard.json
new file mode 100644
index 00000000000..478c79b9427
--- /dev/null
+++ b/keyboards/3w6/rev1/keyboard.json
@@ -0,0 +1,64 @@
+{
+ "usb": {
+ "device_version": "0.0.1",
+ "no_startup_check": true
+ },
+ "features": {
+ "bootmagic": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "unicode": true
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.8},
+ {"matrix": [0, 1], "x": 1, "y": 0.2},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.2},
+ {"matrix": [0, 4], "x": 4, "y": 0.4},
+
+ {"matrix": [4, 0], "x": 8, "y": 0.4},
+ {"matrix": [4, 1], "x": 9, "y": 0.2},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0.2},
+ {"matrix": [4, 4], "x": 12, "y": 0.8},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.8},
+ {"matrix": [1, 1], "x": 1, "y": 1.2},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.2},
+ {"matrix": [1, 4], "x": 4, "y": 1.4},
+
+ {"matrix": [5, 0], "x": 8, "y": 1.4},
+ {"matrix": [5, 1], "x": 9, "y": 1.2},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 3], "x": 11, "y": 1.2},
+ {"matrix": [5, 4], "x": 12, "y": 1.8},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.8},
+ {"matrix": [2, 1], "x": 1, "y": 2.2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.2},
+ {"matrix": [2, 4], "x": 4, "y": 2.4},
+
+ {"matrix": [6, 0], "x": 8, "y": 2.4},
+ {"matrix": [6, 1], "x": 9, "y": 2.2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2.2},
+ {"matrix": [6, 4], "x": 12, "y": 2.8},
+
+ {"matrix": [3, 2], "x": 3.2, "y": 3.6},
+ {"matrix": [3, 3], "x": 4.2, "y": 3.6},
+ {"matrix": [3, 4], "x": 5.2, "y": 3.8},
+
+ {"matrix": [7, 0], "x": 6.8, "y": 3.8},
+ {"matrix": [7, 1], "x": 7.8, "y": 3.6},
+ {"matrix": [7, 2], "x": 8.8, "y": 3.6}
+ ]
+ }
+ }
+}
diff --git a/keyboards/3w6/rev1/rules.mk b/keyboards/3w6/rev1/rules.mk
index b7988ce4f55..cea39bb5c90 100644
--- a/keyboards/3w6/rev1/rules.mk
+++ b/keyboards/3w6/rev1/rules.mk
@@ -1,19 +1,3 @@
-# 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
-UNICODE_ENABLE = yes
CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
-
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json
deleted file mode 100644
index 70ee0e0fcac..00000000000
--- a/keyboards/3w6/rev2/info.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.2"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.8},
- {"matrix": [0, 1], "x": 1, "y": 0.2},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.2},
- {"matrix": [0, 4], "x": 4, "y": 0.4},
-
- {"matrix": [4, 0], "x": 8, "y": 0.4},
- {"matrix": [4, 1], "x": 9, "y": 0.2},
- {"matrix": [4, 2], "x": 10, "y": 0},
- {"matrix": [4, 3], "x": 11, "y": 0.2},
- {"matrix": [4, 4], "x": 12, "y": 0.8},
-
- {"matrix": [1, 0], "x": 0, "y": 1.8},
- {"matrix": [1, 1], "x": 1, "y": 1.2},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.2},
- {"matrix": [1, 4], "x": 4, "y": 1.4},
-
- {"matrix": [5, 0], "x": 8, "y": 1.4},
- {"matrix": [5, 1], "x": 9, "y": 1.2},
- {"matrix": [5, 2], "x": 10, "y": 1},
- {"matrix": [5, 3], "x": 11, "y": 1.2},
- {"matrix": [5, 4], "x": 12, "y": 1.8},
-
- {"matrix": [2, 0], "x": 0, "y": 2.8},
- {"matrix": [2, 1], "x": 1, "y": 2.2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.2},
- {"matrix": [2, 4], "x": 4, "y": 2.4},
-
- {"matrix": [6, 0], "x": 8, "y": 2.4},
- {"matrix": [6, 1], "x": 9, "y": 2.2},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 3], "x": 11, "y": 2.2},
- {"matrix": [6, 4], "x": 12, "y": 2.8},
-
- {"matrix": [3, 2], "x": 3.2, "y": 3.6},
- {"matrix": [3, 3], "x": 4.2, "y": 3.6},
- {"matrix": [3, 4], "x": 5.2, "y": 3.8},
-
- {"matrix": [7, 0], "x": 6.8, "y": 3.8},
- {"matrix": [7, 1], "x": 7.8, "y": 3.6},
- {"matrix": [7, 2], "x": 8.8, "y": 3.6}
- ]
- }
- }
-}
diff --git a/keyboards/3w6/rev2/keyboard.json b/keyboards/3w6/rev2/keyboard.json
new file mode 100644
index 00000000000..f3981e88d98
--- /dev/null
+++ b/keyboards/3w6/rev2/keyboard.json
@@ -0,0 +1,64 @@
+{
+ "usb": {
+ "device_version": "0.0.2",
+ "no_startup_check": true
+ },
+ "features": {
+ "bootmagic": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "unicode": true
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.8},
+ {"matrix": [0, 1], "x": 1, "y": 0.2},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.2},
+ {"matrix": [0, 4], "x": 4, "y": 0.4},
+
+ {"matrix": [4, 0], "x": 8, "y": 0.4},
+ {"matrix": [4, 1], "x": 9, "y": 0.2},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0.2},
+ {"matrix": [4, 4], "x": 12, "y": 0.8},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.8},
+ {"matrix": [1, 1], "x": 1, "y": 1.2},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.2},
+ {"matrix": [1, 4], "x": 4, "y": 1.4},
+
+ {"matrix": [5, 0], "x": 8, "y": 1.4},
+ {"matrix": [5, 1], "x": 9, "y": 1.2},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 3], "x": 11, "y": 1.2},
+ {"matrix": [5, 4], "x": 12, "y": 1.8},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.8},
+ {"matrix": [2, 1], "x": 1, "y": 2.2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.2},
+ {"matrix": [2, 4], "x": 4, "y": 2.4},
+
+ {"matrix": [6, 0], "x": 8, "y": 2.4},
+ {"matrix": [6, 1], "x": 9, "y": 2.2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2.2},
+ {"matrix": [6, 4], "x": 12, "y": 2.8},
+
+ {"matrix": [3, 2], "x": 3.2, "y": 3.6},
+ {"matrix": [3, 3], "x": 4.2, "y": 3.6},
+ {"matrix": [3, 4], "x": 5.2, "y": 3.8},
+
+ {"matrix": [7, 0], "x": 6.8, "y": 3.8},
+ {"matrix": [7, 1], "x": 7.8, "y": 3.6},
+ {"matrix": [7, 2], "x": 8.8, "y": 3.6}
+ ]
+ }
+ }
+}
diff --git a/keyboards/3w6/rev2/rules.mk b/keyboards/3w6/rev2/rules.mk
index b7988ce4f55..cea39bb5c90 100644
--- a/keyboards/3w6/rev2/rules.mk
+++ b/keyboards/3w6/rev2/rules.mk
@@ -1,19 +1,3 @@
-# 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
-UNICODE_ENABLE = yes
CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
-
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/4pplet/waffling60/rev_e/info.json b/keyboards/4pplet/waffling60/rev_e/keyboard.json
similarity index 100%
rename from keyboards/4pplet/waffling60/rev_e/info.json
rename to keyboards/4pplet/waffling60/rev_e/keyboard.json
diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/info.json b/keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json
similarity index 100%
rename from keyboards/4pplet/waffling60/rev_e_ansi/info.json
rename to keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json
diff --git a/keyboards/4pplet/waffling60/rev_e_iso/info.json b/keyboards/4pplet/waffling60/rev_e_iso/keyboard.json
similarity index 100%
rename from keyboards/4pplet/waffling60/rev_e_iso/info.json
rename to keyboards/4pplet/waffling60/rev_e_iso/keyboard.json
diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/keyboard.json
similarity index 100%
rename from keyboards/acheron/shark/alpha/info.json
rename to keyboards/acheron/shark/alpha/keyboard.json
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/keyboard.json
similarity index 100%
rename from keyboards/adafruit/macropad/info.json
rename to keyboards/adafruit/macropad/keyboard.json
diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/keyboard.json
similarity index 100%
rename from keyboards/adpenrose/mine/info.json
rename to keyboards/adpenrose/mine/keyboard.json
diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/keyboard.json
similarity index 100%
rename from keyboards/aeboards/ext65/rev3/info.json
rename to keyboards/aeboards/ext65/rev3/keyboard.json
diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/keyboard.json
similarity index 100%
rename from keyboards/aeboards/satellite/rev1/info.json
rename to keyboards/aeboards/satellite/rev1/keyboard.json
diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/keyboard.json
similarity index 100%
rename from keyboards/ai03/lunar_ii/info.json
rename to keyboards/ai03/lunar_ii/keyboard.json
diff --git a/keyboards/aidansmithdotdev/sango/info.json b/keyboards/aidansmithdotdev/sango/keyboard.json
similarity index 100%
rename from keyboards/aidansmithdotdev/sango/info.json
rename to keyboards/aidansmithdotdev/sango/keyboard.json
diff --git a/keyboards/al1/info.json b/keyboards/al1/keyboard.json
similarity index 100%
rename from keyboards/al1/info.json
rename to keyboards/al1/keyboard.json
diff --git a/keyboards/alas/info.json b/keyboards/alas/keyboard.json
similarity index 100%
rename from keyboards/alas/info.json
rename to keyboards/alas/keyboard.json
diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/keyboard.json
similarity index 100%
rename from keyboards/aliceh66/pianoforte/info.json
rename to keyboards/aliceh66/pianoforte/keyboard.json
diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/keyboard.json
similarity index 100%
rename from keyboards/aliceh66/pianoforte_hs/info.json
rename to keyboards/aliceh66/pianoforte_hs/keyboard.json
diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/keyboard.json
similarity index 100%
rename from keyboards/amjkeyboard/amj66/info.json
rename to keyboards/amjkeyboard/amj66/keyboard.json
diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/keyboard.json
similarity index 100%
rename from keyboards/amjkeyboard/amj96/info.json
rename to keyboards/amjkeyboard/amj96/keyboard.json
diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/keyboard.json
similarity index 100%
rename from keyboards/annepro2/c15/info.json
rename to keyboards/annepro2/c15/keyboard.json
diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/keyboard.json
similarity index 100%
rename from keyboards/annepro2/c18/info.json
rename to keyboards/annepro2/c18/keyboard.json
diff --git a/keyboards/argyle/info.json b/keyboards/argyle/keyboard.json
similarity index 100%
rename from keyboards/argyle/info.json
rename to keyboards/argyle/keyboard.json
diff --git a/keyboards/arrowmechanics/wings/info.json b/keyboards/arrowmechanics/wings/keyboard.json
similarity index 100%
rename from keyboards/arrowmechanics/wings/info.json
rename to keyboards/arrowmechanics/wings/keyboard.json
diff --git a/keyboards/artifact/lvl/rev_hs01/info.json b/keyboards/artifact/lvl/rev_hs01/keyboard.json
similarity index 100%
rename from keyboards/artifact/lvl/rev_hs01/info.json
rename to keyboards/artifact/lvl/rev_hs01/keyboard.json
diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/keyboard.json
similarity index 100%
rename from keyboards/aurora65/info.json
rename to keyboards/aurora65/keyboard.json
diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/keyboard.json
similarity index 100%
rename from keyboards/axolstudio/helpo/info.json
rename to keyboards/axolstudio/helpo/keyboard.json
diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h
deleted file mode 100644
index 0c56f57b207..00000000000
--- a/keyboards/bacca70/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2022 keebnewb
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
diff --git a/keyboards/bacca70/keyboard.json b/keyboards/bacca70/keyboard.json
index c192fb0eb23..8d4483bc6fa 100644
--- a/keyboards/bacca70/keyboard.json
+++ b/keyboards/bacca70/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "B12", "B13", "B14", "B15", "A8"],
"rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "A9", "A10"]
diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h
deleted file mode 100644
index 3005d1bcfbb..00000000000
--- a/keyboards/baguette/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Yiancar
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/baguette/keyboard.json b/keyboards/baguette/keyboard.json
index f6797dd9390..001757f8618 100644
--- a/keyboards/baguette/keyboard.json
+++ b/keyboards/baguette/keyboard.json
@@ -17,6 +17,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B0", "D0", "D1", "D2", "D3", "D5", "D4"],
"rows": ["B3", "B2", "B1", "E6", "D6"]
diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/info.json
deleted file mode 100755
index d8834ec0662..00000000000
--- a/keyboards/baion_808/info.json
+++ /dev/null
@@ -1,972 +0,0 @@
-{
- "keyboard_name": "Baion 808",
- "manufacturer": "Yiancar-Designs",
- "url": "https://yiancar-designs.com",
- "maintainer": "Yiancar-Designs",
- "usb": {
- "vid": "0x8968",
- "pid": "0x4238",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
- "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "indicators": {
- "caps_lock": "B6",
- "scroll_lock": "B7",
- "on_state": 0
- },
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"matrix": [1, 5], "x": 5, "y": 1.5},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
- {"matrix": [1, 7], "x": 7, "y": 1.5},
- {"matrix": [1, 8], "x": 8, "y": 1.5},
- {"matrix": [1, 9], "x": 9, "y": 1.5},
- {"matrix": [1, 10], "x": 10, "y": 1.5},
- {"matrix": [1, 11], "x": 11, "y": 1.5},
- {"matrix": [1, 12], "x": 12, "y": 1.5},
- {"matrix": [1, 13], "x": 13, "y": 1.5},
- {"matrix": [2, 13], "x": 14, "y": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.5},
- {"matrix": [1, 15], "x": 16.25, "y": 1.5},
- {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.5},
- {"matrix": [2, 2], "x": 2.5, "y": 2.5},
- {"matrix": [2, 3], "x": 3.5, "y": 2.5},
- {"matrix": [2, 4], "x": 4.5, "y": 2.5},
- {"matrix": [2, 5], "x": 5.5, "y": 2.5},
- {"matrix": [2, 6], "x": 6.5, "y": 2.5},
- {"matrix": [2, 7], "x": 7.5, "y": 2.5},
- {"matrix": [2, 8], "x": 8.5, "y": 2.5},
- {"matrix": [2, 9], "x": 9.5, "y": 2.5},
- {"matrix": [2, 10], "x": 10.5, "y": 2.5},
- {"matrix": [2, 11], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.5},
- {"matrix": [2, 15], "x": 16.25, "y": 2.5},
- {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.5},
- {"matrix": [3, 2], "x": 2.75, "y": 3.5},
- {"matrix": [3, 3], "x": 3.75, "y": 3.5},
- {"matrix": [3, 4], "x": 4.75, "y": 3.5},
- {"matrix": [3, 5], "x": 5.75, "y": 3.5},
- {"matrix": [3, 6], "x": 6.75, "y": 3.5},
- {"matrix": [3, 7], "x": 7.75, "y": 3.5},
- {"matrix": [3, 8], "x": 8.75, "y": 3.5},
- {"matrix": [3, 9], "x": 9.75, "y": 3.5},
- {"matrix": [3, 10], "x": 10.75, "y": 3.5},
- {"matrix": [3, 11], "x": 11.75, "y": 3.5},
- {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4.5},
- {"matrix": [4, 2], "x": 2.25, "y": 4.5},
- {"matrix": [4, 3], "x": 3.25, "y": 4.5},
- {"matrix": [4, 4], "x": 4.25, "y": 4.5},
- {"matrix": [4, 5], "x": 5.25, "y": 4.5},
- {"matrix": [4, 6], "x": 6.25, "y": 4.5},
- {"matrix": [4, 7], "x": 7.25, "y": 4.5},
- {"matrix": [4, 8], "x": 8.25, "y": 4.5},
- {"matrix": [4, 9], "x": 9.25, "y": 4.5},
- {"matrix": [4, 10], "x": 10.25, "y": 4.5},
- {"matrix": [4, 11], "x": 11.25, "y": 4.5},
- {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4.5},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"matrix": [5, 15], "x": 16.25, "y": 5.5},
- {"matrix": [5, 16], "x": 17.25, "y": 5.5}
- ]
- },
- "LAYOUT_tkl_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
- {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_ansi_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25},
- {"matrix": [2, 13], "x": 14, "y": 1.25},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
- {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_ansi_tsangan": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25},
- {"matrix": [2, 13], "x": 14, "y": 1.25},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_iso": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"matrix": [2, 15], "x": 15.25, "y": 2.25},
- {"matrix": [2, 16], "x": 16.25, "y": 2.25},
- {"matrix": [3, 0], "x": 17.25, "y": 2.25},
-
- {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 2], "x": 1.75, "y": 3.25},
- {"matrix": [3, 3], "x": 2.75, "y": 3.25},
- {"matrix": [3, 4], "x": 3.75, "y": 3.25},
- {"matrix": [3, 5], "x": 4.75, "y": 3.25},
- {"matrix": [3, 6], "x": 5.75, "y": 3.25},
- {"matrix": [3, 7], "x": 6.75, "y": 3.25},
- {"matrix": [3, 8], "x": 7.75, "y": 3.25},
- {"matrix": [3, 9], "x": 8.75, "y": 3.25},
- {"matrix": [3, 10], "x": 9.75, "y": 3.25},
- {"matrix": [3, 11], "x": 10.75, "y": 3.25},
- {"matrix": [3, 12], "x": 11.75, "y": 3.25},
- {"matrix": [3, 13], "x": 12.75, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
- {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_iso_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25},
- {"matrix": [2, 13], "x": 14, "y": 1.25},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"matrix": [2, 15], "x": 15.25, "y": 2.25},
- {"matrix": [2, 16], "x": 16.25, "y": 2.25},
- {"matrix": [3, 0], "x": 17.25, "y": 2.25},
-
- {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 2], "x": 1.75, "y": 3.25},
- {"matrix": [3, 3], "x": 2.75, "y": 3.25},
- {"matrix": [3, 4], "x": 3.75, "y": 3.25},
- {"matrix": [3, 5], "x": 4.75, "y": 3.25},
- {"matrix": [3, 6], "x": 5.75, "y": 3.25},
- {"matrix": [3, 7], "x": 6.75, "y": 3.25},
- {"matrix": [3, 8], "x": 7.75, "y": 3.25},
- {"matrix": [3, 9], "x": 8.75, "y": 3.25},
- {"matrix": [3, 10], "x": 9.75, "y": 3.25},
- {"matrix": [3, 11], "x": 10.75, "y": 3.25},
- {"matrix": [3, 12], "x": 11.75, "y": 3.25},
- {"matrix": [3, 13], "x": 12.75, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
- {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_iso_tsangan": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"matrix": [2, 15], "x": 15.25, "y": 2.25},
- {"matrix": [2, 16], "x": 16.25, "y": 2.25},
- {"matrix": [3, 0], "x": 17.25, "y": 2.25},
-
- {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 2], "x": 1.75, "y": 3.25},
- {"matrix": [3, 3], "x": 2.75, "y": 3.25},
- {"matrix": [3, 4], "x": 3.75, "y": 3.25},
- {"matrix": [3, 5], "x": 4.75, "y": 3.25},
- {"matrix": [3, 6], "x": 5.75, "y": 3.25},
- {"matrix": [3, 7], "x": 6.75, "y": 3.25},
- {"matrix": [3, 8], "x": 7.75, "y": 3.25},
- {"matrix": [3, 9], "x": 8.75, "y": 3.25},
- {"matrix": [3, 10], "x": 9.75, "y": 3.25},
- {"matrix": [3, 11], "x": 10.75, "y": 3.25},
- {"matrix": [3, 12], "x": 11.75, "y": 3.25},
- {"matrix": [3, 13], "x": 12.75, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25},
- {"matrix": [2, 13], "x": 14, "y": 1.25},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"matrix": [2, 15], "x": 15.25, "y": 2.25},
- {"matrix": [2, 16], "x": 16.25, "y": 2.25},
- {"matrix": [3, 0], "x": 17.25, "y": 2.25},
-
- {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 2], "x": 1.75, "y": 3.25},
- {"matrix": [3, 3], "x": 2.75, "y": 3.25},
- {"matrix": [3, 4], "x": 3.75, "y": 3.25},
- {"matrix": [3, 5], "x": 4.75, "y": 3.25},
- {"matrix": [3, 6], "x": 5.75, "y": 3.25},
- {"matrix": [3, 7], "x": 6.75, "y": 3.25},
- {"matrix": [3, 8], "x": 7.75, "y": 3.25},
- {"matrix": [3, 9], "x": 8.75, "y": 3.25},
- {"matrix": [3, 10], "x": 9.75, "y": 3.25},
- {"matrix": [3, 11], "x": 10.75, "y": 3.25},
- {"matrix": [3, 12], "x": 11.75, "y": 3.25},
- {"matrix": [3, 13], "x": 12.75, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/baion_808/keyboard.json b/keyboards/baion_808/keyboard.json
new file mode 100755
index 00000000000..c770a65e257
--- /dev/null
+++ b/keyboards/baion_808/keyboard.json
@@ -0,0 +1,979 @@
+{
+ "keyboard_name": "Baion 808",
+ "manufacturer": "Yiancar-Designs",
+ "url": "https://yiancar-designs.com",
+ "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x4238",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+ "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "B6",
+ "scroll_lock": "B7",
+ "on_state": 0
+ },
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "community_layouts": ["tkl_ansi", "tkl_ansi_tsangan", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"],
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5},
+ {"matrix": [2, 13], "x": 14, "y": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_iso_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_iso_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+ {"matrix": [3, 0], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/baion_808/rules.mk b/keyboards/baion_808/rules.mk
index 11c4a00e5a5..0ab54aaaf71 100644
--- a/keyboards/baion_808/rules.mk
+++ b/keyboards/baion_808/rules.mk
@@ -1,17 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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
-
-LAYOUTS = tkl_ansi tkl_ansi_tsangan tkl_ansi_split_bs_rshift tkl_ansi_tsangan_split_bs_rshift tkl_iso tkl_iso_split_bs_rshift tkl_iso_tsangan tkl_iso_tsangan_split_bs_rshift
diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h
index 72d296bca4b..455588fb084 100644
--- a/keyboards/bajjak/config.h
+++ b/keyboards/bajjak/config.h
@@ -43,11 +43,6 @@ along with this program. If not, see .
#define MOUSEKEY_MAX_SPEED 7
#define MOUSEKEY_WHEEL_DELAY 0
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/* key combination for command */
#define IS_COMMAND() ( \
get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/info.json
deleted file mode 100644
index bf090bb7d63..00000000000
--- a/keyboards/bajjak/info.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
- "keyboard_name": "BAJJAK",
- "manufacturer": "garykong",
- "maintainer": "garykong",
- "debounce": 30,
- "usb": {
- "vid": "0x1209",
- "pid": "0x0002",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "halfkay",
- "tapping": {
- "toggle": 1
- },
- "build": {
- "debounce_type": "sym_eager_pr"
- },
- "layouts": {
- "LAYOUT_6x7": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
- {"matrix": [1, 0], "x": 1.5, "y": 0.375},
- {"matrix": [2, 0], "x": 2.5, "y": 0.125},
- {"matrix": [3, 0], "x": 3.5, "y": 0},
- {"matrix": [4, 0], "x": 4.5, "y": 0.125},
- {"matrix": [5, 0], "x": 5.5, "y": 0.25},
- {"matrix": [6, 0], "x": 6.5, "y": 0.25},
-
- {"matrix": [7, 0], "x": 9.5, "y": 0.25},
- {"matrix": [8, 0], "x": 10.5, "y": 0.25},
- {"matrix": [9, 0], "x": 11.5, "y": 0.125},
- {"matrix": [10, 0], "x": 12.5, "y": 0},
- {"matrix": [11, 0], "x": 13.5, "y": 0.125},
- {"matrix": [12, 0], "x": 14.5, "y": 0.375},
- {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
- {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1.375},
- {"matrix": [2, 1], "x": 2.5, "y": 1.125},
- {"matrix": [3, 1], "x": 3.5, "y": 1},
- {"matrix": [4, 1], "x": 4.5, "y": 1.125},
- {"matrix": [5, 1], "x": 5.5, "y": 1.25},
- {"matrix": [6, 1], "x": 6.5, "y": 1.25},
-
- {"matrix": [7, 1], "x": 9.5, "y": 1.25},
- {"matrix": [8, 1], "x": 10.5, "y": 1.25},
- {"matrix": [9, 1], "x": 11.5, "y": 1.125},
- {"matrix": [10, 1], "x": 12.5, "y": 1},
- {"matrix": [11, 1], "x": 13.5, "y": 1.125},
- {"matrix": [12, 1], "x": 14.5, "y": 1.375},
- {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
- {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
- {"matrix": [1, 2], "x": 1.5, "y": 2.375},
- {"matrix": [2, 2], "x": 2.5, "y": 2.125},
- {"matrix": [3, 2], "x": 3.5, "y": 2},
- {"matrix": [4, 2], "x": 4.5, "y": 2.125},
- {"matrix": [5, 2], "x": 5.5, "y": 2.25},
- {"matrix": [6, 2], "x": 6.5, "y": 2.25},
-
- {"matrix": [7, 2], "x": 9.5, "y": 2.25},
- {"matrix": [8, 2], "x": 10.5, "y": 2.25},
- {"matrix": [9, 2], "x": 11.5, "y": 2.125},
- {"matrix": [10, 2], "x": 12.5, "y": 2},
- {"matrix": [11, 2], "x": 13.5, "y": 2.125},
- {"matrix": [12, 2], "x": 14.5, "y": 2.375},
- {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-
- {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
- {"matrix": [1, 3], "x": 1.5, "y": 3.375},
- {"matrix": [2, 3], "x": 2.5, "y": 3.125},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [4, 3], "x": 4.5, "y": 3.125},
- {"matrix": [5, 3], "x": 5.5, "y": 3.25},
- {"matrix": [6, 3], "x": 6.5, "y": 3.25},
-
- {"matrix": [7, 3], "x": 9.5, "y": 3.25},
- {"matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"matrix": [9, 3], "x": 11.5, "y": 3.125},
- {"matrix": [10, 3], "x": 12.5, "y": 3},
- {"matrix": [11, 3], "x": 13.5, "y": 3.125},
- {"matrix": [12, 3], "x": 14.5, "y": 3.375},
- {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
- {"matrix": [0, 4], "x": 0, "y": 4.375, "w": 1.5},
- {"matrix": [1, 4], "x": 1.5, "y": 4.375},
- {"matrix": [2, 4], "x": 2.5, "y": 4.125},
- {"matrix": [3, 4], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4.125},
- {"matrix": [5, 4], "x": 5.5, "y": 4.25},
-
- {"matrix": [8, 4], "x": 10.5, "y": 4.25},
- {"matrix": [9, 4], "x": 11.5, "y": 4.125},
- {"matrix": [10, 4], "x": 12.5, "y": 4},
- {"matrix": [11, 4], "x": 13.5, "y": 4.125},
- {"matrix": [12, 4], "x": 14.5, "y": 4.375},
- {"matrix": [13, 4], "x": 15.5, "y": 4.375, "w": 1.5},
-
- {"matrix": [0, 5], "x": 0, "y": 5.375, "w": 1.5},
- {"matrix": [1, 5], "x": 1.5, "y": 5.375},
- {"matrix": [2, 5], "x": 2.5, "y": 5.125},
- {"matrix": [3, 5], "x": 3.5, "y": 5},
- {"matrix": [4, 5], "x": 4.5, "y": 5.125},
-
- {"matrix": [9, 5], "x": 11.5, "y": 5.125},
- {"matrix": [10, 5], "x": 12.5, "y": 5},
- {"matrix": [11, 5], "x": 13.5, "y": 5.125},
- {"matrix": [12, 5], "x": 14.5, "y": 5.375},
- {"matrix": [13, 5], "x": 15.5, "y": 5.375, "w": 1.5},
-
- {"matrix": [5, 6], "x": 6, "y": 6},
- {"matrix": [6, 6], "x": 7, "y": 6},
-
- {"matrix": [7, 6], "x": 9, "y": 6},
- {"matrix": [8, 6], "x": 10, "y": 6},
-
- {"matrix": [4, 6], "x": 7, "y": 7},
-
- {"matrix": [9, 6], "x": 9, "y": 7},
-
- {"matrix": [3, 6], "x": 5, "y": 7, "h": 2},
- {"matrix": [2, 6], "x": 6, "y": 7, "h": 2},
- {"matrix": [1, 6], "x": 7, "y": 8},
-
- {"matrix": [12, 6], "x": 9, "y": 8},
- {"matrix": [11, 6], "x": 10, "y": 7, "h": 2},
- {"matrix": [10, 6], "x": 11, "y": 7, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/bajjak/keyboard.json b/keyboards/bajjak/keyboard.json
new file mode 100644
index 00000000000..a4ab7298ee1
--- /dev/null
+++ b/keyboards/bajjak/keyboard.json
@@ -0,0 +1,147 @@
+{
+ "keyboard_name": "BAJJAK",
+ "manufacturer": "garykong",
+ "maintainer": "garykong",
+ "debounce": 30,
+ "usb": {
+ "vid": "0x1209",
+ "pid": "0x0002",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "unicode": true,
+ "swap_hands": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "halfkay",
+ "tapping": {
+ "toggle": 1
+ },
+ "build": {
+ "debounce_type": "sym_eager_pr"
+ },
+ "layouts": {
+ "LAYOUT_6x7": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+ {"matrix": [3, 0], "x": 3.5, "y": 0},
+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+ {"matrix": [10, 0], "x": 12.5, "y": 0},
+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6.5, "y": 1.25},
+
+ {"matrix": [7, 1], "x": 9.5, "y": 1.25},
+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+ {"matrix": [10, 1], "x": 12.5, "y": 1},
+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [3, 2], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+
+ {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+ {"matrix": [10, 2], "x": 12.5, "y": 2},
+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 3.25},
+
+ {"matrix": [7, 3], "x": 9.5, "y": 3.25},
+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+ {"matrix": [10, 3], "x": 12.5, "y": 3},
+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+ {"matrix": [0, 4], "x": 0, "y": 4.375, "w": 1.5},
+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+ {"matrix": [3, 4], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+ {"matrix": [5, 4], "x": 5.5, "y": 4.25},
+
+ {"matrix": [8, 4], "x": 10.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+ {"matrix": [10, 4], "x": 12.5, "y": 4},
+ {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+ {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+ {"matrix": [13, 4], "x": 15.5, "y": 4.375, "w": 1.5},
+
+ {"matrix": [0, 5], "x": 0, "y": 5.375, "w": 1.5},
+ {"matrix": [1, 5], "x": 1.5, "y": 5.375},
+ {"matrix": [2, 5], "x": 2.5, "y": 5.125},
+ {"matrix": [3, 5], "x": 3.5, "y": 5},
+ {"matrix": [4, 5], "x": 4.5, "y": 5.125},
+
+ {"matrix": [9, 5], "x": 11.5, "y": 5.125},
+ {"matrix": [10, 5], "x": 12.5, "y": 5},
+ {"matrix": [11, 5], "x": 13.5, "y": 5.125},
+ {"matrix": [12, 5], "x": 14.5, "y": 5.375},
+ {"matrix": [13, 5], "x": 15.5, "y": 5.375, "w": 1.5},
+
+ {"matrix": [5, 6], "x": 6, "y": 6},
+ {"matrix": [6, 6], "x": 7, "y": 6},
+
+ {"matrix": [7, 6], "x": 9, "y": 6},
+ {"matrix": [8, 6], "x": 10, "y": 6},
+
+ {"matrix": [4, 6], "x": 7, "y": 7},
+
+ {"matrix": [9, 6], "x": 9, "y": 7},
+
+ {"matrix": [3, 6], "x": 5, "y": 7, "h": 2},
+ {"matrix": [2, 6], "x": 6, "y": 7, "h": 2},
+ {"matrix": [1, 6], "x": 7, "y": 8},
+
+ {"matrix": [12, 6], "x": 9, "y": 8},
+ {"matrix": [11, 6], "x": 10, "y": 7, "h": 2},
+ {"matrix": [10, 6], "x": 11, "y": 7, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bajjak/rules.mk b/keyboards/bajjak/rules.mk
index 21db4112e06..08caba6edc1 100644
--- a/keyboards/bajjak/rules.mk
+++ b/keyboards/bajjak/rules.mk
@@ -3,22 +3,7 @@
# details), include the following define:
OPT_DEFS += -DLEFT_LEDS
-# 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 = yes # 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
-
CUSTOM_MATRIX = lite # Custom matrix file for the BAJJAK
-UNICODE_ENABLE = yes # Unicode
-SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard
# Disable unsupported hardware
BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json
deleted file mode 100644
index deea0f3e5ef..00000000000
--- a/keyboards/bandominedoni/info.json
+++ /dev/null
@@ -1,131 +0,0 @@
-{
- "keyboard_name": "bandominedoni",
- "manufacturer": "3araht",
- "url": "https://github.com/3araht",
- "maintainer": "3araht",
- "usb": {
- "vid": "0xFEED",
- "pid": "0xF4B5",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "driver": "ws2812",
- "max_brightness": 50,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],
- "rows": ["B5", "B4", "D7", "F6", "C6", "D4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "F5", "pin_b": "F4"}
- ]
- }
- }
- },
- "qmk": {
- "tap_keycode_delay": 10
- },
- "ws2812": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label": "l00", "matrix": [0, 1], "x": 2, "y": 0.5},
- {"label": "l01", "matrix": [0, 2], "x": 3, "y": 0.5},
- {"label": "l02", "matrix": [0, 3], "x": 4, "y": 0.5},
- {"label": "l03", "matrix": [0, 4], "x": 5, "y": 0.5},
- {"label": "l04", "matrix": [0, 5], "x": 6, "y": 0.5},
-
- {"label": "l10", "matrix": [1, 0], "x": 0.5, "y": 1.5},
- {"label": "l11", "matrix": [1, 1], "x": 1.5, "y": 1.5},
- {"label": "l12", "matrix": [1, 2], "x": 2.5, "y": 1.5},
- {"label": "l13", "matrix": [1, 3], "x": 3.5, "y": 1.5},
- {"label": "l14", "matrix": [1, 4], "x": 4.5, "y": 1.5},
- {"label": "l15", "matrix": [1, 5], "x": 5.5, "y": 1.5},
- {"label": "l16", "matrix": [1, 6], "x": 6.5, "y": 1.5},
-
- {"label": "l20", "matrix": [2, 0], "x": 1, "y": 2.5},
- {"label": "l21", "matrix": [2, 1], "x": 2, "y": 2.5},
- {"label": "l22", "matrix": [2, 2], "x": 3, "y": 2.5},
- {"label": "l23", "matrix": [2, 3], "x": 4, "y": 2.5},
- {"label": "l24", "matrix": [2, 4], "x": 5, "y": 2.5},
- {"label": "l25", "matrix": [2, 5], "x": 6, "y": 2.5},
- {"label": "l26", "matrix": [2, 6], "x": 7, "y": 2.5},
-
- {"label": "l30", "matrix": [3, 0], "x": 0.5, "y": 3.5},
- {"label": "l31", "matrix": [3, 1], "x": 1.5, "y": 3.5},
- {"label": "l32", "matrix": [3, 2], "x": 2.5, "y": 3.5},
- {"label": "l33", "matrix": [3, 3], "x": 3.5, "y": 3.5},
- {"label": "l34", "matrix": [3, 4], "x": 4.5, "y": 3.5},
- {"label": "l35", "matrix": [3, 5], "x": 5.5, "y": 3.5},
- {"label": "l36", "matrix": [3, 6], "x": 6.5, "y": 3.5},
-
- {"label": "l40", "matrix": [0, 0], "x": 0, "y": 4.5},
- {"label": "l41", "matrix": [4, 0], "x": 1, "y": 4.5},
- {"label": "l42", "matrix": [4, 1], "x": 2, "y": 4.5},
- {"label": "l43", "matrix": [4, 2], "x": 3, "y": 4.5},
- {"label": "l44", "matrix": [4, 3], "x": 4, "y": 4.5},
- {"label": "l45", "matrix": [4, 4], "x": 5, "y": 4.5},
- {"label": "l46", "matrix": [4, 5], "x": 6, "y": 4.5},
- {"label": "l47", "matrix": [4, 6], "x": 7, "y": 4.5},
-
- {"label": "oc", "matrix": [7, 6], "x": 9, "y": 0},
- {"label": "r00", "matrix": [6, 5], "x": 11.5, "y": 0},
- {"label": "r01", "matrix": [7, 5], "x": 12.5, "y": 0},
- {"label": "r02", "matrix": [8, 5], "x": 13.5, "y": 0},
- {"label": "r03", "matrix": [9, 5], "x": 14.5, "y": 0},
- {"label": "fn", "matrix": [8, 6], "x": 17, "y": 0},
-
- {"label": "r10", "matrix": [6, 4], "x": 11, "y": 1},
- {"label": "r11", "matrix": [7, 4], "x": 12, "y": 1},
- {"label": "r12", "matrix": [8, 4], "x": 13, "y": 1},
- {"label": "r13", "matrix": [9, 4], "x": 14, "y": 1},
- {"label": "r14", "matrix": [10, 4], "x": 15, "y": 1},
-
- {"label": "r20", "matrix": [6, 3], "x": 10.5, "y": 2},
- {"label": "r21", "matrix": [7, 3], "x": 11.5, "y": 2},
- {"label": "r22", "matrix": [8, 3], "x": 12.5, "y": 2},
- {"label": "r23", "matrix": [9, 3], "x": 13.5, "y": 2},
- {"label": "r24", "matrix": [10, 3], "x": 14.5, "y": 2},
- {"label": "r25", "matrix": [11, 3], "x": 15.5, "y": 2},
-
- {"label": "r30", "matrix": [6, 6], "x": 9, "y": 3},
- {"label": "r31", "matrix": [6, 2], "x": 10, "y": 3},
- {"label": "r32", "matrix": [7, 2], "x": 11, "y": 3},
- {"label": "r33", "matrix": [8, 2], "x": 12, "y": 3},
- {"label": "r34", "matrix": [9, 2], "x": 13, "y": 3},
- {"label": "r35", "matrix": [10, 2], "x": 14, "y": 3},
- {"label": "r36", "matrix": [11, 2], "x": 15, "y": 3},
- {"label": "r37", "matrix": [11, 4], "x": 16, "y": 3},
-
- {"label": "r40", "matrix": [6, 1], "x": 9.5, "y": 4},
- {"label": "r41", "matrix": [7, 1], "x": 10.5, "y": 4},
- {"label": "r42", "matrix": [8, 1], "x": 11.5, "y": 4},
- {"label": "r43", "matrix": [9, 1], "x": 12.5, "y": 4},
- {"label": "r44", "matrix": [10, 1], "x": 13.5, "y": 4},
- {"label": "r45", "matrix": [11, 1], "x": 14.5, "y": 4},
- {"label": "r46", "matrix": [11, 5], "x": 15.5, "y": 4},
- {"label": "r47", "matrix": [10, 5], "x": 16.5, "y": 4},
-
- {"label": "r50", "matrix": [6, 0], "x": 9, "y": 5},
- {"label": "r51", "matrix": [7, 0], "x": 10, "y": 5},
- {"label": "r52", "matrix": [8, 0], "x": 11, "y": 5},
- {"label": "r53", "matrix": [9, 0], "x": 12, "y": 5},
- {"label": "r54", "matrix": [10, 0], "x": 13, "y": 5},
- {"label": "r55", "matrix": [11, 0], "x": 14, "y": 5},
- {"label": "r56", "matrix": [11, 6], "x": 15, "y": 5},
- {"label": "r57", "matrix": [10, 6], "x": 16, "y": 5},
- {"label": "r58", "matrix": [9, 6], "x": 17, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/bandominedoni/keyboard.json b/keyboards/bandominedoni/keyboard.json
new file mode 100644
index 00000000000..c253da0c839
--- /dev/null
+++ b/keyboards/bandominedoni/keyboard.json
@@ -0,0 +1,142 @@
+{
+ "keyboard_name": "bandominedoni",
+ "manufacturer": "3araht",
+ "url": "https://github.com/3araht",
+ "maintainer": "3araht",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xF4B5",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "midi": true,
+ "encoder": true
+ },
+ "build": {
+ "lto": true
+ },
+ "rgb_matrix": {
+ "driver": "ws2812",
+ "max_brightness": 50,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],
+ "rows": ["B5", "B4", "D7", "F6", "C6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "F5", "pin_b": "F4"}
+ ]
+ }
+ }
+ },
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "l00", "matrix": [0, 1], "x": 2, "y": 0.5},
+ {"label": "l01", "matrix": [0, 2], "x": 3, "y": 0.5},
+ {"label": "l02", "matrix": [0, 3], "x": 4, "y": 0.5},
+ {"label": "l03", "matrix": [0, 4], "x": 5, "y": 0.5},
+ {"label": "l04", "matrix": [0, 5], "x": 6, "y": 0.5},
+
+ {"label": "l10", "matrix": [1, 0], "x": 0.5, "y": 1.5},
+ {"label": "l11", "matrix": [1, 1], "x": 1.5, "y": 1.5},
+ {"label": "l12", "matrix": [1, 2], "x": 2.5, "y": 1.5},
+ {"label": "l13", "matrix": [1, 3], "x": 3.5, "y": 1.5},
+ {"label": "l14", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"label": "l15", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"label": "l16", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+
+ {"label": "l20", "matrix": [2, 0], "x": 1, "y": 2.5},
+ {"label": "l21", "matrix": [2, 1], "x": 2, "y": 2.5},
+ {"label": "l22", "matrix": [2, 2], "x": 3, "y": 2.5},
+ {"label": "l23", "matrix": [2, 3], "x": 4, "y": 2.5},
+ {"label": "l24", "matrix": [2, 4], "x": 5, "y": 2.5},
+ {"label": "l25", "matrix": [2, 5], "x": 6, "y": 2.5},
+ {"label": "l26", "matrix": [2, 6], "x": 7, "y": 2.5},
+
+ {"label": "l30", "matrix": [3, 0], "x": 0.5, "y": 3.5},
+ {"label": "l31", "matrix": [3, 1], "x": 1.5, "y": 3.5},
+ {"label": "l32", "matrix": [3, 2], "x": 2.5, "y": 3.5},
+ {"label": "l33", "matrix": [3, 3], "x": 3.5, "y": 3.5},
+ {"label": "l34", "matrix": [3, 4], "x": 4.5, "y": 3.5},
+ {"label": "l35", "matrix": [3, 5], "x": 5.5, "y": 3.5},
+ {"label": "l36", "matrix": [3, 6], "x": 6.5, "y": 3.5},
+
+ {"label": "l40", "matrix": [0, 0], "x": 0, "y": 4.5},
+ {"label": "l41", "matrix": [4, 0], "x": 1, "y": 4.5},
+ {"label": "l42", "matrix": [4, 1], "x": 2, "y": 4.5},
+ {"label": "l43", "matrix": [4, 2], "x": 3, "y": 4.5},
+ {"label": "l44", "matrix": [4, 3], "x": 4, "y": 4.5},
+ {"label": "l45", "matrix": [4, 4], "x": 5, "y": 4.5},
+ {"label": "l46", "matrix": [4, 5], "x": 6, "y": 4.5},
+ {"label": "l47", "matrix": [4, 6], "x": 7, "y": 4.5},
+
+ {"label": "oc", "matrix": [7, 6], "x": 9, "y": 0},
+ {"label": "r00", "matrix": [6, 5], "x": 11.5, "y": 0},
+ {"label": "r01", "matrix": [7, 5], "x": 12.5, "y": 0},
+ {"label": "r02", "matrix": [8, 5], "x": 13.5, "y": 0},
+ {"label": "r03", "matrix": [9, 5], "x": 14.5, "y": 0},
+ {"label": "fn", "matrix": [8, 6], "x": 17, "y": 0},
+
+ {"label": "r10", "matrix": [6, 4], "x": 11, "y": 1},
+ {"label": "r11", "matrix": [7, 4], "x": 12, "y": 1},
+ {"label": "r12", "matrix": [8, 4], "x": 13, "y": 1},
+ {"label": "r13", "matrix": [9, 4], "x": 14, "y": 1},
+ {"label": "r14", "matrix": [10, 4], "x": 15, "y": 1},
+
+ {"label": "r20", "matrix": [6, 3], "x": 10.5, "y": 2},
+ {"label": "r21", "matrix": [7, 3], "x": 11.5, "y": 2},
+ {"label": "r22", "matrix": [8, 3], "x": 12.5, "y": 2},
+ {"label": "r23", "matrix": [9, 3], "x": 13.5, "y": 2},
+ {"label": "r24", "matrix": [10, 3], "x": 14.5, "y": 2},
+ {"label": "r25", "matrix": [11, 3], "x": 15.5, "y": 2},
+
+ {"label": "r30", "matrix": [6, 6], "x": 9, "y": 3},
+ {"label": "r31", "matrix": [6, 2], "x": 10, "y": 3},
+ {"label": "r32", "matrix": [7, 2], "x": 11, "y": 3},
+ {"label": "r33", "matrix": [8, 2], "x": 12, "y": 3},
+ {"label": "r34", "matrix": [9, 2], "x": 13, "y": 3},
+ {"label": "r35", "matrix": [10, 2], "x": 14, "y": 3},
+ {"label": "r36", "matrix": [11, 2], "x": 15, "y": 3},
+ {"label": "r37", "matrix": [11, 4], "x": 16, "y": 3},
+
+ {"label": "r40", "matrix": [6, 1], "x": 9.5, "y": 4},
+ {"label": "r41", "matrix": [7, 1], "x": 10.5, "y": 4},
+ {"label": "r42", "matrix": [8, 1], "x": 11.5, "y": 4},
+ {"label": "r43", "matrix": [9, 1], "x": 12.5, "y": 4},
+ {"label": "r44", "matrix": [10, 1], "x": 13.5, "y": 4},
+ {"label": "r45", "matrix": [11, 1], "x": 14.5, "y": 4},
+ {"label": "r46", "matrix": [11, 5], "x": 15.5, "y": 4},
+ {"label": "r47", "matrix": [10, 5], "x": 16.5, "y": 4},
+
+ {"label": "r50", "matrix": [6, 0], "x": 9, "y": 5},
+ {"label": "r51", "matrix": [7, 0], "x": 10, "y": 5},
+ {"label": "r52", "matrix": [8, 0], "x": 11, "y": 5},
+ {"label": "r53", "matrix": [9, 0], "x": 12, "y": 5},
+ {"label": "r54", "matrix": [10, 0], "x": 13, "y": 5},
+ {"label": "r55", "matrix": [11, 0], "x": 14, "y": 5},
+ {"label": "r56", "matrix": [11, 6], "x": 15, "y": 5},
+ {"label": "r57", "matrix": [10, 6], "x": 16, "y": 5},
+ {"label": "r58", "matrix": [9, 6], "x": 17, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bandominedoni/rules.mk b/keyboards/bandominedoni/rules.mk
deleted file mode 100644
index c32d761f102..00000000000
--- a/keyboards/bandominedoni/rules.mk
+++ /dev/null
@@ -1,18 +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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-MIDI_ENABLE = yes # MIDI support
-ENCODER_ENABLE = yes # encoder on mute button
-SPLIT_KEYBOARD = yes # Enables split keyboard support
-RGB_MATRIX_ENABLE = no # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-
-LTO_ENABLE = yes
diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h
deleted file mode 100644
index b9449c4714b..00000000000
--- a/keyboards/bantam44/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/bantam44/keyboard.json b/keyboards/bantam44/keyboard.json
index 2a884c2524e..ac534af6a99 100644
--- a/keyboards/bantam44/keyboard.json
+++ b/keyboards/bantam44/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B7", "D0", "B6", "F7", "F6", "F5", "F4", "F1"],
"rows": ["F0", "D6", "D4", "D5"]
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 06c67798c01..e64c243aad3 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -41,11 +41,6 @@ along with this program. If not, see .
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/info.json
deleted file mode 100644
index b4aef08b62d..00000000000
--- a/keyboards/barleycorn_smd/info.json
+++ /dev/null
@@ -1,334 +0,0 @@
-{
- "keyboard_name": "Barleycorn SMD",
- "manufacturer": "P3D Store",
- "maintainer": "matthewdias",
- "usb": {
- "vid": "0x7033",
- "pid": "0x4749",
- "device_version": "0.0.1",
- "max_power": 400
- },
- "indicators": {
- "caps_lock": "B2",
- "num_lock": "B3"
- },
- "rgblight": {
- "led_count": 15,
- "led_map": [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 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": {
- "pin": "E6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [1, 13], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [2, 14], "x": 15.5, "y": 2},
- {"matrix": [2, 15], "x": 16.5, "y": 2},
- {"matrix": [2, 16], "x": 17.5, "y": 2},
- {"matrix": [2, 17], "x": 18.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
- {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
- {"matrix": [3, 14], "x": 15.5, "y": 3},
- {"matrix": [3, 15], "x": 16.5, "y": 3},
- {"matrix": [3, 16], "x": 17.5, "y": 3},
- {"matrix": [3, 17], "x": 18.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-
- {"matrix": [4, 12], "x": 13.25, "y": 4.25},
- {"matrix": [4, 13], "x": 14.25, "y": 4.25},
- {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- },
- "LAYOUT_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [1, 13], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [2, 14], "x": 15.5, "y": 2},
- {"matrix": [2, 15], "x": 16.5, "y": 2},
- {"matrix": [2, 16], "x": 17.5, "y": 2},
- {"matrix": [2, 17], "x": 18.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
- {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
- {"matrix": [3, 14], "x": 15.5, "y": 3},
- {"matrix": [3, 15], "x": 16.5, "y": 3},
- {"matrix": [3, 16], "x": 17.5, "y": 3},
- {"matrix": [3, 17], "x": 18.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-
- {"matrix": [4, 12], "x": 13.25, "y": 4.25},
- {"matrix": [4, 13], "x": 14.25, "y": 4.25},
- {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- },
- "LAYOUT_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [1, 13], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [2, 14], "x": 15.5, "y": 2},
- {"matrix": [2, 15], "x": 16.5, "y": 2},
- {"matrix": [2, 16], "x": 17.5, "y": 2},
- {"matrix": [2, 17], "x": 18.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
- {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
- {"matrix": [3, 14], "x": 15.5, "y": 3},
- {"matrix": [3, 15], "x": 16.5, "y": 3},
- {"matrix": [3, 16], "x": 17.5, "y": 3},
- {"matrix": [3, 17], "x": 18.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
-
- {"matrix": [4, 12], "x": 13.25, "y": 4.25},
- {"matrix": [4, 13], "x": 14.25, "y": 4.25},
- {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/barleycorn_smd/keyboard.json b/keyboards/barleycorn_smd/keyboard.json
new file mode 100644
index 00000000000..cc269296d73
--- /dev/null
+++ b/keyboards/barleycorn_smd/keyboard.json
@@ -0,0 +1,346 @@
+{
+ "keyboard_name": "Barleycorn SMD",
+ "manufacturer": "P3D Store",
+ "maintainer": "matthewdias",
+ "usb": {
+ "vid": "0x7033",
+ "pid": "0x4749",
+ "device_version": "0.0.1",
+ "max_power": 400
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "indicators": {
+ "caps_lock": "B2",
+ "num_lock": "B3"
+ },
+ "rgblight": {
+ "led_count": 15,
+ "led_map": [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 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": {
+ "pin": "E6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [1, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "y": 2},
+ {"matrix": [2, 16], "x": 17.5, "y": 2},
+ {"matrix": [2, 17], "x": 18.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+ {"matrix": [3, 15], "x": 16.5, "y": 3},
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+ {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [1, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "y": 2},
+ {"matrix": [2, 16], "x": 17.5, "y": 2},
+ {"matrix": [2, 17], "x": 18.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+ {"matrix": [3, 15], "x": 16.5, "y": 3},
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+ {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ },
+ "LAYOUT_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [1, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "y": 2},
+ {"matrix": [2, 16], "x": 17.5, "y": 2},
+ {"matrix": [2, 17], "x": 18.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+ {"matrix": [3, 15], "x": 16.5, "y": 3},
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+ {"matrix": [3, 17], "x": 18.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/barleycorn_smd/rules.mk b/keyboards/barleycorn_smd/rules.mk
index 69ecebae2ae..c04c3c92ed3 100644
--- a/keyboards/barleycorn_smd/rules.mk
+++ b/keyboards/barleycorn_smd/rules.mk
@@ -1,16 +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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h
deleted file mode 100644
index 5dd1c8d063a..00000000000
--- a/keyboards/barracuda/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 knaruo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/barracuda/keyboard.json b/keyboards/barracuda/keyboard.json
index 56cf8f08bb3..6e606e11ea9 100644
--- a/keyboards/barracuda/keyboard.json
+++ b/keyboards/barracuda/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D4", "D5", "D6", "B0", "B1", "B2"],
"rows": ["C4", "C5", "C6", "D1", "D2", "D3"]
diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h
index c1008da9b86..aecd34737d4 100644
--- a/keyboards/basekeys/slice/rev1/config.h
+++ b/keyboards/basekeys/slice/rev1/config.h
@@ -21,8 +21,3 @@ along with this program. If not, see .
//#define EE_HANDS
#define MASTER_LEFT
//#define MASTER_RIGHT
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json
deleted file mode 100644
index 6b97d0c9ec9..00000000000
--- a/keyboards/basekeys/slice/rev1/info.json
+++ /dev/null
@@ -1,377 +0,0 @@
-{
- "keyboard_name": "Slice",
- "manufacturer": "2Moons",
- "url": "https://www.basekeys.com",
- "maintainer": "2Moons",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEC17",
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.66, "y": 0},
- {"matrix": [0, 2], "x": 2.66, "y": 0},
- {"matrix": [0, 3], "x": 3.66, "y": 0},
- {"matrix": [0, 4], "x": 4.66, "y": 0},
- {"matrix": [0, 5], "x": 5.66, "y": 0},
- {"matrix": [0, 6], "x": 6.66, "y": 0},
- {"matrix": [0, 7], "x": 7.66, "y": 0},
-
- {"matrix": [5, 0], "x": 9.32, "y": 0},
- {"matrix": [5, 1], "x": 10.32, "y": 0},
- {"matrix": [5, 2], "x": 11.32, "y": 0},
- {"matrix": [5, 3], "x": 12.32, "y": 0},
- {"matrix": [5, 4], "x": 13.32, "y": 0},
- {"matrix": [5, 5], "x": 14.32, "y": 0},
- {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 3.03, "y": 1},
- {"matrix": [1, 3], "x": 4.03, "y": 1},
- {"matrix": [1, 4], "x": 5.03, "y": 1},
- {"matrix": [1, 5], "x": 6.03, "y": 1},
- {"matrix": [1, 6], "x": 7.03, "y": 1},
-
- {"matrix": [6, 0], "x": 9, "y": 1},
- {"matrix": [6, 1], "x": 10, "y": 1},
- {"matrix": [6, 2], "x": 11, "y": 1},
- {"matrix": [6, 3], "x": 12, "y": 1},
- {"matrix": [6, 4], "x": 13, "y": 1},
- {"matrix": [6, 5], "x": 14, "y": 1},
- {"matrix": [6, 6], "x": 15.05, "y": 1},
- {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3.14, "y": 2},
- {"matrix": [2, 3], "x": 4.14, "y": 2},
- {"matrix": [2, 4], "x": 5.14, "y": 2},
- {"matrix": [2, 5], "x": 6.14, "y": 2},
- {"matrix": [2, 6], "x": 7.14, "y": 2},
-
- {"matrix": [7, 0], "x": 9.34, "y": 2},
- {"matrix": [7, 1], "x": 10.34, "y": 2},
- {"matrix": [7, 2], "x": 11.34, "y": 2},
- {"matrix": [7, 3], "x": 12.34, "y": 2},
- {"matrix": [7, 4], "x": 13.34, "y": 2},
- {"matrix": [7, 5], "x": 14.34, "y": 2},
- {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [8, 0], "x": 8.97, "y": 3},
- {"matrix": [8, 1], "x": 9.97, "y": 3},
- {"matrix": [8, 2], "x": 10.97, "y": 3},
- {"matrix": [8, 3], "x": 11.97, "y": 3},
- {"matrix": [8, 4], "x": 12.97, "y": 3},
- {"matrix": [8, 5], "x": 13.97, "y": 3},
- {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
- {"matrix": [8, 8], "x": 16.72, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.75, "y": 4},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
-
- {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
- {"matrix": [9, 1], "x": 11.22, "y": 4},
- {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 16.48, "y": 4}
- ]
- },
- "LAYOUT_split_backspace": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.66, "y": 0},
- {"matrix": [0, 2], "x": 2.66, "y": 0},
- {"matrix": [0, 3], "x": 3.66, "y": 0},
- {"matrix": [0, 4], "x": 4.66, "y": 0},
- {"matrix": [0, 5], "x": 5.66, "y": 0},
- {"matrix": [0, 6], "x": 6.66, "y": 0},
- {"matrix": [0, 7], "x": 7.66, "y": 0},
-
- {"matrix": [5, 0], "x": 9.32, "y": 0},
- {"matrix": [5, 1], "x": 10.32, "y": 0},
- {"matrix": [5, 2], "x": 11.32, "y": 0},
- {"matrix": [5, 3], "x": 12.32, "y": 0},
- {"matrix": [5, 4], "x": 13.32, "y": 0},
- {"matrix": [5, 5], "x": 14.32, "y": 0},
- {"matrix": [5, 6], "x": 15.32, "y": 0},
- {"matrix": [5, 8], "x": 16.32, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 3.03, "y": 1},
- {"matrix": [1, 3], "x": 4.03, "y": 1},
- {"matrix": [1, 4], "x": 5.03, "y": 1},
- {"matrix": [1, 5], "x": 6.03, "y": 1},
- {"matrix": [1, 6], "x": 7.03, "y": 1},
-
- {"matrix": [6, 0], "x": 9, "y": 1},
- {"matrix": [6, 1], "x": 10, "y": 1},
- {"matrix": [6, 2], "x": 11, "y": 1},
- {"matrix": [6, 3], "x": 12, "y": 1},
- {"matrix": [6, 4], "x": 13, "y": 1},
- {"matrix": [6, 5], "x": 14, "y": 1},
- {"matrix": [6, 6], "x": 15.05, "y": 1},
- {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3.14, "y": 2},
- {"matrix": [2, 3], "x": 4.14, "y": 2},
- {"matrix": [2, 4], "x": 5.14, "y": 2},
- {"matrix": [2, 5], "x": 6.14, "y": 2},
- {"matrix": [2, 6], "x": 7.14, "y": 2},
-
- {"matrix": [7, 0], "x": 9.34, "y": 2},
- {"matrix": [7, 1], "x": 10.34, "y": 2},
- {"matrix": [7, 2], "x": 11.34, "y": 2},
- {"matrix": [7, 3], "x": 12.34, "y": 2},
- {"matrix": [7, 4], "x": 13.34, "y": 2},
- {"matrix": [7, 5], "x": 14.34, "y": 2},
- {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [8, 0], "x": 8.97, "y": 3},
- {"matrix": [8, 1], "x": 9.97, "y": 3},
- {"matrix": [8, 2], "x": 10.97, "y": 3},
- {"matrix": [8, 3], "x": 11.97, "y": 3},
- {"matrix": [8, 4], "x": 12.97, "y": 3},
- {"matrix": [8, 5], "x": 13.97, "y": 3},
- {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
- {"matrix": [8, 8], "x": 16.72, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.75, "y": 4},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
-
- {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
- {"matrix": [9, 1], "x": 11.22, "y": 4},
- {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 16.48, "y": 4}
- ]
- },
- "LAYOUT_split_left_space": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.66, "y": 0},
- {"matrix": [0, 2], "x": 2.66, "y": 0},
- {"matrix": [0, 3], "x": 3.66, "y": 0},
- {"matrix": [0, 4], "x": 4.66, "y": 0},
- {"matrix": [0, 5], "x": 5.66, "y": 0},
- {"matrix": [0, 6], "x": 6.66, "y": 0},
- {"matrix": [0, 7], "x": 7.66, "y": 0},
-
- {"matrix": [5, 0], "x": 9.32, "y": 0},
- {"matrix": [5, 1], "x": 10.32, "y": 0},
- {"matrix": [5, 2], "x": 11.32, "y": 0},
- {"matrix": [5, 3], "x": 12.32, "y": 0},
- {"matrix": [5, 4], "x": 13.32, "y": 0},
- {"matrix": [5, 5], "x": 14.32, "y": 0},
- {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 3.03, "y": 1},
- {"matrix": [1, 3], "x": 4.03, "y": 1},
- {"matrix": [1, 4], "x": 5.03, "y": 1},
- {"matrix": [1, 5], "x": 6.03, "y": 1},
- {"matrix": [1, 6], "x": 7.03, "y": 1},
-
- {"matrix": [6, 0], "x": 9, "y": 1},
- {"matrix": [6, 1], "x": 10, "y": 1},
- {"matrix": [6, 2], "x": 11, "y": 1},
- {"matrix": [6, 3], "x": 12, "y": 1},
- {"matrix": [6, 4], "x": 13, "y": 1},
- {"matrix": [6, 5], "x": 14, "y": 1},
- {"matrix": [6, 6], "x": 15.05, "y": 1},
- {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3.14, "y": 2},
- {"matrix": [2, 3], "x": 4.14, "y": 2},
- {"matrix": [2, 4], "x": 5.14, "y": 2},
- {"matrix": [2, 5], "x": 6.14, "y": 2},
- {"matrix": [2, 6], "x": 7.14, "y": 2},
-
- {"matrix": [7, 0], "x": 9.34, "y": 2},
- {"matrix": [7, 1], "x": 10.34, "y": 2},
- {"matrix": [7, 2], "x": 11.34, "y": 2},
- {"matrix": [7, 3], "x": 12.34, "y": 2},
- {"matrix": [7, 4], "x": 13.34, "y": 2},
- {"matrix": [7, 5], "x": 14.34, "y": 2},
- {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [8, 0], "x": 8.97, "y": 3},
- {"matrix": [8, 1], "x": 9.97, "y": 3},
- {"matrix": [8, 2], "x": 10.97, "y": 3},
- {"matrix": [8, 3], "x": 11.97, "y": 3},
- {"matrix": [8, 4], "x": 12.97, "y": 3},
- {"matrix": [8, 5], "x": 13.97, "y": 3},
- {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
- {"matrix": [8, 8], "x": 16.72, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.75, "y": 4},
- {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
- {"matrix": [4, 6], "x": 7.5, "y": 4},
-
- {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
- {"matrix": [9, 1], "x": 11.22, "y": 4},
- {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 16.48, "y": 4}
- ]
- },
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.66, "y": 0},
- {"matrix": [0, 2], "x": 2.66, "y": 0},
- {"matrix": [0, 3], "x": 3.66, "y": 0},
- {"matrix": [0, 4], "x": 4.66, "y": 0},
- {"matrix": [0, 5], "x": 5.66, "y": 0},
- {"matrix": [0, 6], "x": 6.66, "y": 0},
- {"matrix": [0, 7], "x": 7.66, "y": 0},
-
- {"matrix": [5, 0], "x": 9.32, "y": 0},
- {"matrix": [5, 1], "x": 10.32, "y": 0},
- {"matrix": [5, 2], "x": 11.32, "y": 0},
- {"matrix": [5, 3], "x": 12.32, "y": 0},
- {"matrix": [5, 4], "x": 13.32, "y": 0},
- {"matrix": [5, 5], "x": 14.32, "y": 0},
- {"matrix": [5, 6], "x": 15.32, "y": 0},
- {"matrix": [5, 7], "x": 16.32, "y": 0},
- {"matrix": [5, 8], "x": 17.32, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 3.03, "y": 1},
- {"matrix": [1, 3], "x": 4.03, "y": 1},
- {"matrix": [1, 4], "x": 5.03, "y": 1},
- {"matrix": [1, 5], "x": 6.03, "y": 1},
- {"matrix": [1, 6], "x": 7.03, "y": 1},
-
- {"matrix": [6, 0], "x": 9, "y": 1},
- {"matrix": [6, 1], "x": 10, "y": 1},
- {"matrix": [6, 2], "x": 11, "y": 1},
- {"matrix": [6, 3], "x": 12, "y": 1},
- {"matrix": [6, 4], "x": 13, "y": 1},
- {"matrix": [6, 5], "x": 14, "y": 1},
- {"matrix": [6, 6], "x": 15.05, "y": 1},
- {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3.14, "y": 2},
- {"matrix": [2, 3], "x": 4.14, "y": 2},
- {"matrix": [2, 4], "x": 5.14, "y": 2},
- {"matrix": [2, 5], "x": 6.14, "y": 2},
- {"matrix": [2, 6], "x": 7.14, "y": 2},
-
- {"matrix": [7, 0], "x": 9.34, "y": 2},
- {"matrix": [7, 1], "x": 10.34, "y": 2},
- {"matrix": [7, 2], "x": 11.34, "y": 2},
- {"matrix": [7, 3], "x": 12.34, "y": 2},
- {"matrix": [7, 4], "x": 13.34, "y": 2},
- {"matrix": [7, 5], "x": 14.34, "y": 2},
- {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [8, 0], "x": 8.97, "y": 3},
- {"matrix": [8, 1], "x": 9.97, "y": 3},
- {"matrix": [8, 2], "x": 10.97, "y": 3},
- {"matrix": [8, 3], "x": 11.97, "y": 3},
- {"matrix": [8, 4], "x": 12.97, "y": 3},
- {"matrix": [8, 5], "x": 13.97, "y": 3},
- {"matrix": [8, 6], "x": 14.97, "y": 3},
- {"matrix": [8, 7], "x": 15.97, "y": 3},
- {"matrix": [8, 8], "x": 16.97, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.75, "y": 4},
- {"matrix": [4, 4], "x": 5.75, "y": 4},
- {"matrix": [4, 5], "x": 6.75, "y": 4},
- {"matrix": [4, 6], "x": 7.75, "y": 4},
-
- {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
- {"matrix": [9, 1], "x": 11.22, "y": 4},
- {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 16.48, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/basekeys/slice/rev1/keyboard.json b/keyboards/basekeys/slice/rev1/keyboard.json
new file mode 100644
index 00000000000..c341597ee66
--- /dev/null
+++ b/keyboards/basekeys/slice/rev1/keyboard.json
@@ -0,0 +1,389 @@
+{
+ "keyboard_name": "Slice",
+ "manufacturer": "2Moons",
+ "url": "https://www.basekeys.com",
+ "maintainer": "2Moons",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEC17",
+ "device_version": "0.0.2"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
+ },
+ "LAYOUT_split_backspace": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0},
+ {"matrix": [5, 8], "x": 16.32, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
+ },
+ "LAYOUT_split_left_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 7], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 8], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+ {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0},
+ {"matrix": [5, 7], "x": 16.32, "y": 0},
+ {"matrix": [5, 8], "x": 17.32, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3},
+ {"matrix": [8, 7], "x": 15.97, "y": 3},
+ {"matrix": [8, 8], "x": 16.97, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4},
+ {"matrix": [4, 5], "x": 6.75, "y": 4},
+ {"matrix": [4, 6], "x": 7.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/basekeys/slice/rev1/rules.mk b/keyboards/basekeys/slice/rev1/rules.mk
deleted file mode 100644
index 992af66fa22..00000000000
--- a/keyboards/basekeys/slice/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index 8a0c1946c16..2594d39f2a4 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -21,9 +21,4 @@ along with this program. If not, see .
#define MASTER_LEFT
//#define MASTER_RIGHT
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define OLED_FONT_H "keyboards/basekeys/slice/slice_font.c"
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
deleted file mode 100644
index faec5a99533..00000000000
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ /dev/null
@@ -1,308 +0,0 @@
-{
- "keyboard_name": "Slice RGB",
- "manufacturer": "2Moons",
- "url": "https://www.basekeys.com",
- "maintainer": "2Moons",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEC15",
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 69,
- "max_brightness": 120,
- "split_count": [34, 35],
- "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
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.66, "y": 0},
- {"matrix": [0, 2], "x": 2.66, "y": 0},
- {"matrix": [0, 3], "x": 3.66, "y": 0},
- {"matrix": [0, 4], "x": 4.66, "y": 0},
- {"matrix": [0, 5], "x": 5.66, "y": 0},
- {"matrix": [0, 6], "x": 6.66, "y": 0},
- {"matrix": [0, 7], "x": 7.66, "y": 0},
-
- {"matrix": [5, 0], "x": 9.32, "y": 0},
- {"matrix": [5, 1], "x": 10.32, "y": 0},
- {"matrix": [5, 2], "x": 11.32, "y": 0},
- {"matrix": [5, 3], "x": 12.32, "y": 0},
- {"matrix": [5, 4], "x": 13.32, "y": 0},
- {"matrix": [5, 5], "x": 14.32, "y": 0},
- {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 3.03, "y": 1},
- {"matrix": [1, 3], "x": 4.03, "y": 1},
- {"matrix": [1, 4], "x": 5.03, "y": 1},
- {"matrix": [1, 5], "x": 6.03, "y": 1},
- {"matrix": [1, 6], "x": 7.03, "y": 1},
-
- {"matrix": [6, 0], "x": 9, "y": 1},
- {"matrix": [6, 1], "x": 10, "y": 1},
- {"matrix": [6, 2], "x": 11, "y": 1},
- {"matrix": [6, 3], "x": 12, "y": 1},
- {"matrix": [6, 4], "x": 13, "y": 1},
- {"matrix": [6, 5], "x": 14, "y": 1},
- {"matrix": [6, 6], "x": 15.05, "y": 1},
- {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3.14, "y": 2},
- {"matrix": [2, 3], "x": 4.14, "y": 2},
- {"matrix": [2, 4], "x": 5.14, "y": 2},
- {"matrix": [2, 5], "x": 6.14, "y": 2},
- {"matrix": [2, 6], "x": 7.14, "y": 2},
-
- {"matrix": [7, 0], "x": 9.34, "y": 2},
- {"matrix": [7, 1], "x": 10.34, "y": 2},
- {"matrix": [7, 2], "x": 11.34, "y": 2},
- {"matrix": [7, 3], "x": 12.34, "y": 2},
- {"matrix": [7, 4], "x": 13.34, "y": 2},
- {"matrix": [7, 5], "x": 14.34, "y": 2},
- {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [8, 0], "x": 8.97, "y": 3},
- {"matrix": [8, 1], "x": 9.97, "y": 3},
- {"matrix": [8, 2], "x": 10.97, "y": 3},
- {"matrix": [8, 3], "x": 11.97, "y": 3},
- {"matrix": [8, 4], "x": 12.97, "y": 3},
- {"matrix": [8, 5], "x": 13.97, "y": 3},
- {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
- {"matrix": [8, 7], "x": 16.72, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.75, "y": 4},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
-
- {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
- {"matrix": [9, 1], "x": 11.22, "y": 4},
- {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 16.48, "y": 4}
- ]
- },
- "LAYOUT_split_left_space": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.66, "y": 0},
- {"matrix": [0, 2], "x": 2.66, "y": 0},
- {"matrix": [0, 3], "x": 3.66, "y": 0},
- {"matrix": [0, 4], "x": 4.66, "y": 0},
- {"matrix": [0, 5], "x": 5.66, "y": 0},
- {"matrix": [0, 6], "x": 6.66, "y": 0},
- {"matrix": [0, 7], "x": 7.66, "y": 0},
-
- {"matrix": [5, 0], "x": 9.32, "y": 0},
- {"matrix": [5, 1], "x": 10.32, "y": 0},
- {"matrix": [5, 2], "x": 11.32, "y": 0},
- {"matrix": [5, 3], "x": 12.32, "y": 0},
- {"matrix": [5, 4], "x": 13.32, "y": 0},
- {"matrix": [5, 5], "x": 14.32, "y": 0},
- {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 3.03, "y": 1},
- {"matrix": [1, 3], "x": 4.03, "y": 1},
- {"matrix": [1, 4], "x": 5.03, "y": 1},
- {"matrix": [1, 5], "x": 6.03, "y": 1},
- {"matrix": [1, 6], "x": 7.03, "y": 1},
-
- {"matrix": [6, 0], "x": 9, "y": 1},
- {"matrix": [6, 1], "x": 10, "y": 1},
- {"matrix": [6, 2], "x": 11, "y": 1},
- {"matrix": [6, 3], "x": 12, "y": 1},
- {"matrix": [6, 4], "x": 13, "y": 1},
- {"matrix": [6, 5], "x": 14, "y": 1},
- {"matrix": [6, 6], "x": 15.05, "y": 1},
- {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3.14, "y": 2},
- {"matrix": [2, 3], "x": 4.14, "y": 2},
- {"matrix": [2, 4], "x": 5.14, "y": 2},
- {"matrix": [2, 5], "x": 6.14, "y": 2},
- {"matrix": [2, 6], "x": 7.14, "y": 2},
-
- {"matrix": [7, 0], "x": 9.34, "y": 2},
- {"matrix": [7, 1], "x": 10.34, "y": 2},
- {"matrix": [7, 2], "x": 11.34, "y": 2},
- {"matrix": [7, 3], "x": 12.34, "y": 2},
- {"matrix": [7, 4], "x": 13.34, "y": 2},
- {"matrix": [7, 5], "x": 14.34, "y": 2},
- {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [8, 0], "x": 8.97, "y": 3},
- {"matrix": [8, 1], "x": 9.97, "y": 3},
- {"matrix": [8, 2], "x": 10.97, "y": 3},
- {"matrix": [8, 3], "x": 11.97, "y": 3},
- {"matrix": [8, 4], "x": 12.97, "y": 3},
- {"matrix": [8, 5], "x": 13.97, "y": 3},
- {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
- {"matrix": [8, 7], "x": 16.72, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.75, "y": 4},
- {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
- {"matrix": [4, 6], "x": 7.5, "y": 4},
-
- {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
- {"matrix": [9, 1], "x": 11.22, "y": 4},
- {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 16.48, "y": 4}
- ]
- },
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.66, "y": 0},
- {"matrix": [0, 2], "x": 2.66, "y": 0},
- {"matrix": [0, 3], "x": 3.66, "y": 0},
- {"matrix": [0, 4], "x": 4.66, "y": 0},
- {"matrix": [0, 5], "x": 5.66, "y": 0},
- {"matrix": [0, 6], "x": 6.66, "y": 0},
- {"matrix": [0, 7], "x": 7.66, "y": 0},
-
- {"matrix": [5, 0], "x": 9.32, "y": 0},
- {"matrix": [5, 1], "x": 10.32, "y": 0},
- {"matrix": [5, 2], "x": 11.32, "y": 0},
- {"matrix": [5, 3], "x": 12.32, "y": 0},
- {"matrix": [5, 4], "x": 13.32, "y": 0},
- {"matrix": [5, 5], "x": 14.32, "y": 0},
- {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 3.03, "y": 1},
- {"matrix": [1, 3], "x": 4.03, "y": 1},
- {"matrix": [1, 4], "x": 5.03, "y": 1},
- {"matrix": [1, 5], "x": 6.03, "y": 1},
- {"matrix": [1, 6], "x": 7.03, "y": 1},
-
- {"matrix": [6, 0], "x": 9, "y": 1},
- {"matrix": [6, 1], "x": 10, "y": 1},
- {"matrix": [6, 2], "x": 11, "y": 1},
- {"matrix": [6, 3], "x": 12, "y": 1},
- {"matrix": [6, 4], "x": 13, "y": 1},
- {"matrix": [6, 5], "x": 14, "y": 1},
- {"matrix": [6, 6], "x": 15.05, "y": 1},
- {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3.14, "y": 2},
- {"matrix": [2, 3], "x": 4.14, "y": 2},
- {"matrix": [2, 4], "x": 5.14, "y": 2},
- {"matrix": [2, 5], "x": 6.14, "y": 2},
- {"matrix": [2, 6], "x": 7.14, "y": 2},
-
- {"matrix": [7, 0], "x": 9.34, "y": 2},
- {"matrix": [7, 1], "x": 10.34, "y": 2},
- {"matrix": [7, 2], "x": 11.34, "y": 2},
- {"matrix": [7, 3], "x": 12.34, "y": 2},
- {"matrix": [7, 4], "x": 13.34, "y": 2},
- {"matrix": [7, 5], "x": 14.34, "y": 2},
- {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [8, 0], "x": 8.97, "y": 3},
- {"matrix": [8, 1], "x": 9.97, "y": 3},
- {"matrix": [8, 2], "x": 10.97, "y": 3},
- {"matrix": [8, 3], "x": 11.97, "y": 3},
- {"matrix": [8, 4], "x": 12.97, "y": 3},
- {"matrix": [8, 5], "x": 13.97, "y": 3},
- {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
- {"matrix": [8, 7], "x": 16.72, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.75, "y": 4},
- {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 0.917},
- {"matrix": [4, 5], "x": 6.667, "y": 4, "w": 0.916},
- {"matrix": [4, 6], "x": 7.583, "y": 4, "w": 0.917},
-
- {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
- {"matrix": [9, 1], "x": 11.22, "y": 4},
- {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 16.48, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/basekeys/slice/rev1_rgb/keyboard.json b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
new file mode 100644
index 00000000000..a666f266617
--- /dev/null
+++ b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
@@ -0,0 +1,325 @@
+{
+ "keyboard_name": "Slice RGB",
+ "manufacturer": "2Moons",
+ "url": "https://www.basekeys.com",
+ "maintainer": "2Moons",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEC15",
+ "device_version": "0.0.2"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "rgblight": true,
+ "oled": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 69,
+ "max_brightness": 120,
+ "split_count": [34, 35],
+ "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
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
+ },
+ "LAYOUT_split_left_space": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 1.75},
+ {"matrix": [4, 6], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.66, "y": 0},
+ {"matrix": [0, 2], "x": 2.66, "y": 0},
+ {"matrix": [0, 3], "x": 3.66, "y": 0},
+ {"matrix": [0, 4], "x": 4.66, "y": 0},
+ {"matrix": [0, 5], "x": 5.66, "y": 0},
+ {"matrix": [0, 6], "x": 6.66, "y": 0},
+ {"matrix": [0, 7], "x": 7.66, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.32, "y": 0},
+ {"matrix": [5, 1], "x": 10.32, "y": 0},
+ {"matrix": [5, 2], "x": 11.32, "y": 0},
+ {"matrix": [5, 3], "x": 12.32, "y": 0},
+ {"matrix": [5, 4], "x": 13.32, "y": 0},
+ {"matrix": [5, 5], "x": 14.32, "y": 0},
+ {"matrix": [5, 6], "x": 15.32, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.53, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.03, "y": 1},
+ {"matrix": [1, 3], "x": 4.03, "y": 1},
+ {"matrix": [1, 4], "x": 5.03, "y": 1},
+ {"matrix": [1, 5], "x": 6.03, "y": 1},
+ {"matrix": [1, 6], "x": 7.03, "y": 1},
+
+ {"matrix": [6, 0], "x": 9, "y": 1},
+ {"matrix": [6, 1], "x": 10, "y": 1},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 5], "x": 14, "y": 1},
+ {"matrix": [6, 6], "x": 15.05, "y": 1},
+ {"matrix": [6, 7], "x": 16.1, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.39, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.14, "y": 2},
+ {"matrix": [2, 3], "x": 4.14, "y": 2},
+ {"matrix": [2, 4], "x": 5.14, "y": 2},
+ {"matrix": [2, 5], "x": 6.14, "y": 2},
+ {"matrix": [2, 6], "x": 7.14, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.34, "y": 2},
+ {"matrix": [7, 1], "x": 10.34, "y": 2},
+ {"matrix": [7, 2], "x": 11.34, "y": 2},
+ {"matrix": [7, 3], "x": 12.34, "y": 2},
+ {"matrix": [7, 4], "x": 13.34, "y": 2},
+ {"matrix": [7, 5], "x": 14.34, "y": 2},
+ {"matrix": [7, 6], "x": 15.34, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.97, "y": 3},
+ {"matrix": [8, 1], "x": 9.97, "y": 3},
+ {"matrix": [8, 2], "x": 10.97, "y": 3},
+ {"matrix": [8, 3], "x": 11.97, "y": 3},
+ {"matrix": [8, 4], "x": 12.97, "y": 3},
+ {"matrix": [8, 5], "x": 13.97, "y": 3},
+ {"matrix": [8, 6], "x": 14.97, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 0.917},
+ {"matrix": [4, 5], "x": 6.667, "y": 4, "w": 0.916},
+ {"matrix": [4, 6], "x": 7.583, "y": 4, "w": 0.917},
+
+ {"matrix": [9, 0], "x": 8.97, "y": 4, "w": 2.25},
+ {"matrix": [9, 1], "x": 11.22, "y": 4},
+ {"matrix": [9, 2], "x": 13.98, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 15.23, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 16.48, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk
deleted file mode 100644
index 1e24ec177f9..00000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
deleted file mode 100644
index 584a6e4bfc5..00000000000
--- a/keyboards/basekeys/trifecta/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/basekeys/trifecta/keyboard.json b/keyboards/basekeys/trifecta/keyboard.json
index 8777b1ffa9d..8660156f64c 100644
--- a/keyboards/basekeys/trifecta/keyboard.json
+++ b/keyboards/basekeys/trifecta/keyboard.json
@@ -18,6 +18,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"],
"rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"]
@@ -54,6 +60,7 @@
}
},
"rgb_matrix": {
+ "driver": "ws2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10,
@@ -102,7 +109,89 @@
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true
- }
+ },
+ "layout": [
+ {"x": 218, "y": 7, "flags": 2},
+ {"x": 214, "y": 45, "flags": 2},
+ {"x": 180, "y": 47, "flags": 2},
+ {"x": 147, "y": 50, "flags": 2},
+ {"x": 94, "y": 62, "flags": 2},
+ {"x": 37, "y": 51, "flags": 2},
+ {"x": 4, "y": 8, "flags": 2},
+ {"x": 36, "y": 15, "flags": 2},
+ {"x": 62, "y": 18, "flags": 2},
+ {"x": 78, "y": 5, "flags": 2},
+ {"x": 119, "y": 7, "flags": 2},
+ {"x": 145, "y": 16, "flags": 2},
+ {"x": 166, "y": 3, "flags": 2},
+ {"x": 200, "y": 16, "flags": 2},
+ {"matrix": [0, 7], "x": 185, "y": 11, "flags": 4},
+ {"matrix": [2, 7], "x": 191, "y": 22, "flags": 4},
+ {"matrix": [4, 7], "x": 188, "y": 33, "flags": 4},
+ {"matrix": [6, 7], "x": 200, "y": 46, "flags": 4},
+ {"matrix": [8, 7], "x": 200, "y": 57, "flags": 4},
+ {"matrix": [9, 7], "x": 212, "y": 57, "flags": 4},
+ {"matrix": [9, 6], "x": 188, "y": 57, "flags": 4},
+ {"matrix": [7, 6], "x": 181, "y": 44, "flags": 4},
+ {"matrix": [3, 6], "x": 176, "y": 22, "flags": 4},
+ {"matrix": [1, 6], "x": 168, "y": 11, "flags": 4},
+ {"matrix": [0, 6], "x": 155, "y": 11, "flags": 4},
+ {"matrix": [2, 6], "x": 164, "y": 22, "flags": 4},
+ {"matrix": [5, 6], "x": 169, "y": 32, "flags": 4},
+ {"matrix": [6, 6], "x": 165, "y": 44, "flags": 4},
+ {"matrix": [8, 6], "x": 172, "y": 55, "flags": 4},
+ {"matrix": [9, 5], "x": 157, "y": 54, "flags": 4},
+ {"matrix": [7, 5], "x": 153, "y": 44, "flags": 4},
+ {"matrix": [4, 5], "x": 156, "y": 33, "flags": 4},
+ {"matrix": [3, 5], "x": 153, "y": 22, "flags": 4},
+ {"matrix": [1, 5], "x": 142, "y": 12, "flags": 4},
+ {"matrix": [0, 5], "x": 130, "y": 13, "flags": 4},
+ {"matrix": [2, 5], "x": 138, "y": 23, "flags": 4},
+ {"matrix": [5, 5], "x": 143, "y": 33, "flags": 4},
+ {"matrix": [6, 5], "x": 140, "y": 45, "flags": 4},
+ {"matrix": [8, 5], "x": 137, "y": 56, "flags": 4},
+ {"matrix": [7, 4], "x": 128, "y": 47, "flags": 4},
+ {"matrix": [4, 4], "x": 132, "y": 35, "flags": 4},
+ {"matrix": [3, 4], "x": 127, "y": 25, "flags": 4},
+ {"matrix": [1, 4], "x": 119, "y": 16, "flags": 4},
+ {"matrix": [0, 4], "x": 107, "y": 17, "flags": 4},
+ {"matrix": [2, 4], "x": 115, "y": 27, "flags": 4},
+ {"matrix": [5, 4], "x": 120, "y": 37, "flags": 4},
+ {"matrix": [6, 4], "x": 116, "y": 48, "flags": 4},
+ {"matrix": [9, 4], "x": 117, "y": 59, "flags": 4},
+ {"matrix": [7, 3], "x": 104, "y": 51, "flags": 4},
+ {"matrix": [4, 3], "x": 109, "y": 39, "flags": 4},
+ {"matrix": [3, 3], "x": 104, "y": 29, "flags": 4},
+ {"matrix": [1, 3], "x": 86, "y": 19, "flags": 4},
+ {"matrix": [0, 3], "x": 74, "y": 16, "flags": 4},
+ {"matrix": [2, 3], "x": 78, "y": 28, "flags": 4},
+ {"matrix": [5, 3], "x": 79, "y": 39, "flags": 4},
+ {"matrix": [6, 3], "x": 82, "y": 50, "flags": 4},
+ {"matrix": [8, 2], "x": 73, "y": 60, "flags": 4},
+ {"matrix": [7, 2], "x": 71, "y": 48, "flags": 4},
+ {"matrix": [4, 2], "x": 67, "y": 37, "flags": 4},
+ {"matrix": [3, 2], "x": 66, "y": 26, "flags": 4},
+ {"matrix": [1, 2], "x": 63, "y": 15, "flags": 4},
+ {"matrix": [0, 2], "x": 50, "y": 12, "flags": 4},
+ {"matrix": [2, 2], "x": 55, "y": 24, "flags": 4},
+ {"matrix": [5, 2], "x": 55, "y": 35, "flags": 4},
+ {"matrix": [6, 2], "x": 59, "y": 47, "flags": 4},
+ {"matrix": [9, 1], "x": 50, "y": 56, "flags": 4},
+ {"matrix": [7, 1], "x": 47, "y": 45, "flags": 4},
+ {"matrix": [4, 1], "x": 43, "y": 33, "flags": 4},
+ {"matrix": [3, 1], "x": 43, "y": 22, "flags": 4},
+ {"matrix": [1, 1], "x": 39, "y": 10, "flags": 4},
+ {"matrix": [0, 1], "x": 25, "y": 11, "flags": 4},
+ {"matrix": [2, 1], "x": 29, "y": 22, "flags": 4},
+ {"matrix": [5, 1], "x": 30, "y": 33, "flags": 4},
+ {"matrix": [6, 1], "x": 34, "y": 44, "flags": 4},
+ {"matrix": [8, 1], "x": 24, "y": 54, "flags": 4},
+ {"matrix": [9, 0], "x": 9, "y": 55, "flags": 4},
+ {"matrix": [7, 0], "x": 15, "y": 44, "flags": 4},
+ {"matrix": [4, 0], "x": 14, "y": 33, "flags": 4},
+ {"matrix": [3, 0], "x": 14, "y": 22, "flags": 4},
+ {"matrix": [1, 0], "x": 14, "y": 11, "flags": 4}
+ ]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
diff --git a/keyboards/basekeys/trifecta/trifecta.c b/keyboards/basekeys/trifecta/trifecta.c
deleted file mode 100644
index 926180d9966..00000000000
--- a/keyboards/basekeys/trifecta/trifecta.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#include "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
-led_config_t g_led_config = { {
- { NO_LED, 70, 61, 52, 43, 34, 24, 14 },
- { 79, 69, 60, 51, 42, 33, 23, NO_LED },
- { NO_LED, 71, 62, 53, 44, 35, 25, 15 },
- { 78, 68, 59, 50, 41, 32, 22, NO_LED },
- { 77, 67, 58, 49, 40, 31, NO_LED, 16 },
- { NO_LED, 72, 63, 54, 45, 36, 26, NO_LED },
- { NO_LED, 73, 64, 55, 46, 37, 27, 17 },
- { 76, 66, 57, 48, 39, 30, 21, NO_LED },
- { NO_LED, 74, 56, NO_LED, NO_LED, 38, 28, 18 },
- { 75, 65, NO_LED, NO_LED, 47, 29, 20, 19 }
-}, {
- // Underglow
- { 218, 7 }, { 214, 45 }, { 180, 47 }, { 147, 50 }, { 94, 62 }, { 37, 51 }, { 4, 8 }, { 36, 15 },
- { 62, 18 }, { 78, 5 }, { 119, 7 }, { 145, 16 }, { 166, 3 }, { 200, 16 },
-
- //Per Key
- { 185, 11 }, { 191, 22 }, { 188, 33 }, { 200, 46 }, { 200, 57 }, { 212, 57 }, { 188, 57 }, { 181, 44 },
- { 176, 22 }, { 168, 11 }, { 155, 11 }, { 164, 22 }, { 169, 32 }, { 165, 44 }, { 172, 55 }, { 157, 54 },
- { 153, 44 }, { 156, 33 }, { 153, 22 }, { 142, 12 }, { 130, 13 }, { 138, 23 }, { 143, 33 }, { 140, 45 },
- { 137, 56 }, { 128, 47 }, { 132, 35 }, { 127, 25 }, { 119, 16 }, { 107, 17 }, { 115, 27 }, { 120, 37 },
- { 116, 48 }, { 117, 59 }, { 104, 51 }, { 109, 39 }, { 104, 29 }, { 86, 19 }, { 74, 16 }, { 78, 28 },
- { 79, 39 }, { 82, 50 }, { 73, 60 }, { 71, 48 }, { 67, 37 }, { 66, 26 }, { 63, 15 }, { 50, 12 },
- { 55, 24 }, { 55, 35 }, { 59, 47 }, { 50, 56 }, { 47, 45 }, { 43, 33 }, { 43, 22 }, { 39, 10 },
- { 25, 11 }, { 29, 22 }, { 30, 33 }, { 34, 44 }, { 24, 54 }, { 9, 55 }, { 15, 44 }, { 14, 33 },
- { 14, 22 }, { 14, 11 }
-}, {
- 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2,
-
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4
-} };
-#endif
\ No newline at end of file
diff --git a/keyboards/basketweave/config.h b/keyboards/basketweave/config.h
deleted file mode 100644
index ebf85963191..00000000000
--- a/keyboards/basketweave/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 null-ll
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json
deleted file mode 100644
index 705ef675ba8..00000000000
--- a/keyboards/basketweave/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
- "keyboard_name": "Basketweave",
- "manufacturer": "Clackery",
- "url": "https://github.com/null-ll/basketweave",
- "maintainer": "null-ll",
- "usb": {
- "vid": "0x6B62",
- "pid": "0x8989",
- "device_version": "0.0.1",
- "max_power": 100
- },
- "matrix_pins": {
- "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],
- "rows": ["A6", "C6", "C7", "A7", "A5"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "D7", "pin_b": "C0"}
- ]
- },
- "qmk": {
- "tap_keycode_delay": 10
- },
- "processor": "atmega32a",
- "bootloader": "usbasploader",
- "layouts": {
- "LAYOUT_default": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.5, "y": 0},
- {"matrix": [0, 2], "x": 2.5, "y": 0},
- {"matrix": [0, 3], "x": 3.5, "y": 0},
- {"matrix": [0, 4], "x": 4.5, "y": 0},
- {"matrix": [0, 5], "x": 5.5, "y": 0},
- {"matrix": [0, 6], "x": 6.5, "y": 0},
- {"matrix": [0, 7], "x": 7.5, "y": 0},
- {"matrix": [0, 8], "x": 10.5, "y": 0},
- {"matrix": [0, 9], "x": 11.5, "y": 0},
- {"matrix": [0, 10], "x": 12.5, "y": 0},
- {"matrix": [0, 11], "x": 13.5, "y": 0},
- {"matrix": [0, 12], "x": 14.5, "y": 0},
- {"matrix": [0, 13], "x": 15.5, "y": 0},
- {"matrix": [0, 14], "x": 16.5, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 3], "x": 4, "y": 1},
- {"matrix": [1, 4], "x": 5, "y": 1},
- {"matrix": [1, 5], "x": 6, "y": 1},
- {"matrix": [1, 6], "x": 7, "y": 1},
- {"matrix": [1, 7], "x": 10, "y": 1},
- {"matrix": [1, 8], "x": 11, "y": 1},
- {"matrix": [1, 9], "x": 12, "y": 1},
- {"matrix": [1, 10], "x": 13, "y": 1},
- {"matrix": [1, 11], "x": 14, "y": 1},
- {"matrix": [1, 12], "x": 15, "y": 1},
- {"matrix": [1, 13], "x": 16, "y": 1},
- {"matrix": [1, 14], "x": 17, "y": 1, "w": 1.5},
-
- {"matrix": [4, 14], "x": 19, "y": 0.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3.25, "y": 2},
- {"matrix": [2, 3], "x": 4.25, "y": 2},
- {"matrix": [2, 4], "x": 5.25, "y": 2},
- {"matrix": [2, 5], "x": 6.25, "y": 2},
- {"matrix": [2, 6], "x": 7.25, "y": 2},
- {"matrix": [2, 7], "x": 10.25, "y": 2},
- {"matrix": [2, 8], "x": 11.25, "y": 2},
- {"matrix": [2, 9], "x": 12.25, "y": 2},
- {"matrix": [2, 10], "x": 13.25, "y": 2},
- {"matrix": [2, 11], "x": 14.25, "y": 2},
- {"matrix": [2, 12], "x": 15.25, "y": 2},
- {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
-
- {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.75, "y": 3},
- {"matrix": [3, 3], "x": 4.75, "y": 3},
- {"matrix": [3, 4], "x": 5.75, "y": 3},
- {"matrix": [3, 5], "x": 6.75, "y": 3},
- {"matrix": [3, 6], "x": 7.75, "y": 3},
- {"matrix": [3, 7], "x": 9.75, "y": 3},
- {"matrix": [3, 8], "x": 10.75, "y": 3},
- {"matrix": [3, 9], "x": 11.75, "y": 3},
- {"matrix": [3, 10], "x": 12.75, "y": 3},
- {"matrix": [3, 11], "x": 13.75, "y": 3},
- {"matrix": [3, 12], "x": 14.75, "y": 3},
- {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
-
- {"matrix": [2, 14], "x": 17.75, "y": 3.25},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
- {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.5},
- {"matrix": [4, 4], "x": 6, "y": 4, "w": 2},
- {"matrix": [4, 6], "x": 8, "y": 4},
- {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
- {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.5},
- {"matrix": [4, 11], "x": 15, "y": 4, "w": 1.5},
-
- {"matrix": [4, 12], "x": 16.75, "y": 4.25},
- {"matrix": [4, 13], "x": 17.75, "y": 4.25},
- {"matrix": [3, 14], "x": 18.75, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/basketweave/keyboard.json b/keyboards/basketweave/keyboard.json
new file mode 100644
index 00000000000..75a720b7dd8
--- /dev/null
+++ b/keyboards/basketweave/keyboard.json
@@ -0,0 +1,122 @@
+{
+ "keyboard_name": "Basketweave",
+ "manufacturer": "Clackery",
+ "url": "https://github.com/null-ll/basketweave",
+ "maintainer": "null-ll",
+ "usb": {
+ "vid": "0x6B62",
+ "pid": "0x8989",
+ "device_version": "0.0.1",
+ "max_power": 100
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "encoder": true
+ },
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "B0", "B1", "B2", "D5", "D6", "C5", "C4", "C3", "C2", "C1"],
+ "rows": ["A6", "C6", "C7", "A7", "A5"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D7", "pin_b": "C0"}
+ ]
+ },
+ "qmk": {
+ "tap_keycode_delay": 10,
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
+ "layouts": {
+ "LAYOUT_default": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 10.5, "y": 0},
+ {"matrix": [0, 9], "x": 11.5, "y": 0},
+ {"matrix": [0, 10], "x": 12.5, "y": 0},
+ {"matrix": [0, 11], "x": 13.5, "y": 0},
+ {"matrix": [0, 12], "x": 14.5, "y": 0},
+ {"matrix": [0, 13], "x": 15.5, "y": 0},
+ {"matrix": [0, 14], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 10, "y": 1},
+ {"matrix": [1, 8], "x": 11, "y": 1},
+ {"matrix": [1, 9], "x": 12, "y": 1},
+ {"matrix": [1, 10], "x": 13, "y": 1},
+ {"matrix": [1, 11], "x": 14, "y": 1},
+ {"matrix": [1, 12], "x": 15, "y": 1},
+ {"matrix": [1, 13], "x": 16, "y": 1},
+ {"matrix": [1, 14], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 14], "x": 19, "y": 0.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+ {"matrix": [2, 7], "x": 10.25, "y": 2},
+ {"matrix": [2, 8], "x": 11.25, "y": 2},
+ {"matrix": [2, 9], "x": 12.25, "y": 2},
+ {"matrix": [2, 10], "x": 13.25, "y": 2},
+ {"matrix": [2, 11], "x": 14.25, "y": 2},
+ {"matrix": [2, 12], "x": 15.25, "y": 2},
+ {"matrix": [2, 13], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+ {"matrix": [3, 7], "x": 9.75, "y": 3},
+ {"matrix": [3, 8], "x": 10.75, "y": 3},
+ {"matrix": [3, 9], "x": 11.75, "y": 3},
+ {"matrix": [3, 10], "x": 12.75, "y": 3},
+ {"matrix": [3, 11], "x": 13.75, "y": 3},
+ {"matrix": [3, 12], "x": 14.75, "y": 3},
+ {"matrix": [3, 13], "x": 15.75, "y": 3, "w": 1.75},
+
+ {"matrix": [2, 14], "x": 17.75, "y": 3.25},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 8, "y": 4},
+ {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 15, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 16.75, "y": 4.25},
+ {"matrix": [4, 13], "x": 17.75, "y": 4.25},
+ {"matrix": [3, 14], "x": 18.75, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/basketweave/rules.mk b/keyboards/basketweave/rules.mk
index b43c5121f47..c2ee0bc86f9 100644
--- a/keyboards/basketweave/rules.mk
+++ b/keyboards/basketweave/rules.mk
@@ -1,16 +1,2 @@
# Processor frequency
F_CPU = 16000000
-
-# 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
-ENCODER_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
index 25ddc835011..1af57cca9a4 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@@ -6,6 +6,9 @@
"eeprom": {
"driver": "spi"
},
+ "split": {
+ "enabled": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
index bbb0fd66ba2..05be6acde22 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"matrix_pins": {
"right": {
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
index cc6c21e8d20..0869ac07972 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk
@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
-# the trackball side).
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
index 4b69b244fbe..61d953ec8f6 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
index cc6c21e8d20..0869ac07972 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk
@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
-# the trackball side).
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
index 2c0faa95675..f7dd9d2c7e2 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
index 0a88daf352d..33fda9c2a47 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
index af74a299be7..cf9cf2eb62d 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json
@@ -19,6 +19,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "A3"
},
"development_board": "stemcell"
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
index 0359523bdd5..51f9c5dbea5 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@@ -6,6 +6,9 @@
"eeprom": {
"driver": "spi"
},
+ "split": {
+ "enabled": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
index 69c8bd6fb4f..8bc6a86eaf1 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"matrix_pins": {
"right": {
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
index 6862a8e3095..0869ac07972 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
index 67ada55640e..13283d5b8fa 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
index 6862a8e3095..0869ac07972 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
index 9b44b3f336c..8dcc8187abb 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
index d1ac62e1abe..288e08b9ee9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
index 4309fd5ee30..c09c9c90ca0 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json
@@ -19,6 +19,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "A3"
},
"development_board": "stemcell"
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
index decbbea5234..86df4839fc9 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@@ -6,6 +6,9 @@
"eeprom": {
"driver": "spi"
},
+ "split": {
+ "enabled": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
index f8de9a3fb13..e2a00339775 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default.
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default.
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
index 161d36f45d4..3419eaea8b7 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"matrix_pins": {
"right": {
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
index 51c8c665e26..e1f2bf81f8f 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk
@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default.
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default.
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
-# trackball side).
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
index 2ee88c4f9e4..bb892c4e6ec 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
index 51c8c665e26..e1f2bf81f8f 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk
@@ -16,10 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default.
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default.
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
-# trackball side).
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
index 961a0b1420d..48a2eb51584 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
index 28a1dee31f4..72aa8b59c6e 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
index 87a2d912b89..03b7e8ca31a 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
index 8060c758b88..d49755a861a 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json
@@ -19,6 +19,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "A3"
},
"development_board": "stemcell"
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
index 4bd570ddd8c..1bf0d489a97 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
index 796d22dc713..2190d542c2c 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
@@ -6,6 +6,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"processor": "RP2040",
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
index b4722fc8e6a..b54403222b4 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
@@ -20,5 +20,3 @@ SERIAL_DRIVER = vendor
POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
index 7796a7c3111..9e07843788f 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
@@ -6,6 +6,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"processor": "RP2040",
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
index 227d42fa24d..0de2c9a8071 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
@@ -20,5 +20,3 @@ SERIAL_DRIVER = vendor
POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h
index 549965444d4..7276c6181fa 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/config.h
+++ b/keyboards/bastardkb/dilemma/4x6_4/config.h
@@ -42,6 +42,3 @@
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
-
-/* RGB matrix support. */
-#define SPLIT_TRANSPORT_MIRROR
\ No newline at end of file
diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/info.json
index 6bf6a9a5065..167c979f4b9 100644
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@@ -6,6 +6,9 @@
"eeprom": {
"driver": "spi"
},
+ "split": {
+ "enabled": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
index b5612ce38a8..20c87fca307 100644
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ b/keyboards/bastardkb/scylla/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/info.json
index 3984c69f2fa..4b7e5092199 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/info.json
index f9069afd911..a7c68fb628a 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/info.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
index 0c7dc406b07..83cfd06ca79 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
index 377fd4424ac..14386303dc5 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/info.json
index 598ca9d9ee0..d6bea6463ac 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/info.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/info.json
@@ -19,6 +19,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "A3"
},
"development_board": "stemcell"
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
index 8256842e21d..ef125eb2fea 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/info.json
index 96f8bf71475..c0e5d4e2c85 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@@ -6,6 +6,9 @@
"eeprom": {
"driver": "spi"
},
+ "split": {
+ "enabled": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
index b5612ce38a8..20c87fca307 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
index f3eb68587d0..cc5d2adfadd 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
index 5e5ccd25458..4f245663bce 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
index e9c2b345923..fa15c27148e 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
index a47464720c0..b34581757ba 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
index b384da9dbdc..d7b1fc5cdb4 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/info.json
@@ -19,6 +19,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "A3"
},
"development_board": "stemcell"
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
index 8256842e21d..ef125eb2fea 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
deleted file mode 100644
index 3afca1e792e..00000000000
--- a/keyboards/bastardkb/tbk/info.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
- "keyboard_name": "The Bastard Keyboard",
- "url": "https://bastardkb.com/",
- "usb": {
- "device_version": "0.0.1",
- "pid": "0x1828"
- },
- "rgblight": {
- "led_count": 38,
- "split_count": [19, 19],
- "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": {
- "pin": "D2"
- },
- "matrix_pins": {
- "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
- "rows": ["D7", "B5", "F7", "F6", "B6"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_split_4x6_5": {
- "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": [5, 5], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0},
- {"matrix": [5, 3], "x": 13, "y": 0},
- {"matrix": [5, 2], "x": 14, "y": 0},
- {"matrix": [5, 1], "x": 15, "y": 0},
- {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1},
- {"matrix": [6, 3], "x": 13, "y": 1},
- {"matrix": [6, 2], "x": 14, "y": 1},
- {"matrix": [6, 1], "x": 15, "y": 1},
- {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2},
- {"matrix": [7, 3], "x": 13, "y": 2},
- {"matrix": [7, 2], "x": 14, "y": 2},
- {"matrix": [7, 1], "x": 15, "y": 2},
- {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 3], "x": 13, "y": 3},
- {"matrix": [8, 2], "x": 14, "y": 3},
- {"matrix": [8, 1], "x": 15, "y": 3},
- {"matrix": [8, 0], "x": 16, "y": 3},
- {"matrix": [4, 3], "x": 5, "y": 4},
- {"matrix": [4, 4], "x": 6, "y": 4},
- {"matrix": [4, 1], "x": 7, "y": 4},
- {"matrix": [9, 1], "x": 9, "y": 4},
- {"matrix": [9, 4], "x": 10, "y": 4},
- {"matrix": [9, 3], "x": 11, "y": 4},
- {"matrix": [4, 5], "x": 6, "y": 5},
- {"matrix": [4, 2], "x": 7, "y": 5},
- {"matrix": [9, 2], "x": 9, "y": 5},
- {"matrix": [9, 5], "x": 10, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/bastardkb/tbk/keyboard.json b/keyboards/bastardkb/tbk/keyboard.json
new file mode 100644
index 00000000000..90e37478a1e
--- /dev/null
+++ b/keyboards/bastardkb/tbk/keyboard.json
@@ -0,0 +1,111 @@
+{
+ "keyboard_name": "The Bastard Keyboard",
+ "url": "https://bastardkb.com/",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x1828"
+ },
+ "rgblight": {
+ "led_count": 38,
+ "split_count": [19, 19],
+ "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": {
+ "pin": "D2"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+ "rows": ["D7", "B5", "F7", "F6", "B6"]
+ },
+ "diode_direction": "ROW2COL",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_split_4x6_5": {
+ "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": [5, 5], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 2], "x": 14, "y": 0},
+ {"matrix": [5, 1], "x": 15, "y": 0},
+ {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 2], "x": 14, "y": 1},
+ {"matrix": [6, 1], "x": 15, "y": 1},
+ {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 2], "x": 14, "y": 2},
+ {"matrix": [7, 1], "x": 15, "y": 2},
+ {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 2], "x": 14, "y": 3},
+ {"matrix": [8, 1], "x": 15, "y": 3},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+ {"matrix": [4, 3], "x": 5, "y": 4},
+ {"matrix": [4, 4], "x": 6, "y": 4},
+ {"matrix": [4, 1], "x": 7, "y": 4},
+ {"matrix": [9, 1], "x": 9, "y": 4},
+ {"matrix": [9, 4], "x": 10, "y": 4},
+ {"matrix": [9, 3], "x": 11, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 5},
+ {"matrix": [4, 2], "x": 7, "y": 5},
+ {"matrix": [9, 2], "x": 9, "y": 5},
+ {"matrix": [9, 5], "x": 10, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bastardkb/tbk/rules.mk b/keyboards/bastardkb/tbk/rules.mk
deleted file mode 100644
index 323b24ba201..00000000000
--- a/keyboards/bastardkb/tbk/rules.mk
+++ /dev/null
@@ -1,13 +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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json
index eff61e3f500..62301b1f2bc 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@@ -6,6 +6,9 @@
"eeprom": {
"driver": "spi"
},
+ "split": {
+ "enabled": true
+ },
"rgb_matrix": {
"driver": "ws2812"
},
diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
index b5612ce38a8..20c87fca307 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk
+++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
@@ -16,8 +16,6 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
index f246ce0e7ce..54433f39bf3 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
index 07bf99658b1..57c7399c01d 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json
@@ -15,6 +15,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
index ba717ec1150..6221b2ef6a5 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
@@ -15,5 +15,3 @@ AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
index 3bcae1df607..2f64d2b51bf 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
index e7f01c359dc..b67bc1d744c 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json
@@ -12,6 +12,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"ws2812": {
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
index 53f4c0baa87..83407eef806 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
index f62427438b7..d08c89ec574 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json
@@ -19,6 +19,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "A3"
},
"development_board": "stemcell"
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
index 8256842e21d..ef125eb2fea 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
@@ -16,6 +16,4 @@ RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = usart
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
deleted file mode 100644
index 6d1ae830ebe..00000000000
--- a/keyboards/bbrfkr/dynamis/info.json
+++ /dev/null
@@ -1,201 +0,0 @@
-{
- "keyboard_name": "dynamis",
- "manufacturer": "bbrfkr",
- "url": "https://github.com/bbrfkr/keyboards",
- "maintainer": "bbrfkr",
- "usb": {
- "vid": "0x6262",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
- "rows": ["B6", "B4", "D6", "D5", "D1", "C6", "B5", "D7", "D4", "D0"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B7", "pin_b": "E6"}
- ]
- },
- "rgblight": {
- "led_count": 10,
- "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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "layouts": {
- "LAYOUT_ansi": {
- "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": [5, 6], "x": 7, "y": 0},
- {"matrix": [5, 5], "x": 8, "y": 0},
- {"matrix": [5, 4], "x": 9, "y": 0},
- {"matrix": [5, 3], "x": 10, "y": 0},
- {"matrix": [5, 2], "x": 11, "y": 0},
- {"matrix": [5, 1], "x": 12, "y": 0},
- {"matrix": [5, 0], "x": 13, "y": 0},
- {"matrix": [9, 0], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [6, 6], "x": 7.5, "y": 1},
- {"matrix": [6, 5], "x": 8.5, "y": 1},
- {"matrix": [6, 4], "x": 9.5, "y": 1},
- {"matrix": [6, 3], "x": 10.5, "y": 1},
- {"matrix": [6, 2], "x": 11.5, "y": 1},
- {"matrix": [6, 1], "x": 12.5, "y": 1},
- {"matrix": [6, 0], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [7, 6], "x": 7.75, "y": 2},
- {"matrix": [7, 5], "x": 8.75, "y": 2},
- {"matrix": [7, 4], "x": 9.75, "y": 2},
- {"matrix": [7, 3], "x": 10.75, "y": 2},
- {"matrix": [7, 2], "x": 11.75, "y": 2},
- {"matrix": [7, 0], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [8, 6], "x": 7.25, "y": 3},
- {"matrix": [8, 5], "x": 8.25, "y": 3},
- {"matrix": [8, 4], "x": 9.25, "y": 3},
- {"matrix": [8, 3], "x": 10.25, "y": 3},
- {"matrix": [8, 2], "x": 11.25, "y": 3},
- {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [8, 0], "x": 14, "y": 3},
-
- {"matrix": [9, 1], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
- {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
- {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-
- {"matrix": [9, 4], "x": 14.25, "y": 4},
- {"matrix": [9, 3], "x": 15.25, "y": 4},
- {"matrix": [9, 2], "x": 16.25, "y": 4}
- ]
- },
- "LAYOUT_iso": {
- "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": [5, 6], "x": 7, "y": 0},
- {"matrix": [5, 5], "x": 8, "y": 0},
- {"matrix": [5, 4], "x": 9, "y": 0},
- {"matrix": [5, 3], "x": 10, "y": 0},
- {"matrix": [5, 2], "x": 11, "y": 0},
- {"matrix": [5, 1], "x": 12, "y": 0},
- {"matrix": [5, 0], "x": 13, "y": 0},
- {"matrix": [9, 0], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [6, 6], "x": 7.5, "y": 1},
- {"matrix": [6, 5], "x": 8.5, "y": 1},
- {"matrix": [6, 4], "x": 9.5, "y": 1},
- {"matrix": [6, 3], "x": 10.5, "y": 1},
- {"matrix": [6, 2], "x": 11.5, "y": 1},
- {"matrix": [6, 1], "x": 12.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [7, 6], "x": 7.75, "y": 2},
- {"matrix": [7, 5], "x": 8.75, "y": 2},
- {"matrix": [7, 4], "x": 9.75, "y": 2},
- {"matrix": [7, 3], "x": 10.75, "y": 2},
- {"matrix": [7, 2], "x": 11.75, "y": 2},
- {"matrix": [7, 1], "x": 12.75, "y": 2},
- {"matrix": [7, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [8, 6], "x": 7.25, "y": 3},
- {"matrix": [8, 5], "x": 8.25, "y": 3},
- {"matrix": [8, 4], "x": 9.25, "y": 3},
- {"matrix": [8, 3], "x": 10.25, "y": 3},
- {"matrix": [8, 2], "x": 11.25, "y": 3},
- {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [8, 0], "x": 14, "y": 3},
-
- {"matrix": [9, 1], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
- {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
- {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
-
- {"matrix": [9, 4], "x": 14.25, "y": 4},
- {"matrix": [9, 3], "x": 15.25, "y": 4},
- {"matrix": [9, 2], "x": 16.25, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/bbrfkr/dynamis/keyboard.json b/keyboards/bbrfkr/dynamis/keyboard.json
new file mode 100644
index 00000000000..dc9b6cf5848
--- /dev/null
+++ b/keyboards/bbrfkr/dynamis/keyboard.json
@@ -0,0 +1,212 @@
+{
+ "keyboard_name": "dynamis",
+ "manufacturer": "bbrfkr",
+ "url": "https://github.com/bbrfkr/keyboards",
+ "maintainer": "bbrfkr",
+ "usb": {
+ "vid": "0x6262",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true,
+ "pointing_device": true,
+ "encoder": true
+ },
+ "build": {
+ "lto": true
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+ "rows": ["B6", "B4", "D6", "D5", "D1", "C6", "B5", "D7", "D4", "D0"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B7", "pin_b": "E6"}
+ ]
+ },
+ "rgblight": {
+ "led_count": 10,
+ "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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "layouts": {
+ "LAYOUT_ansi": {
+ "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": [5, 6], "x": 7, "y": 0},
+ {"matrix": [5, 5], "x": 8, "y": 0},
+ {"matrix": [5, 4], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 0], "x": 13, "y": 0},
+ {"matrix": [9, 0], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [6, 6], "x": 7.5, "y": 1},
+ {"matrix": [6, 5], "x": 8.5, "y": 1},
+ {"matrix": [6, 4], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 2], "x": 11.5, "y": 1},
+ {"matrix": [6, 1], "x": 12.5, "y": 1},
+ {"matrix": [6, 0], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 0], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [8, 6], "x": 7.25, "y": 3},
+ {"matrix": [8, 5], "x": 8.25, "y": 3},
+ {"matrix": [8, 4], "x": 9.25, "y": 3},
+ {"matrix": [8, 3], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 0], "x": 14, "y": 3},
+
+ {"matrix": [9, 1], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 3], "x": 15.25, "y": 4},
+ {"matrix": [9, 2], "x": 16.25, "y": 4}
+ ]
+ },
+ "LAYOUT_iso": {
+ "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": [5, 6], "x": 7, "y": 0},
+ {"matrix": [5, 5], "x": 8, "y": 0},
+ {"matrix": [5, 4], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 0], "x": 13, "y": 0},
+ {"matrix": [9, 0], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [6, 6], "x": 7.5, "y": 1},
+ {"matrix": [6, 5], "x": 8.5, "y": 1},
+ {"matrix": [6, 4], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 2], "x": 11.5, "y": 1},
+ {"matrix": [6, 1], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [7, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [8, 6], "x": 7.25, "y": 3},
+ {"matrix": [8, 5], "x": 8.25, "y": 3},
+ {"matrix": [8, 4], "x": 9.25, "y": 3},
+ {"matrix": [8, 3], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 0], "x": 14, "y": 3},
+
+ {"matrix": [9, 1], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 3], "x": 15.25, "y": 4},
+ {"matrix": [9, 2], "x": 16.25, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bbrfkr/dynamis/rules.mk b/keyboards/bbrfkr/dynamis/rules.mk
index aef3d2a28a0..fab9162dc64 100644
--- a/keyboards/bbrfkr/dynamis/rules.mk
+++ b/keyboards/bbrfkr/dynamis/rules.mk
@@ -1,17 +1 @@
-# 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 = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = no
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = pmw3360
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h
deleted file mode 100644
index 81ada21b71e..00000000000
--- a/keyboards/bear_face/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 chemicalwill
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/bear_face/info.json b/keyboards/bear_face/info.json
index 24dd696e9b4..ad12468d56f 100644
--- a/keyboards/bear_face/info.json
+++ b/keyboards/bear_face/info.json
@@ -18,6 +18,12 @@
"mousekey": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B5", "C7", "C6", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
"rows": ["F5", "F6", "F4", "F1", "B0", "B6"]
diff --git a/keyboards/beatervan/config.h b/keyboards/beatervan/config.h
deleted file mode 100644
index f482b43c10b..00000000000
--- a/keyboards/beatervan/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/* Copyright 2020 OJtheTiny
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/beatervan/keyboard.json b/keyboards/beatervan/keyboard.json
index 4828127d14b..27d0f3e5352 100644
--- a/keyboards/beatervan/keyboard.json
+++ b/keyboards/beatervan/keyboard.json
@@ -17,6 +17,12 @@
"nkro": true,
"unicode": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D1", "D0", "D4", "C6"]
diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/keyboard.json
similarity index 100%
rename from keyboards/beekeeb/piantor/info.json
rename to keyboards/beekeeb/piantor/keyboard.json
diff --git a/keyboards/beekeeb/piantor_pro/info.json b/keyboards/beekeeb/piantor_pro/keyboard.json
similarity index 100%
rename from keyboards/beekeeb/piantor_pro/info.json
rename to keyboards/beekeeb/piantor_pro/keyboard.json
diff --git a/keyboards/bemeier/bmek/rev1/info.json b/keyboards/bemeier/bmek/rev1/info.json
deleted file mode 100644
index 70873aa5274..00000000000
--- a/keyboards/bemeier/bmek/rev1/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 6,
- "animations": {
- "breathing": true,
- "rainbow_mood": true
- }
- },
- "tapping": {
- "term": 175
- },
- "ws2812": {
- "pin": "E6"
- },
- "matrix_pins": {
- "cols": ["F1", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "C6", "C7", "F7", "F6", "F5", "F4", "B5"],
- "rows": ["D4", "D7", "B6", "B4", "B7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bemeier/bmek/rev1/keyboard.json b/keyboards/bemeier/bmek/rev1/keyboard.json
new file mode 100644
index 00000000000..5f559009667
--- /dev/null
+++ b/keyboards/bemeier/bmek/rev1/keyboard.json
@@ -0,0 +1,38 @@
+{
+ "usb": {
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "sleep_led": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 6,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true
+ }
+ },
+ "tapping": {
+ "term": 175
+ },
+ "ws2812": {
+ "pin": "E6"
+ },
+ "matrix_pins": {
+ "cols": ["F1", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "C6", "C7", "F7", "F6", "F5", "F4", "B5"],
+ "rows": ["D4", "D7", "B6", "B4", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bemeier/bmek/rev1/rules.mk b/keyboards/bemeier/bmek/rev1/rules.mk
deleted file mode 100755
index e9b89a01e1c..00000000000
--- a/keyboards/bemeier/bmek/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 = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-SLEEP_LED_ENABLE = yes
-SPLIT_KEYBOARD = no
-BACKLIGHT_ENABLE = no
-NKRO_ENABLE = yes # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
-LTO_ENABLE = yes
diff --git a/keyboards/bemeier/bmek/rev2/info.json b/keyboards/bemeier/bmek/rev2/info.json
deleted file mode 100644
index f1440afaf24..00000000000
--- a/keyboards/bemeier/bmek/rev2/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.2"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 6,
- "animations": {
- "breathing": true,
- "rainbow_mood": true
- }
- },
- "tapping": {
- "term": 175
- },
- "ws2812": {
- "pin": "E6"
- },
- "matrix_pins": {
- "cols": ["F6", "B0", "B1", "F7", "C7", "C6", "B6", "F1", "B2", "B3", "D6", "D3", "D2", "D1", "D0"],
- "rows": ["F4", "F5", "D7", "B5", "B4"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bemeier/bmek/rev2/keyboard.json b/keyboards/bemeier/bmek/rev2/keyboard.json
new file mode 100644
index 00000000000..f9e264a2143
--- /dev/null
+++ b/keyboards/bemeier/bmek/rev2/keyboard.json
@@ -0,0 +1,38 @@
+{
+ "usb": {
+ "device_version": "0.0.2"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "sleep_led": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 6,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true
+ }
+ },
+ "tapping": {
+ "term": 175
+ },
+ "ws2812": {
+ "pin": "E6"
+ },
+ "matrix_pins": {
+ "cols": ["F6", "B0", "B1", "F7", "C7", "C6", "B6", "F1", "B2", "B3", "D6", "D3", "D2", "D1", "D0"],
+ "rows": ["F4", "F5", "D7", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bemeier/bmek/rev2/rules.mk b/keyboards/bemeier/bmek/rev2/rules.mk
deleted file mode 100755
index e9b89a01e1c..00000000000
--- a/keyboards/bemeier/bmek/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 = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-SLEEP_LED_ENABLE = yes
-SPLIT_KEYBOARD = no
-BACKLIGHT_ENABLE = no
-NKRO_ENABLE = yes # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
-LTO_ENABLE = yes
diff --git a/keyboards/bemeier/bmek/rev3/info.json b/keyboards/bemeier/bmek/rev3/info.json
deleted file mode 100644
index ac0faf87063..00000000000
--- a/keyboards/bemeier/bmek/rev3/info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.3"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 6,
- "animations": {
- "breathing": true,
- "rainbow_mood": true
- }
- },
- "tapping": {
- "term": 175
- },
- "ws2812": {
- "pin": "E6"
- },
- "matrix_pins": {
- "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "B7", "D0", "D1", "D2", "D3", "D5", "D4"],
- "rows": ["F1", "B4", "B5", "D6", "D7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bemeier/bmek/rev3/keyboard.json b/keyboards/bemeier/bmek/rev3/keyboard.json
new file mode 100644
index 00000000000..3d12f4ee4e1
--- /dev/null
+++ b/keyboards/bemeier/bmek/rev3/keyboard.json
@@ -0,0 +1,38 @@
+{
+ "usb": {
+ "device_version": "0.0.3"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "sleep_led": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 6,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true
+ }
+ },
+ "tapping": {
+ "term": 175
+ },
+ "ws2812": {
+ "pin": "E6"
+ },
+ "matrix_pins": {
+ "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F0", "B7", "D0", "D1", "D2", "D3", "D5", "D4"],
+ "rows": ["F1", "B4", "B5", "D6", "D7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/bemeier/bmek/rev3/rules.mk b/keyboards/bemeier/bmek/rev3/rules.mk
deleted file mode 100755
index e9b89a01e1c..00000000000
--- a/keyboards/bemeier/bmek/rev3/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-SLEEP_LED_ENABLE = yes
-SPLIT_KEYBOARD = no
-BACKLIGHT_ENABLE = no
-NKRO_ENABLE = yes # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
-LTO_ENABLE = yes
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
deleted file mode 100644
index 179b1172430..00000000000
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-Copyright 2015 Jack Humbert
-Copyright 2017 Biacco42
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json
deleted file mode 100644
index 67f27ad6129..00000000000
--- a/keyboards/biacco42/ergo42/rev1/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
- "keyboard_name": "Ergo42",
- "manufacturer": "Biacco42",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xBC42",
- "pid": "0x0042",
- "device_version": "1.0.0"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_ortho_4x14"
- },
- "layouts": {
- "LAYOUT_ortho_4x14": {
- "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": [4, 6], "x": 8, "y": 0},
- {"matrix": [4, 5], "x": 9, "y": 0},
- {"matrix": [4, 4], "x": 10, "y": 0},
- {"matrix": [4, 3], "x": 11, "y": 0},
- {"matrix": [4, 2], "x": 12, "y": 0},
- {"matrix": [4, 1], "x": 13, "y": 0},
- {"matrix": [4, 0], "x": 14, "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": [5, 6], "x": 8, "y": 1},
- {"matrix": [5, 5], "x": 9, "y": 1},
- {"matrix": [5, 4], "x": 10, "y": 1},
- {"matrix": [5, 3], "x": 11, "y": 1},
- {"matrix": [5, 2], "x": 12, "y": 1},
- {"matrix": [5, 1], "x": 13, "y": 1},
- {"matrix": [5, 0], "x": 14, "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": [6, 6], "x": 8, "y": 2},
- {"matrix": [6, 5], "x": 9, "y": 2},
- {"matrix": [6, 4], "x": 10, "y": 2},
- {"matrix": [6, 3], "x": 11, "y": 2},
- {"matrix": [6, 2], "x": 12, "y": 2},
- {"matrix": [6, 1], "x": 13, "y": 2},
- {"matrix": [6, 0], "x": 14, "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": [7, 6], "x": 8, "y": 3},
- {"matrix": [7, 5], "x": 9, "y": 3},
- {"matrix": [7, 4], "x": 10, "y": 3},
- {"matrix": [7, 3], "x": 11, "y": 3},
- {"matrix": [7, 2], "x": 12, "y": 3},
- {"matrix": [7, 1], "x": 13, "y": 3},
- {"matrix": [7, 0], "x": 14, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/biacco42/ergo42/rev1/keyboard.json b/keyboards/biacco42/ergo42/rev1/keyboard.json
new file mode 100644
index 00000000000..b3a53bb3a4c
--- /dev/null
+++ b/keyboards/biacco42/ergo42/rev1/keyboard.json
@@ -0,0 +1,112 @@
+{
+ "keyboard_name": "Ergo42",
+ "manufacturer": "Biacco42",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xBC42",
+ "pid": "0x0042",
+ "device_version": "1.0.0"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_4x14"
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x14": {
+ "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": [4, 6], "x": 8, "y": 0},
+ {"matrix": [4, 5], "x": 9, "y": 0},
+ {"matrix": [4, 4], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 1], "x": 13, "y": 0},
+ {"matrix": [4, 0], "x": 14, "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": [5, 6], "x": 8, "y": 1},
+ {"matrix": [5, 5], "x": 9, "y": 1},
+ {"matrix": [5, 4], "x": 10, "y": 1},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 1], "x": 13, "y": 1},
+ {"matrix": [5, 0], "x": 14, "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": [6, 6], "x": 8, "y": 2},
+ {"matrix": [6, 5], "x": 9, "y": 2},
+ {"matrix": [6, 4], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 1], "x": 13, "y": 2},
+ {"matrix": [6, 0], "x": 14, "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": [7, 6], "x": 8, "y": 3},
+ {"matrix": [7, 5], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [7, 3], "x": 11, "y": 3},
+ {"matrix": [7, 2], "x": 12, "y": 3},
+ {"matrix": [7, 1], "x": 13, "y": 3},
+ {"matrix": [7, 0], "x": 14, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/biacco42/ergo42/rev1/rules.mk b/keyboards/biacco42/ergo42/rev1/rules.mk
deleted file mode 100644
index 7b30c0beff2..00000000000
--- a/keyboards/biacco42/ergo42/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/biacco42/ergo42/rules.mk b/keyboards/biacco42/ergo42/rules.mk
index 62044b6c13a..18059c0a3bc 100644
--- a/keyboards/biacco42/ergo42/rules.mk
+++ b/keyboards/biacco42/ergo42/rules.mk
@@ -1,16 +1 @@
-# 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 = 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
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = biacco42/ergo42/rev1
diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h
deleted file mode 100644
index df5455b3c22..00000000000
--- a/keyboards/biacco42/meishi/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Biacco42
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/biacco42/meishi/keyboard.json b/keyboards/biacco42/meishi/keyboard.json
index d9d37d72fe4..b7d751d83e0 100644
--- a/keyboards/biacco42/meishi/keyboard.json
+++ b/keyboards/biacco42/meishi/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B1", "B3", "B2", "B6"],
"rows": ["B5"]
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
deleted file mode 100644
index df5455b3c22..00000000000
--- a/keyboards/biacco42/meishi2/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Biacco42
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/biacco42/meishi2/keyboard.json b/keyboards/biacco42/meishi2/keyboard.json
index 3a392442f24..2f553681bc7 100644
--- a/keyboards/biacco42/meishi2/keyboard.json
+++ b/keyboards/biacco42/meishi2/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F5", "F6"],
"rows": ["D7", "E6"]
diff --git a/keyboards/binepad/bn003/config.h b/keyboards/binepad/bn003/config.h
deleted file mode 100644
index 77f51ecf5a2..00000000000
--- a/keyboards/binepad/bn003/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 BINEPAD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/binepad/bn003/keyboard.json b/keyboards/binepad/bn003/keyboard.json
index 695518828ec..440b5f65979 100644
--- a/keyboards/binepad/bn003/keyboard.json
+++ b/keyboards/binepad/bn003/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B4", "B5", "B6"],
"rows": ["C6"]
diff --git a/keyboards/binepad/bn009/r1/info.json b/keyboards/binepad/bn009/r1/info.json
deleted file mode 100644
index 4b6a49bb9d7..00000000000
--- a/keyboards/binepad/bn009/r1/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "keyboard_name": "BN009 R1",
- "bootloader": "atmel-dfu",
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["D2", "D1", "D0"],
- "rows": ["B6", "B5", "B4"]
- },
- "processor": "atmega32u4",
- "usb": {
- "device_version": "0.0.1"
- }
- }
diff --git a/keyboards/binepad/bn009/r1/keyboard.json b/keyboards/binepad/bn009/r1/keyboard.json
new file mode 100644
index 00000000000..c5338c648d8
--- /dev/null
+++ b/keyboards/binepad/bn009/r1/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "keyboard_name": "BN009 R1",
+ "build": {
+ "lto": true
+ },
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["D2", "D1", "D0"],
+ "rows": ["B6", "B5", "B4"]
+ },
+ "processor": "atmega32u4",
+ "usb": {
+ "device_version": "0.0.1"
+ }
+ }
diff --git a/keyboards/binepad/bn009/r1/rules.mk b/keyboards/binepad/bn009/r1/rules.mk
deleted file mode 100644
index 10468472aa9..00000000000
--- a/keyboards/binepad/bn009/r1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2020 Binepad (@binpad)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-LTO_ENABLE = yes
diff --git a/keyboards/binepad/bnr1/rules.mk b/keyboards/binepad/bnr1/rules.mk
index 9719de29b8e..ce85c574046 100755
--- a/keyboards/binepad/bnr1/rules.mk
+++ b/keyboards/binepad/bnr1/rules.mk
@@ -1,3 +1 @@
-# This file is mostly left blank
-
DEFAULT_FOLDER = binepad/bnr1/v2
diff --git a/keyboards/binepad/bnr1/v1/info.json b/keyboards/binepad/bnr1/v1/info.json
deleted file mode 100644
index e67ea81282b..00000000000
--- a/keyboards/binepad/bnr1/v1/info.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "bootloader": "atmel-dfu",
- "processor": "atmega32u4",
- "diode_direction": "COL2ROW",
- "usb": {
- "pid": "0x4231",
- "device_version": "1.0.0"
- },
- "matrix_pins": {
- "cols": ["B0"],
- "rows": ["E6"]
- },
- "encoder": {
- "enabled": true,
- "rotary": [
- {"pin_a": "D6", "pin_b": "D7"}
- ]
- }
-}
diff --git a/keyboards/binepad/bnr1/v1/keyboard.json b/keyboards/binepad/bnr1/v1/keyboard.json
new file mode 100644
index 00000000000..ff3e633e191
--- /dev/null
+++ b/keyboards/binepad/bnr1/v1/keyboard.json
@@ -0,0 +1,22 @@
+{
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "diode_direction": "COL2ROW",
+ "usb": {
+ "pid": "0x4231",
+ "device_version": "1.0.0"
+ },
+ "build": {
+ "lto": true
+ },
+ "matrix_pins": {
+ "cols": ["B0"],
+ "rows": ["E6"]
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {"pin_a": "D6", "pin_b": "D7"}
+ ]
+ }
+}
diff --git a/keyboards/binepad/bnr1/v1/rules.mk b/keyboards/binepad/bnr1/v1/rules.mk
deleted file mode 100644
index ac022b38ca8..00000000000
--- a/keyboards/binepad/bnr1/v1/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is mostly left blank
-
-LTO_ENABLE = yes
diff --git a/keyboards/bioi/g60/config.h b/keyboards/bioi/g60/config.h
index 976841be799..30ce798073d 100644
--- a/keyboards/bioi/g60/config.h
+++ b/keyboards/bioi/g60/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/* key combination for magic key command */
#define KEYBOARD_LOCK_ENABLE
#define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/info.json
deleted file mode 100644
index a96d1acce57..00000000000
--- a/keyboards/bioi/g60/info.json
+++ /dev/null
@@ -1,549 +0,0 @@
-{
- "keyboard_name": "BIOI G60",
- "manufacturer": "Basic IO Instruments",
- "url": "https://scottywei.github.io/bioi-g60ble/",
- "maintainer": "scottywei",
- "usb": {
- "vid": "0x8101",
- "pid": "0x6080",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
- "rows": ["E6", "B0", "F1", "F5", "F4"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B7",
- "levels": 12
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 8,
- "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": {
- "pin": "B1"
- },
- "bluetooth": {
- "driver": "custom"
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
- {"label": "\\", "matrix": [3, 1], "x": 1, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11, "y": 3},
- {"label": "Shift", "matrix": [3, 13], "x": 12, "y": 3},
- {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
- {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
- {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4},
- {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
- {"label": "Menu", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "Ctrl", "matrix": [4, 13], "x": 14, "y": 4}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_arrow": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "Shift", "matrix": [3, 13], "x": 11.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
- {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
- {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
- {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
- {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_iso_split_bs_rshift": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_iso_arrow": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "Shift", "matrix": [3, 13], "x": 11.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
- {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
- {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
- {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
- ]
- },
- "LAYOUT_60_tsangan_hhkb_iso": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
- {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/bioi/g60/keyboard.json b/keyboards/bioi/g60/keyboard.json
new file mode 100644
index 00000000000..8d3dd587707
--- /dev/null
+++ b/keyboards/bioi/g60/keyboard.json
@@ -0,0 +1,567 @@
+{
+ "keyboard_name": "BIOI G60",
+ "manufacturer": "Basic IO Instruments",
+ "url": "https://scottywei.github.io/bioi-g60ble/",
+ "maintainer": "scottywei",
+ "usb": {
+ "vid": "0x8101",
+ "pid": "0x6080",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "command": true,
+ "backlight": true,
+ "rgblight": true,
+ "bluetooth": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
+ "rows": ["E6", "B0", "F1", "F5", "F4"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B7",
+ "levels": 12
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 8,
+ "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": {
+ "pin": "B1"
+ },
+ "bluetooth": {
+ "driver": "custom"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
+ {"label": "\\", "matrix": [3, 1], "x": 1, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 12, "y": 3},
+ {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
+ {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+ {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4},
+ {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
+ {"label": "Menu", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_arrow": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
+ {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+ {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso_arrow": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 7], "x": 13, "y": 3},
+ {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+ {"label": "\u2190", "matrix": [4, 8], "x": 12, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb_iso": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 12], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bioi/g60/rules.mk b/keyboards/bioi/g60/rules.mk
index 3635daac6f3..c383c07affc 100644
--- a/keyboards/bioi/g60/rules.mk
+++ b/keyboards/bioi/g60/rules.mk
@@ -1,19 +1,5 @@
# Processor frequency
F_CPU = 8000000
-# 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 = yes # 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 # Reduce firmware size
-BLUETOOTH_ENABLE = yes
-
UART_DRIVER_REQUIRED = yes
SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
index 0b4ce9a0907..8e0ef249fef 100644
--- a/keyboards/bioi/g60ble/config.h
+++ b/keyboards/bioi/g60ble/config.h
@@ -1,10 +1,5 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/* key combination for magic key command */
#define KEYBOARD_LOCK_ENABLE
#define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/info.json
deleted file mode 100644
index 1699f7275e0..00000000000
--- a/keyboards/bioi/g60ble/info.json
+++ /dev/null
@@ -1,471 +0,0 @@
-{
- "keyboard_name": "BIOI G60 BLE",
- "manufacturer": "Basic IO Instruments",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x6583",
- "pid": "0x6080",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
- "rows": ["E6", "B0", "F1", "F5", "F4"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B7",
- "levels": 8
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 36,
- "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": {
- "pin": "B1"
- },
- "bluetooth": {
- "driver": "custom"
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
- "layouts": {
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [4, 9], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"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},
- {"matrix": [4, 7], "x": 12, "y": 3},
- {"matrix": [3, 13], "x": 13, "y": 3},
- {"matrix": [3, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4},
- {"matrix": [4, 11], "x": 11, "y": 4},
- {"matrix": [4, 8], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- },
- "LAYOUT_60_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [4, 9], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [4, 9], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [4, 9], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/bioi/g60ble/keyboard.json b/keyboards/bioi/g60ble/keyboard.json
new file mode 100644
index 00000000000..2d09fadff08
--- /dev/null
+++ b/keyboards/bioi/g60ble/keyboard.json
@@ -0,0 +1,489 @@
+{
+ "keyboard_name": "BIOI G60 BLE",
+ "manufacturer": "Basic IO Instruments",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x6583",
+ "pid": "0x6080",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "backlight": true,
+ "rgblight": true,
+ "bluetooth": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B3", "C7", "C6", "B6", "B5", "D5", "B4", "D7", "D6", "D4", "D1", "D0"],
+ "rows": ["E6", "B0", "F1", "F5", "F4"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B7",
+ "levels": 8
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 36,
+ "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": {
+ "pin": "B1"
+ },
+ "bluetooth": {
+ "driver": "custom"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift", "60_tsangan_hhkb"],
+ "layouts": {
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"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},
+ {"matrix": [4, 7], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 8], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_60_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk
index 6bfcc62d7e0..c383c07affc 100644
--- a/keyboards/bioi/g60ble/rules.mk
+++ b/keyboards/bioi/g60ble/rules.mk
@@ -1,19 +1,5 @@
# Processor frequency
F_CPU = 8000000
-# 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 = yes # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes
-LTO_ENABLE = yes
-
-BLUETOOTH_ENABLE = yes
-
UART_DRIVER_REQUIRED = yes
SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/morgan65/config.h b/keyboards/bioi/morgan65/config.h
index 2e78cc2a3e1..78f53856f79 100644
--- a/keyboards/bioi/morgan65/config.h
+++ b/keyboards/bioi/morgan65/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/* key combination for magic key command */
#define KEYBOARD_LOCK_ENABLE
#define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/info.json
deleted file mode 100644
index 6cf66b843ac..00000000000
--- a/keyboards/bioi/morgan65/info.json
+++ /dev/null
@@ -1,739 +0,0 @@
-{
- "keyboard_name": "Morgan65",
- "manufacturer": "Basic IO Instruments",
- "url": "",
- "maintainer": "scottywei",
- "usb": {
- "vid": "0x8101",
- "pid": "0x6581",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "C7", "B0", "B7", "B5", "D5", "B4", "D7", "D6", "D1", "D0", "B3"],
- "rows": ["E6", "C6", "F4", "B2", "D4"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B6",
- "levels": 12
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 8,
- "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": {
- "pin": "B1"
- },
- "bluetooth": {
- "driver": "custom"
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "community_layouts": [
- "65_ansi_blocker",
- "65_ansi_blocker_split_bs",
- "65_ansi_blocker_tsangan",
- "65_ansi_blocker_tsangan_split_bs",
- "65_iso_blocker",
- "65_iso_blocker_split_bs",
- "65_iso_blocker_tsangan",
- "65_iso_blocker_tsangan_split_bs"
- ],
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
- {"label": "F1", "matrix": [4, 3], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "F2", "matrix": [4, 4], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
- {"label": "F3", "matrix": [4, 7], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "F4", "matrix": [4, 8], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
- {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
- {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
- {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
- {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
- {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_iso_blocker": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
- {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
- {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_iso_blocker_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
- {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
- {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
- {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_iso_blocker_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
- {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_iso_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
- {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
- {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/bioi/morgan65/keyboard.json b/keyboards/bioi/morgan65/keyboard.json
new file mode 100644
index 00000000000..8f83237f82f
--- /dev/null
+++ b/keyboards/bioi/morgan65/keyboard.json
@@ -0,0 +1,757 @@
+{
+ "keyboard_name": "Morgan65",
+ "manufacturer": "Basic IO Instruments",
+ "url": "",
+ "maintainer": "scottywei",
+ "usb": {
+ "vid": "0x8101",
+ "pid": "0x6581",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "command": true,
+ "backlight": true,
+ "rgblight": true,
+ "bluetooth": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "C7", "B0", "B7", "B5", "D5", "B4", "D7", "D6", "D1", "D0", "B3"],
+ "rows": ["E6", "C6", "F4", "B2", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B6",
+ "levels": 12
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 8,
+ "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": {
+ "pin": "B1"
+ },
+ "bluetooth": {
+ "driver": "custom"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "community_layouts": [
+ "65_ansi_blocker",
+ "65_ansi_blocker_split_bs",
+ "65_ansi_blocker_tsangan",
+ "65_ansi_blocker_tsangan_split_bs",
+ "65_iso_blocker",
+ "65_iso_blocker_split_bs",
+ "65_iso_blocker_tsangan",
+ "65_iso_blocker_tsangan_split_bs"
+ ],
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "`", "matrix": [4, 9], "x": 14, "y": 0},
+ {"label": "F1", "matrix": [4, 3], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "F2", "matrix": [4, 4], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"label": "F3", "matrix": [4, 7], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "F4", "matrix": [4, 8], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_iso_blocker": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_iso_blocker_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"label": "Fn", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_iso_blocker_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [4, 9], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [4, 3], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "}]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Page Up", "matrix": [4, 4], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'@", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#~", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "Page Down", "matrix": [4, 7], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\|", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ", <", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [4, 8], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 11], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 12], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bioi/morgan65/rules.mk b/keyboards/bioi/morgan65/rules.mk
index 3635daac6f3..c383c07affc 100644
--- a/keyboards/bioi/morgan65/rules.mk
+++ b/keyboards/bioi/morgan65/rules.mk
@@ -1,19 +1,5 @@
# Processor frequency
F_CPU = 8000000
-# 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 = yes # 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 # Reduce firmware size
-BLUETOOTH_ENABLE = yes
-
UART_DRIVER_REQUIRED = yes
SRC += bluetooth_custom.c
diff --git a/keyboards/bioi/s65/config.h b/keyboards/bioi/s65/config.h
index 8134bd96cfa..9f005f2d79f 100644
--- a/keyboards/bioi/s65/config.h
+++ b/keyboards/bioi/s65/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/* key combination for magic key command */
#define KEYBOARD_LOCK_ENABLE
#define MAGIC_KEY_LOCK L
diff --git a/keyboards/bioi/s65/keyboard.json b/keyboards/bioi/s65/keyboard.json
index b34cd9e602c..c55852f31cc 100644
--- a/keyboards/bioi/s65/keyboard.json
+++ b/keyboards/bioi/s65/keyboard.json
@@ -20,6 +20,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F1", "B3", "F4", "F5", "F6", "E6", "C7", "B2", "B1", "C6", "B6", "B5", "B4", "D7", "D4", "D5"],
"rows": ["D2", "D0", "D1", "F7", "D6"]
diff --git a/keyboards/blackplum/config.h b/keyboards/blackplum/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/blackplum/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/blackplum/keyboard.json b/keyboards/blackplum/keyboard.json
index d17bc378321..277e0eae622 100644
--- a/keyboards/blackplum/keyboard.json
+++ b/keyboards/blackplum/keyboard.json
@@ -39,6 +39,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1"],
"rows": ["C6", "B6", "B4", "B5", "D6", "D7", "D5", "D3", "D4"]
diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h
deleted file mode 100644
index aea945a035d..00000000000
--- a/keyboards/blank/blank01/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 gkeyboard
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/blank/blank01/keyboard.json b/keyboards/blank/blank01/keyboard.json
index 5dfa7e67ecc..f8af736bef8 100644
--- a/keyboards/blank/blank01/keyboard.json
+++ b/keyboards/blank/blank01/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D5", "D4", "D6", "D7", "B5", "B4", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["D0", "D1", "D2", "D3", "B3"]
diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/info.json
deleted file mode 100644
index 7e783c45b5c..00000000000
--- a/keyboards/blank_tehnologii/manibus/info.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
- "keyboard_name": "Manibus",
- "manufacturer": "Blank Tehnologii",
- "url": "https://blank.computer/",
- "maintainer": "SamuraiKek",
- "debounce": 2,
- "usb": {
- "vid": "0x424D",
- "pid": "0x4D4E",
- "device_version": "1.0.0"
- },
- "matrix_pins": {
- "cols": ["D7", "B4", "B5", "B6", "F0", "D4", "D6"],
- "rows": ["F4", "F5", "F6", "D3", "C6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0",
- "matrix_pins": {
- "right": {
- "cols": ["B6", "B5", "D6", "D5", "D3", "D7", "B4"],
- "rows": ["F5", "F1", "B2", "B1", "C6"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.75},
- {"matrix": [0, 1], "x": 1, "y": 0.5},
- {"matrix": [0, 2], "x": 2, "y": 0.25},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.25},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
-
- {"matrix": [5, 1], "x": 9, "y": 0.25},
- {"matrix": [5, 2], "x": 10, "y": 0.25},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0.25},
- {"matrix": [5, 5], "x": 13, "y": 0.5},
- {"matrix": [5, 6], "x": 14, "y": 0.75},
-
- {"matrix": [1, 0], "x": 0, "y": 1.75},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
-
- {"matrix": [6, 1], "x": 9, "y": 1.25},
- {"matrix": [6, 2], "x": 10, "y": 1.25},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1.25},
- {"matrix": [6, 5], "x": 13, "y": 1.5},
- {"matrix": [6, 6], "x": 14, "y": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2.75},
- {"matrix": [2, 1], "x": 1, "y": 2.5},
- {"matrix": [2, 2], "x": 2, "y": 2.25},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.25},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
-
- {"matrix": [7, 1], "x": 9, "y": 2.25},
- {"matrix": [7, 2], "x": 10, "y": 2.25},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2.25},
- {"matrix": [7, 5], "x": 13, "y": 2.5},
- {"matrix": [7, 6], "x": 14, "y": 2.75},
-
- {"matrix": [3, 0], "x": 0, "y": 3.75},
- {"matrix": [3, 1], "x": 1, "y": 3.5},
- {"matrix": [3, 2], "x": 2, "y": 3.25},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3.25},
- {"matrix": [3, 5], "x": 5, "y": 3.25},
-
- {"matrix": [8, 1], "x": 9, "y": 3.25},
- {"matrix": [8, 2], "x": 10, "y": 3.25},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3.25},
- {"matrix": [8, 5], "x": 13, "y": 3.5},
- {"matrix": [8, 6], "x": 14, "y": 3.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4.75},
- {"matrix": [4, 1], "x": 1, "y": 4.5},
- {"matrix": [4, 2], "x": 2, "y": 4.25},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4.25},
- {"matrix": [4, 5], "x": 5, "y": 4.25, "h": 1.5},
- {"matrix": [4, 6], "x": 6, "y": 4.25, "h": 2.25},
-
- {"matrix": [9, 0], "x": 8, "y": 4.25, "h": 2.25},
- {"matrix": [9, 1], "x": 9, "y": 4.25, "h": 1.5},
- {"matrix": [9, 2], "x": 10, "y": 4.25},
- {"matrix": [9, 3], "x": 11, "y": 4},
- {"matrix": [9, 4], "x": 12, "y": 4.25},
- {"matrix": [9, 5], "x": 13, "y": 4.5},
- {"matrix": [9, 6], "x": 14, "y": 4.75}
- ]
- }
- }
-}
diff --git a/keyboards/blank_tehnologii/manibus/keyboard.json b/keyboards/blank_tehnologii/manibus/keyboard.json
new file mode 100644
index 00000000000..f6cd41758db
--- /dev/null
+++ b/keyboards/blank_tehnologii/manibus/keyboard.json
@@ -0,0 +1,114 @@
+{
+ "keyboard_name": "Manibus",
+ "manufacturer": "Blank Tehnologii",
+ "url": "https://blank.computer/",
+ "maintainer": "SamuraiKek",
+ "debounce": 2,
+ "usb": {
+ "vid": "0x424D",
+ "pid": "0x4D4E",
+ "device_version": "1.0.0"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D7", "B4", "B5", "B6", "F0", "D4", "D6"],
+ "rows": ["F4", "F5", "F6", "D3", "C6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["B6", "B5", "D6", "D5", "D3", "D7", "B4"],
+ "rows": ["F5", "F1", "B2", "B1", "C6"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [5, 1], "x": 9, "y": 0.25},
+ {"matrix": [5, 2], "x": 10, "y": 0.25},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0.25},
+ {"matrix": [5, 5], "x": 13, "y": 0.5},
+ {"matrix": [5, 6], "x": 14, "y": 0.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.75},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [6, 1], "x": 9, "y": 1.25},
+ {"matrix": [6, 2], "x": 10, "y": 1.25},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1.25},
+ {"matrix": [6, 5], "x": 13, "y": 1.5},
+ {"matrix": [6, 6], "x": 14, "y": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.75},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"matrix": [7, 1], "x": 9, "y": 2.25},
+ {"matrix": [7, 2], "x": 10, "y": 2.25},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2.25},
+ {"matrix": [7, 5], "x": 13, "y": 2.5},
+ {"matrix": [7, 6], "x": 14, "y": 2.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.75},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.25},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+ {"matrix": [8, 1], "x": 9, "y": 3.25},
+ {"matrix": [8, 2], "x": 10, "y": 3.25},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3.25},
+ {"matrix": [8, 5], "x": 13, "y": 3.5},
+ {"matrix": [8, 6], "x": 14, "y": 3.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.75},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4.25},
+ {"matrix": [4, 5], "x": 5, "y": 4.25, "h": 1.5},
+ {"matrix": [4, 6], "x": 6, "y": 4.25, "h": 2.25},
+
+ {"matrix": [9, 0], "x": 8, "y": 4.25, "h": 2.25},
+ {"matrix": [9, 1], "x": 9, "y": 4.25, "h": 1.5},
+ {"matrix": [9, 2], "x": 10, "y": 4.25},
+ {"matrix": [9, 3], "x": 11, "y": 4},
+ {"matrix": [9, 4], "x": 12, "y": 4.25},
+ {"matrix": [9, 5], "x": 13, "y": 4.5},
+ {"matrix": [9, 6], "x": 14, "y": 4.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/blank_tehnologii/manibus/rules.mk b/keyboards/blank_tehnologii/manibus/rules.mk
deleted file mode 100644
index 1321ae0d173..00000000000
--- a/keyboards/blank_tehnologii/manibus/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
deleted file mode 100644
index a93b381c85b..00000000000
--- a/keyboards/blockey/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Eucalyn
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/blockey/keyboard.json b/keyboards/blockey/keyboard.json
index 0c150420dc9..9710606a522 100644
--- a/keyboards/blockey/keyboard.json
+++ b/keyboards/blockey/keyboard.json
@@ -36,6 +36,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D0", "B4", "C6", "D7", "F4", "F5", "F7"],
"rows": ["D3", "D1", "D4", "E6", "B5", "D2", "F6", "B3", "B2", "B6"]
diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
deleted file mode 100644
index 52c859c1540..00000000000
--- a/keyboards/bluebell/swoop/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
- "keyboard_name": "Swoop",
- "url": "https://github.com/jimmerricks/swoop",
- "maintainer": "jmnw",
- "manufacturer": "jmnw",
- "usb": {
- "vid": "0x1804",
- "pid": "0x3046",
- "device_version": "1.0.0"
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 36,
- "max_brightness": 150,
- "sleep": true,
- "split_count": [18, 18],
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "static_gradient": true
- }
- },
- "matrix_pins": {
- "cols": ["B1", "F7", "F6", "F5", "F4"],
- "rows": ["D4", "C6", "D7", "E6"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "B5"}
- ]
- },
- "split": {
- "soft_serial_pin": "D2",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "B5", "pin_b": "B4"}
- ]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "community_layouts": ["split_3x5_3"],
- "layouts": {
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375},
- {"matrix": [0, 1], "x": 1, "y": 0.125},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.125},
- {"matrix": [0, 4], "x": 4, "y": 0.25},
-
- {"matrix": [4, 4], "x": 8, "y": 0.25},
- {"matrix": [4, 3], "x": 9, "y": 0.125},
- {"matrix": [4, 2], "x": 10, "y": 0},
- {"matrix": [4, 1], "x": 11, "y": 0.125},
- {"matrix": [4, 0], "x": 12, "y": 0.375},
-
- {"matrix": [1, 0], "x": 0, "y": 1.375},
- {"matrix": [1, 1], "x": 1, "y": 1.125},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.125},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
-
- {"matrix": [5, 4], "x": 8, "y": 1.25},
- {"matrix": [5, 3], "x": 9, "y": 1.125},
- {"matrix": [5, 2], "x": 10, "y": 1},
- {"matrix": [5, 1], "x": 11, "y": 1.125},
- {"matrix": [5, 0], "x": 12, "y": 1.375},
-
- {"matrix": [2, 0], "x": 0, "y": 2.375},
- {"matrix": [2, 1], "x": 1, "y": 2.125},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.125},
- {"matrix": [2, 4], "x": 4, "y": 2.25},
-
- {"matrix": [6, 4], "x": 8, "y": 2.25},
- {"matrix": [6, 3], "x": 9, "y": 2.125},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 1], "x": 11, "y": 2.125},
- {"matrix": [6, 0], "x": 12, "y": 2.375},
-
- {"matrix": [3, 2], "x": 2.875, "y": 3.25},
- {"matrix": [3, 3], "x": 4, "y": 3.375},
- {"matrix": [3, 4], "x": 5.125, "y": 3.625},
-
- {"matrix": [7, 4], "x": 6.875, "y": 3.625},
- {"matrix": [7, 3], "x": 8, "y": 3.375},
- {"matrix": [7, 2], "x": 9.125, "y": 3.25}
- ]
- }
- }
-}
diff --git a/keyboards/bluebell/swoop/keyboard.json b/keyboards/bluebell/swoop/keyboard.json
new file mode 100644
index 00000000000..5cc29818b86
--- /dev/null
+++ b/keyboards/bluebell/swoop/keyboard.json
@@ -0,0 +1,106 @@
+{
+ "keyboard_name": "Swoop",
+ "url": "https://github.com/jimmerricks/swoop",
+ "maintainer": "jmnw",
+ "manufacturer": "jmnw",
+ "usb": {
+ "vid": "0x1804",
+ "pid": "0x3046",
+ "device_version": "1.0.0"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 36,
+ "max_brightness": 150,
+ "sleep": true,
+ "split_count": [18, 18],
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "static_gradient": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "B4"}
+ ]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "community_layouts": ["split_3x5_3"],
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.125},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.125},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+ {"matrix": [4, 4], "x": 8, "y": 0.25},
+ {"matrix": [4, 3], "x": 9, "y": 0.125},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0.125},
+ {"matrix": [4, 0], "x": 12, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.125},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+ {"matrix": [5, 4], "x": 8, "y": 1.25},
+ {"matrix": [5, 3], "x": 9, "y": 1.125},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1.125},
+ {"matrix": [5, 0], "x": 12, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.125},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [6, 4], "x": 8, "y": 2.25},
+ {"matrix": [6, 3], "x": 9, "y": 2.125},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2.125},
+ {"matrix": [6, 0], "x": 12, "y": 2.375},
+
+ {"matrix": [3, 2], "x": 2.875, "y": 3.25},
+ {"matrix": [3, 3], "x": 4, "y": 3.375},
+ {"matrix": [3, 4], "x": 5.125, "y": 3.625},
+
+ {"matrix": [7, 4], "x": 6.875, "y": 3.625},
+ {"matrix": [7, 3], "x": 8, "y": 3.375},
+ {"matrix": [7, 2], "x": 9.125, "y": 3.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bluebell/swoop/rules.mk b/keyboards/bluebell/swoop/rules.mk
deleted file mode 100644
index fc87c614046..00000000000
--- a/keyboards/bluebell/swoop/rules.mk
+++ /dev/null
@@ -1,11 +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
-RGBLIGHT_ENABLE = yes # Enable underlight
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
deleted file mode 100644
index 1b4e5a6d87e..00000000000
--- a/keyboards/boardrun/bizarre/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardrun/bizarre/keyboard.json b/keyboards/boardrun/bizarre/keyboard.json
index 6901f93625d..f61f3b053f1 100644
--- a/keyboards/boardrun/bizarre/keyboard.json
+++ b/keyboards/boardrun/bizarre/keyboard.json
@@ -39,6 +39,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"],
"rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
deleted file mode 100644
index 1b4e5a6d87e..00000000000
--- a/keyboards/boardrun/classic/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardrun/classic/keyboard.json b/keyboards/boardrun/classic/keyboard.json
index cd83ef58f06..4831131f18f 100644
--- a/keyboards/boardrun/classic/keyboard.json
+++ b/keyboards/boardrun/classic/keyboard.json
@@ -39,6 +39,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B3", "B2", "B1"],
"rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/info.json
deleted file mode 100644
index 054779f6fe1..00000000000
--- a/keyboards/boardsource/equals/48/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
- "keyboard_name": "Equals 48",
- "bootloader": "rp2040",
- "processor": "RP2040",
- "features": {
- "audio":true
- },
- "matrix_pins": {
- "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
- "rows": ["GP12", "GP13", "GP16", "GP17"]
- },
- "ws2812": {
- "driver": "vendor",
- "pin": "GP21"
- },
- "rgb_matrix": {
- "layout": [
- { "flags": 2, "x": 220, "y": 17 },
- { "flags": 2, "x": 172, "y": 17 },
- { "flags": 2, "x": 112, "y": 17 },
- { "flags": 2, "x": 50, "y": 17 },
- { "flags": 2, "x": 4, "y": 17 },
- { "flags": 2, "x": 4, "y": 56 },
- { "flags": 2, "x": 50, "y": 56 },
- { "flags": 2, "x": 112, "y": 56 },
- { "flags": 2, "x": 172, "y": 56 },
- { "flags": 2, "x": 220, "y": 56 },
- { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
- { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
- { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
- { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
- { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
- { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
- { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
- { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
- { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
- { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
- { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
- { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
- { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
- { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
- { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
- { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
- { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
- { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
- { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
- { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
- { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
- { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
- { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
- { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
- { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
- { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
- { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
- { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
- { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
- { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
- { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
- { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
- { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
- { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
- { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
- { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
- { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
- { "flags": 1, "matrix": [3, 1], "x": 20, "y": 64 },
- { "flags": 1, "matrix": [3, 2], "x": 40, "y": 64 },
- { "flags": 1, "matrix": [3, 3], "x": 61, "y": 64 },
- { "flags": 1, "matrix": [3, 4], "x": 81, "y": 64 },
- { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
- { "flags": 1, "matrix": [3, 6], "x": 122, "y": 64 },
- { "flags": 1, "matrix": [3, 7], "x": 142, "y": 64 },
- { "flags": 1, "matrix": [3, 8], "x": 162, "y": 64 },
- { "flags": 1, "matrix": [3, 9], "x": 183, "y": 64 },
- { "flags": 1, "matrix": [3, 10], "x": 203, "y": 64 },
- { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 }
- ]
- },
- "community_layouts": ["ortho_4x12"],
- "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 }
- ]
- }
- }
-}
diff --git a/keyboards/boardsource/equals/48/keyboard.json b/keyboards/boardsource/equals/48/keyboard.json
new file mode 100644
index 00000000000..5b633559313
--- /dev/null
+++ b/keyboards/boardsource/equals/48/keyboard.json
@@ -0,0 +1,134 @@
+{
+ "keyboard_name": "Equals 48",
+ "bootloader": "rp2040",
+ "processor": "RP2040",
+ "features": {
+ "audio":true,
+ "quantum_painter": true
+ },
+ "matrix_pins": {
+ "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
+ "rows": ["GP12", "GP13", "GP16", "GP17"]
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP21"
+ },
+ "rgb_matrix": {
+ "layout": [
+ { "flags": 2, "x": 220, "y": 17 },
+ { "flags": 2, "x": 172, "y": 17 },
+ { "flags": 2, "x": 112, "y": 17 },
+ { "flags": 2, "x": 50, "y": 17 },
+ { "flags": 2, "x": 4, "y": 17 },
+ { "flags": 2, "x": 4, "y": 56 },
+ { "flags": 2, "x": 50, "y": 56 },
+ { "flags": 2, "x": 112, "y": 56 },
+ { "flags": 2, "x": 172, "y": 56 },
+ { "flags": 2, "x": 220, "y": 56 },
+ { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
+ { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
+ { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
+ { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
+ { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
+ { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
+ { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
+ { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
+ { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
+ { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
+ { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
+ { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
+ { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
+ { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
+ { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
+ { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
+ { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
+ { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
+ { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
+ { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
+ { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
+ { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
+ { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
+ { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
+ { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
+ { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
+ { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
+ { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
+ { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
+ { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
+ { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
+ { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
+ { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
+ { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
+ { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
+ { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
+ { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
+ { "flags": 1, "matrix": [3, 1], "x": 20, "y": 64 },
+ { "flags": 1, "matrix": [3, 2], "x": 40, "y": 64 },
+ { "flags": 1, "matrix": [3, 3], "x": 61, "y": 64 },
+ { "flags": 1, "matrix": [3, 4], "x": 81, "y": 64 },
+ { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
+ { "flags": 1, "matrix": [3, 6], "x": 122, "y": 64 },
+ { "flags": 1, "matrix": [3, 7], "x": 142, "y": 64 },
+ { "flags": 1, "matrix": [3, 8], "x": 162, "y": 64 },
+ { "flags": 1, "matrix": [3, 9], "x": 183, "y": 64 },
+ { "flags": 1, "matrix": [3, 10], "x": 203, "y": 64 },
+ { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 }
+ ]
+ },
+ "community_layouts": ["ortho_4x12"],
+ "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 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/boardsource/equals/48/rules.mk b/keyboards/boardsource/equals/48/rules.mk
index 4192b0c2e54..2f75fc139fc 100644
--- a/keyboards/boardsource/equals/48/rules.mk
+++ b/keyboards/boardsource/equals/48/rules.mk
@@ -1,3 +1,2 @@
AUDIO_DRIVER = pwm_hardware
-QUANTUM_PAINTER_ENABLE = yes
QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/info.json
deleted file mode 100644
index da3fc3691a6..00000000000
--- a/keyboards/boardsource/equals/60/info.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
- "keyboard_name": "Equals 60",
- "bootloader": "rp2040",
- "processor": "RP2040",
- "features": {
- "audio":true
- },
- "matrix_pins": {
- "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
- "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"]
- },
- "ws2812": {
- "driver": "vendor",
- "pin": "GP21"
- },
- "rgb_matrix": {
- "layout": [
- { "flags": 2, "x": 220, "y": 17 },
- { "flags": 2, "x": 172, "y": 17 },
- { "flags": 2, "x": 112, "y": 17 },
- { "flags": 2, "x": 50, "y": 17 },
- { "flags": 2, "x": 4, "y": 17 },
- { "flags": 2, "x": 4, "y": 56 },
- { "flags": 2, "x": 50, "y": 56 },
- { "flags": 2, "x": 112, "y": 56 },
- { "flags": 2, "x": 172, "y": 56 },
- { "flags": 2, "x": 220, "y": 56 },
- { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
- { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
- { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
- { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
- { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
- { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
- { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
- { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
- { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
- { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
- { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
- { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
- { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
- { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
- { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
- { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
- { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
- { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
- { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
- { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
- { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
- { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
- { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
- { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
- { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
- { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
- { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
- { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
- { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
- { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
- { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
- { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
- { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
- { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
- { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
- { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
- { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
- { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 },
- { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 },
- { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 },
- { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 },
- { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
- { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 },
- { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 },
- { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 },
- { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64 },
- { "flags": 4, "matrix": [3, 10], "x": 203, "y": 64 },
- { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 },
- { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 },
- { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 },
- { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 },
- { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 },
- { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 },
- { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 },
- { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 },
- { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 },
- { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 },
- { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 },
- { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 }
- ]
- },
- "community_layouts": ["ortho_5x12"],
- "layouts": {
- "LAYOUT_ortho_5x12": {
- "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 },
- { "matrix": [4, 0], "x": 0, "y": 4 },
- { "matrix": [4, 1], "x": 1, "y": 4 },
- { "matrix": [4, 2], "x": 2, "y": 4 },
- { "matrix": [4, 3], "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, 8], "x": 8, "y": 4 },
- { "matrix": [4, 9], "x": 9, "y": 4 },
- { "matrix": [4, 10], "x": 10, "y": 4 },
- { "matrix": [4, 11], "x": 11, "y": 4 }
- ]
- }
- }
-}
diff --git a/keyboards/boardsource/equals/60/keyboard.json b/keyboards/boardsource/equals/60/keyboard.json
new file mode 100644
index 00000000000..3bc1f49be38
--- /dev/null
+++ b/keyboards/boardsource/equals/60/keyboard.json
@@ -0,0 +1,157 @@
+{
+ "keyboard_name": "Equals 60",
+ "bootloader": "rp2040",
+ "processor": "RP2040",
+ "features": {
+ "audio":true,
+ "quantum_painter": true
+ },
+ "matrix_pins": {
+ "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"],
+ "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"]
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP21"
+ },
+ "rgb_matrix": {
+ "layout": [
+ { "flags": 2, "x": 220, "y": 17 },
+ { "flags": 2, "x": 172, "y": 17 },
+ { "flags": 2, "x": 112, "y": 17 },
+ { "flags": 2, "x": 50, "y": 17 },
+ { "flags": 2, "x": 4, "y": 17 },
+ { "flags": 2, "x": 4, "y": 56 },
+ { "flags": 2, "x": 50, "y": 56 },
+ { "flags": 2, "x": 112, "y": 56 },
+ { "flags": 2, "x": 172, "y": 56 },
+ { "flags": 2, "x": 220, "y": 56 },
+ { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
+ { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
+ { "flags": 4, "matrix": [0, 2], "x": 40, "y": 0 },
+ { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
+ { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
+ { "flags": 4, "matrix": [0, 5], "x": 101, "y": 0 },
+ { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
+ { "flags": 4, "matrix": [0, 7], "x": 142, "y": 0 },
+ { "flags": 4, "matrix": [0, 8], "x": 162, "y": 0 },
+ { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
+ { "flags": 4, "matrix": [0, 10], "x": 203, "y": 0 },
+ { "flags": 1, "matrix": [0, 11], "x": 224, "y": 0 },
+ { "flags": 1, "matrix": [1, 0], "x": 0, "y": 21 },
+ { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21 },
+ { "flags": 4, "matrix": [1, 2], "x": 40, "y": 21 },
+ { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21 },
+ { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21 },
+ { "flags": 4, "matrix": [1, 5], "x": 101, "y": 21 },
+ { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21 },
+ { "flags": 4, "matrix": [1, 7], "x": 142, "y": 21 },
+ { "flags": 4, "matrix": [1, 8], "x": 162, "y": 21 },
+ { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21 },
+ { "flags": 4, "matrix": [1, 10], "x": 203, "y": 21 },
+ { "flags": 1, "matrix": [1, 11], "x": 224, "y": 21 },
+ { "flags": 1, "matrix": [2, 0], "x": 0, "y": 42 },
+ { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42 },
+ { "flags": 4, "matrix": [2, 2], "x": 40, "y": 42 },
+ { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42 },
+ { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42 },
+ { "flags": 4, "matrix": [2, 5], "x": 101, "y": 42 },
+ { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42 },
+ { "flags": 4, "matrix": [2, 7], "x": 142, "y": 42 },
+ { "flags": 4, "matrix": [2, 8], "x": 162, "y": 42 },
+ { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42 },
+ { "flags": 4, "matrix": [2, 10], "x": 203, "y": 42 },
+ { "flags": 1, "matrix": [2, 11], "x": 224, "y": 42 },
+ { "flags": 1, "matrix": [3, 0], "x": 0, "y": 64 },
+ { "flags": 4, "matrix": [3, 1], "x": 20, "y": 64 },
+ { "flags": 4, "matrix": [3, 2], "x": 40, "y": 64 },
+ { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64 },
+ { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64 },
+ { "flags": 4, "matrix": [3, 5], "x": 101, "y": 64 },
+ { "flags": 4, "matrix": [3, 6], "x": 122, "y": 64 },
+ { "flags": 4, "matrix": [3, 7], "x": 142, "y": 64 },
+ { "flags": 4, "matrix": [3, 8], "x": 162, "y": 64 },
+ { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64 },
+ { "flags": 4, "matrix": [3, 10], "x": 203, "y": 64 },
+ { "flags": 1, "matrix": [3, 11], "x": 224, "y": 64 },
+ { "flags": 1, "matrix": [4, 0], "x": 0, "y": 86 },
+ { "flags": 1, "matrix": [4, 1], "x": 20, "y": 86 },
+ { "flags": 1, "matrix": [4, 2], "x": 40, "y": 86 },
+ { "flags": 1, "matrix": [4, 3], "x": 61, "y": 86 },
+ { "flags": 1, "matrix": [4, 4], "x": 81, "y": 86 },
+ { "flags": 4, "matrix": [4, 5], "x": 111, "y": 86 },
+ { "flags": 1, "matrix": [4, 7], "x": 142, "y": 86 },
+ { "flags": 1, "matrix": [4, 8], "x": 162, "y": 86 },
+ { "flags": 1, "matrix": [4, 9], "x": 183, "y": 86 },
+ { "flags": 1, "matrix": [4, 10], "x": 203, "y": 86 },
+ { "flags": 1, "matrix": [4, 11], "x": 224, "y": 86 }
+ ]
+ },
+ "community_layouts": ["ortho_5x12"],
+ "layouts": {
+ "LAYOUT_ortho_5x12": {
+ "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 },
+ { "matrix": [4, 0], "x": 0, "y": 4 },
+ { "matrix": [4, 1], "x": 1, "y": 4 },
+ { "matrix": [4, 2], "x": 2, "y": 4 },
+ { "matrix": [4, 3], "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, 8], "x": 8, "y": 4 },
+ { "matrix": [4, 9], "x": 9, "y": 4 },
+ { "matrix": [4, 10], "x": 10, "y": 4 },
+ { "matrix": [4, 11], "x": 11, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/boardsource/equals/60/rules.mk b/keyboards/boardsource/equals/60/rules.mk
index 4192b0c2e54..2f75fc139fc 100644
--- a/keyboards/boardsource/equals/60/rules.mk
+++ b/keyboards/boardsource/equals/60/rules.mk
@@ -1,3 +1,2 @@
AUDIO_DRIVER = pwm_hardware
-QUANTUM_PAINTER_ENABLE = yes
QUANTUM_PAINTER_DRIVERS += st7735_spi
diff --git a/keyboards/boardsource/lulu/rp2040/info.json b/keyboards/boardsource/lulu/rp2040/keyboard.json
similarity index 100%
rename from keyboards/boardsource/lulu/rp2040/info.json
rename to keyboards/boardsource/lulu/rp2040/keyboard.json
diff --git a/keyboards/boardsource/unicorne/info.json b/keyboards/boardsource/unicorne/keyboard.json
similarity index 100%
rename from keyboards/boardsource/unicorne/info.json
rename to keyboards/boardsource/unicorne/keyboard.json
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
deleted file mode 100644
index 1b4e5a6d87e..00000000000
--- a/keyboards/boardwalk/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardwalk/keyboard.json b/keyboards/boardwalk/keyboard.json
index 8c4ad37eb09..6fb7673ec8a 100644
--- a/keyboards/boardwalk/keyboard.json
+++ b/keyboards/boardwalk/keyboard.json
@@ -39,6 +39,12 @@
"rgblight": true,
"unicode": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
"rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/bop/config.h b/keyboards/bop/config.h
index 7d7310ec0ec..e80e4994396 100644
--- a/keyboards/bop/config.h
+++ b/keyboards/bop/config.h
@@ -16,11 +16,5 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/* Unicode select mode */
#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/bop/keyboard.json b/keyboards/bop/keyboard.json
index 81bbbf33f08..6a88bb46177 100644
--- a/keyboards/bop/keyboard.json
+++ b/keyboards/bop/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D5", "C5", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "E7", "E6", "F0", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "C6"],
"rows": ["B7", "D0", "D1", "D2", "D3", "D4"]
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index 483c57940c3..aad033d221d 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -20,11 +20,6 @@
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define RGBLIGHT_LAYERS
//The 3D-printed version of Boston uses APA106 LEDs, which are reversed
diff --git a/keyboards/boston/keyboard.json b/keyboards/boston/keyboard.json
index 1960df6d45f..050076c7a69 100644
--- a/keyboards/boston/keyboard.json
+++ b/keyboards/boston/keyboard.json
@@ -30,7 +30,11 @@
]
},
"qmk": {
- "tap_keycode_delay": 15
+ "tap_keycode_delay": 15,
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
},
"backlight": {
"pin": "A6",
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
deleted file mode 100644
index 981d4de7c8d..00000000000
--- a/keyboards/boston_meetup/2019/info.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "usb": {
- "device_version": "20.1.9"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["A7", "A8", "B2", "B10"],
- "rows": ["A3", "B8", "B9", "B1"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B13", "pin_b": "B14"}
- ]
- },
- "rgblight": {
- "led_count": 10,
- "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": {
- "pin": "B5"
- },
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
- "debounce": 6
-}
diff --git a/keyboards/boston_meetup/2019/keyboard.json b/keyboards/boston_meetup/2019/keyboard.json
new file mode 100644
index 00000000000..97990bb5030
--- /dev/null
+++ b/keyboards/boston_meetup/2019/keyboard.json
@@ -0,0 +1,77 @@
+{
+ "keyboard_name": "Boston Meetup Board",
+ "manufacturer": "ishtob",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFB30",
+ "pid": "0x26BE",
+ "device_version": "20.1.9"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "audio": true,
+ "haptic": true,
+ "oled": true
+ },
+ "rgb_matrix": {
+ "driver": "ws2812"
+ },
+ "matrix_pins": {
+ "cols": ["A7", "A8", "B2", "B10"],
+ "rows": ["A3", "B8", "B9", "B1"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B13", "pin_b": "B14"}
+ ]
+ },
+ "rgblight": {
+ "led_count": 10,
+ "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": {
+ "pin": "B5"
+ },
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
+ "debounce": 6,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "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": [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": [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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index f5ef6ba5a26..dea510c2ab3 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -1,16 +1 @@
-# 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 = yes # Audio output
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = no
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = drv2605l
-OLED_ENABLE = yes
diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json
deleted file mode 100644
index 3156c643c96..00000000000
--- a/keyboards/boston_meetup/info.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "keyboard_name": "Boston Meetup Board",
- "manufacturer": "ishtob",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFB30",
- "pid": "0x26BE"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "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": [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": [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}
- ]
- }
- }
-}
diff --git a/keyboards/boston_meetup/rules.mk b/keyboards/boston_meetup/rules.mk
index 6dd899edc85..6d6745a0e57 100644
--- a/keyboards/boston_meetup/rules.mk
+++ b/keyboards/boston_meetup/rules.mk
@@ -1,2 +1 @@
-
DEFAULT_FOLDER = boston_meetup/2019
diff --git a/keyboards/box75/config.h b/keyboards/box75/config.h
deleted file mode 100644
index f608132b5af..00000000000
--- a/keyboards/box75/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/box75/keyboard.json b/keyboards/box75/keyboard.json
index 8932f81ae72..89afff17161 100644
--- a/keyboards/box75/keyboard.json
+++ b/keyboards/box75/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14", "B13", "A15"],
"rows": ["A10", "A9", "B12", "A2", "A1", "A0"]
diff --git a/keyboards/bpiphany/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/bpiphany/four_banger/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/bpiphany/four_banger/keyboard.json b/keyboards/bpiphany/four_banger/keyboard.json
index 24620506849..a368fbfe61b 100644
--- a/keyboards/bpiphany/four_banger/keyboard.json
+++ b/keyboards/bpiphany/four_banger/keyboard.json
@@ -37,6 +37,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B5", "B4"],
"rows": ["B2", "B6"]
diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
index 8a895c3e50b..37c868b47f3 100644
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@@ -38,11 +38,6 @@ along with this program. If not, see .
#define MATRIX_COL_PINS { B0, B3, B2, B1, B6, B4, B5, C7 }
#define MATRIX_ROW_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/frosty_flake/info.json b/keyboards/bpiphany/frosty_flake/info.json
index 95fbd477eb5..33a2f792d97 100644
--- a/keyboards/bpiphany/frosty_flake/info.json
+++ b/keyboards/bpiphany/frosty_flake/info.json
@@ -8,6 +8,12 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"dynamic_keymap": {
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
deleted file mode 100644
index 49b6e103092..00000000000
--- a/keyboards/bpiphany/ghost_squid/info.json
+++ /dev/null
@@ -1,278 +0,0 @@
-{
- "keyboard_name": "Ghost Squid",
- "manufacturer": "Bathroom Epiphanies",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x6050",
- "device_version": "1.0.4"
- },
- "indicators": {
- "caps_lock": "C6",
- "num_lock": "C5",
- "scroll_lock": "B7",
- "on_state": 0
- },
- "processor": "atmega32u2",
- "bootloader": "atmel-dfu",
- "community_layouts": [
- "fullsize_ansi",
- "fullsize_iso"
- ],
- "layouts": {
- "LAYOUT_fullsize_ansi": {
- "layout": [
- {"matrix": [6, 9], "x": 0, "y": 0},
-
- {"matrix": [4, 8], "x": 2, "y": 0},
- {"matrix": [4, 7], "x": 3, "y": 0},
- {"matrix": [2, 7], "x": 4, "y": 0},
- {"matrix": [6, 7], "x": 5, "y": 0},
-
- {"matrix": [7, 0], "x": 6.5, "y": 0},
- {"matrix": [6, 4], "x": 7.5, "y": 0},
- {"matrix": [2, 3], "x": 8.5, "y": 0},
- {"matrix": [4, 3], "x": 9.5, "y": 0},
-
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [7, 1], "x": 12, "y": 0},
- {"matrix": [6, 1], "x": 13, "y": 0},
- {"matrix": [0, 1], "x": 14, "y": 0},
-
- {"matrix": [7, 2], "x": 15.25, "y": 0},
- {"matrix": [5, 2], "x": 16.25, "y": 0},
- {"matrix": [5, 0], "x": 17.25, "y": 0},
-
- {"matrix": [4, 9], "x": 0, "y": 1.25},
- {"matrix": [7, 9], "x": 1, "y": 1.25},
- {"matrix": [7, 8], "x": 2, "y": 1.25},
- {"matrix": [7, 7], "x": 3, "y": 1.25},
- {"matrix": [7, 6], "x": 4, "y": 1.25},
- {"matrix": [4, 6], "x": 5, "y": 1.25},
- {"matrix": [4, 5], "x": 6, "y": 1.25},
- {"matrix": [7, 5], "x": 7, "y": 1.25},
- {"matrix": [7, 4], "x": 8, "y": 1.25},
- {"matrix": [7, 3], "x": 9, "y": 1.25},
- {"matrix": [7, 17], "x": 10, "y": 1.25},
- {"matrix": [4, 17], "x": 11, "y": 1.25},
- {"matrix": [4, 4], "x": 12, "y": 1.25},
- {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [4, 11], "x": 15.25, "y": 1.25},
- {"matrix": [4, 14], "x": 16.25, "y": 1.25},
- {"matrix": [4, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [1, 10], "x": 18.5, "y": 1.25},
- {"matrix": [1, 11], "x": 19.5, "y": 1.25},
- {"matrix": [1, 16], "x": 20.5, "y": 1.25},
- {"matrix": [0, 16], "x": 21.5, "y": 1.25},
-
- {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [5, 9], "x": 1.5, "y": 2.25},
- {"matrix": [5, 8], "x": 2.5, "y": 2.25},
- {"matrix": [5, 7], "x": 3.5, "y": 2.25},
- {"matrix": [5, 6], "x": 4.5, "y": 2.25},
- {"matrix": [2, 6], "x": 5.5, "y": 2.25},
- {"matrix": [2, 5], "x": 6.5, "y": 2.25},
- {"matrix": [5, 5], "x": 7.5, "y": 2.25},
- {"matrix": [5, 4], "x": 8.5, "y": 2.25},
- {"matrix": [5, 3], "x": 9.5, "y": 2.25},
- {"matrix": [5, 17], "x": 10.5, "y": 2.25},
- {"matrix": [2, 17], "x": 11.5, "y": 2.25},
- {"matrix": [2, 4], "x": 12.5, "y": 2.25},
- {"matrix": [3, 1], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [4, 10], "x": 15.25, "y": 2.25},
- {"matrix": [7, 14], "x": 16.25, "y": 2.25},
- {"matrix": [7, 16], "x": 17.25, "y": 2.25},
-
- {"matrix": [5, 10], "x": 18.5, "y": 2.25},
- {"matrix": [5, 11], "x": 19.5, "y": 2.25},
- {"matrix": [5, 16], "x": 20.5, "y": 2.25},
- {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
-
- {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 9], "x": 1.75, "y": 3.25},
- {"matrix": [3, 8], "x": 2.75, "y": 3.25},
- {"matrix": [3, 7], "x": 3.75, "y": 3.25},
- {"matrix": [3, 6], "x": 4.75, "y": 3.25},
- {"matrix": [6, 6], "x": 5.75, "y": 3.25},
- {"matrix": [6, 5], "x": 6.75, "y": 3.25},
- {"matrix": [3, 5], "x": 7.75, "y": 3.25},
- {"matrix": [3, 4], "x": 8.75, "y": 3.25},
- {"matrix": [3, 3], "x": 9.75, "y": 3.25},
- {"matrix": [3, 17], "x": 10.75, "y": 3.25},
- {"matrix": [6, 17], "x": 11.75, "y": 3.25},
- {"matrix": [1, 1], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [2, 10], "x": 18.5, "y": 3.25},
- {"matrix": [2, 11], "x": 19.5, "y": 3.25},
- {"matrix": [2, 16], "x": 20.5, "y": 3.25},
-
- {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [1, 9], "x": 2.25, "y": 4.25},
- {"matrix": [1, 8], "x": 3.25, "y": 4.25},
- {"matrix": [1, 7], "x": 4.25, "y": 4.25},
- {"matrix": [1, 6], "x": 5.25, "y": 4.25},
- {"matrix": [0, 6], "x": 6.25, "y": 4.25},
- {"matrix": [0, 5], "x": 7.25, "y": 4.25},
- {"matrix": [1, 5], "x": 8.25, "y": 4.25},
- {"matrix": [1, 4], "x": 9.25, "y": 4.25},
- {"matrix": [1, 3], "x": 10.25, "y": 4.25},
- {"matrix": [0, 17], "x": 11.25, "y": 4.25},
- {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [6, 14], "x": 16.25, "y": 4.25},
-
- {"matrix": [3, 10], "x": 18.5, "y": 4.25},
- {"matrix": [3, 11], "x": 19.5, "y": 4.25},
- {"matrix": [3, 16], "x": 20.5, "y": 4.25},
- {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
- {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
- {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
- {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
-
- {"matrix": [0, 14], "x": 15.25, "y": 5.25},
- {"matrix": [0, 10], "x": 16.25, "y": 5.25},
- {"matrix": [0, 11], "x": 17.25, "y": 5.25},
-
- {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
- {"matrix": [6, 16], "x": 20.5, "y": 5.25}
- ]
- },
- "LAYOUT_fullsize_iso": {
- "layout": [
- {"matrix": [6, 9], "x": 0, "y": 0},
-
- {"matrix": [4, 8], "x": 2, "y": 0},
- {"matrix": [4, 7], "x": 3, "y": 0},
- {"matrix": [2, 7], "x": 4, "y": 0},
- {"matrix": [6, 7], "x": 5, "y": 0},
-
- {"matrix": [7, 0], "x": 6.5, "y": 0},
- {"matrix": [6, 4], "x": 7.5, "y": 0},
- {"matrix": [2, 3], "x": 8.5, "y": 0},
- {"matrix": [4, 3], "x": 9.5, "y": 0},
-
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [7, 1], "x": 12, "y": 0},
- {"matrix": [6, 1], "x": 13, "y": 0},
- {"matrix": [0, 1], "x": 14, "y": 0},
-
- {"matrix": [7, 2], "x": 15.25, "y": 0},
- {"matrix": [5, 2], "x": 16.25, "y": 0},
- {"matrix": [5, 0], "x": 17.25, "y": 0},
-
- {"matrix": [4, 9], "x": 0, "y": 1.25},
- {"matrix": [7, 9], "x": 1, "y": 1.25},
- {"matrix": [7, 8], "x": 2, "y": 1.25},
- {"matrix": [7, 7], "x": 3, "y": 1.25},
- {"matrix": [7, 6], "x": 4, "y": 1.25},
- {"matrix": [4, 6], "x": 5, "y": 1.25},
- {"matrix": [4, 5], "x": 6, "y": 1.25},
- {"matrix": [7, 5], "x": 7, "y": 1.25},
- {"matrix": [7, 4], "x": 8, "y": 1.25},
- {"matrix": [7, 3], "x": 9, "y": 1.25},
- {"matrix": [7, 17], "x": 10, "y": 1.25},
- {"matrix": [4, 17], "x": 11, "y": 1.25},
- {"matrix": [4, 4], "x": 12, "y": 1.25},
- {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [4, 11], "x": 15.25, "y": 1.25},
- {"matrix": [4, 14], "x": 16.25, "y": 1.25},
- {"matrix": [4, 16], "x": 17.25, "y": 1.25},
-
- {"matrix": [1, 10], "x": 18.5, "y": 1.25},
- {"matrix": [1, 11], "x": 19.5, "y": 1.25},
- {"matrix": [1, 16], "x": 20.5, "y": 1.25},
- {"matrix": [0, 16], "x": 21.5, "y": 1.25},
-
- {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [5, 9], "x": 1.5, "y": 2.25},
- {"matrix": [5, 8], "x": 2.5, "y": 2.25},
- {"matrix": [5, 7], "x": 3.5, "y": 2.25},
- {"matrix": [5, 6], "x": 4.5, "y": 2.25},
- {"matrix": [2, 6], "x": 5.5, "y": 2.25},
- {"matrix": [2, 5], "x": 6.5, "y": 2.25},
- {"matrix": [5, 5], "x": 7.5, "y": 2.25},
- {"matrix": [5, 4], "x": 8.5, "y": 2.25},
- {"matrix": [5, 3], "x": 9.5, "y": 2.25},
- {"matrix": [5, 17], "x": 10.5, "y": 2.25},
- {"matrix": [2, 17], "x": 11.5, "y": 2.25},
- {"matrix": [2, 4], "x": 12.5, "y": 2.25},
-
- {"matrix": [4, 10], "x": 15.25, "y": 2.25},
- {"matrix": [7, 14], "x": 16.25, "y": 2.25},
- {"matrix": [7, 16], "x": 17.25, "y": 2.25},
-
- {"matrix": [5, 10], "x": 18.5, "y": 2.25},
- {"matrix": [5, 11], "x": 19.5, "y": 2.25},
- {"matrix": [5, 16], "x": 20.5, "y": 2.25},
- {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
-
- {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 9], "x": 1.75, "y": 3.25},
- {"matrix": [3, 8], "x": 2.75, "y": 3.25},
- {"matrix": [3, 7], "x": 3.75, "y": 3.25},
- {"matrix": [3, 6], "x": 4.75, "y": 3.25},
- {"matrix": [6, 6], "x": 5.75, "y": 3.25},
- {"matrix": [6, 5], "x": 6.75, "y": 3.25},
- {"matrix": [3, 5], "x": 7.75, "y": 3.25},
- {"matrix": [3, 4], "x": 8.75, "y": 3.25},
- {"matrix": [3, 3], "x": 9.75, "y": 3.25},
- {"matrix": [3, 17], "x": 10.75, "y": 3.25},
- {"matrix": [6, 17], "x": 11.75, "y": 3.25},
- {"matrix": [3, 1], "x": 12.75, "y": 3.25},
- {"matrix": [1, 1], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"matrix": [2, 10], "x": 18.5, "y": 3.25},
- {"matrix": [2, 11], "x": 19.5, "y": 3.25},
- {"matrix": [2, 16], "x": 20.5, "y": 3.25},
-
- {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [6, 8], "x": 1.25, "y": 4.25},
- {"matrix": [1, 9], "x": 2.25, "y": 4.25},
- {"matrix": [1, 8], "x": 3.25, "y": 4.25},
- {"matrix": [1, 7], "x": 4.25, "y": 4.25},
- {"matrix": [1, 6], "x": 5.25, "y": 4.25},
- {"matrix": [0, 6], "x": 6.25, "y": 4.25},
- {"matrix": [0, 5], "x": 7.25, "y": 4.25},
- {"matrix": [1, 5], "x": 8.25, "y": 4.25},
- {"matrix": [1, 4], "x": 9.25, "y": 4.25},
- {"matrix": [1, 3], "x": 10.25, "y": 4.25},
- {"matrix": [0, 17], "x": 11.25, "y": 4.25},
- {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [6, 14], "x": 16.25, "y": 4.25},
-
- {"matrix": [3, 10], "x": 18.5, "y": 4.25},
- {"matrix": [3, 11], "x": 19.5, "y": 4.25},
- {"matrix": [3, 16], "x": 20.5, "y": 4.25},
- {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
- {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
- {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
- {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
-
- {"matrix": [0, 14], "x": 15.25, "y": 5.25},
- {"matrix": [0, 10], "x": 16.25, "y": 5.25},
- {"matrix": [0, 11], "x": 17.25, "y": 5.25},
-
- {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
- {"matrix": [6, 16], "x": 20.5, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/bpiphany/ghost_squid/keyboard.json b/keyboards/bpiphany/ghost_squid/keyboard.json
new file mode 100644
index 00000000000..85f6f0fa8e8
--- /dev/null
+++ b/keyboards/bpiphany/ghost_squid/keyboard.json
@@ -0,0 +1,283 @@
+{
+ "keyboard_name": "Ghost Squid",
+ "manufacturer": "Bathroom Epiphanies",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6050",
+ "device_version": "1.0.4"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
+ "indicators": {
+ "caps_lock": "C6",
+ "num_lock": "C5",
+ "scroll_lock": "B7",
+ "on_state": 0
+ },
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu",
+ "community_layouts": [
+ "fullsize_ansi",
+ "fullsize_iso"
+ ],
+ "layouts": {
+ "LAYOUT_fullsize_ansi": {
+ "layout": [
+ {"matrix": [6, 9], "x": 0, "y": 0},
+
+ {"matrix": [4, 8], "x": 2, "y": 0},
+ {"matrix": [4, 7], "x": 3, "y": 0},
+ {"matrix": [2, 7], "x": 4, "y": 0},
+ {"matrix": [6, 7], "x": 5, "y": 0},
+
+ {"matrix": [7, 0], "x": 6.5, "y": 0},
+ {"matrix": [6, 4], "x": 7.5, "y": 0},
+ {"matrix": [2, 3], "x": 8.5, "y": 0},
+ {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [6, 1], "x": 13, "y": 0},
+ {"matrix": [0, 1], "x": 14, "y": 0},
+
+ {"matrix": [7, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 2], "x": 16.25, "y": 0},
+ {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 9], "x": 0, "y": 1.25},
+ {"matrix": [7, 9], "x": 1, "y": 1.25},
+ {"matrix": [7, 8], "x": 2, "y": 1.25},
+ {"matrix": [7, 7], "x": 3, "y": 1.25},
+ {"matrix": [7, 6], "x": 4, "y": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 1.25},
+ {"matrix": [7, 5], "x": 7, "y": 1.25},
+ {"matrix": [7, 4], "x": 8, "y": 1.25},
+ {"matrix": [7, 3], "x": 9, "y": 1.25},
+ {"matrix": [7, 17], "x": 10, "y": 1.25},
+ {"matrix": [4, 17], "x": 11, "y": 1.25},
+ {"matrix": [4, 4], "x": 12, "y": 1.25},
+ {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [4, 11], "x": 15.25, "y": 1.25},
+ {"matrix": [4, 14], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [1, 10], "x": 18.5, "y": 1.25},
+ {"matrix": [1, 11], "x": 19.5, "y": 1.25},
+ {"matrix": [1, 16], "x": 20.5, "y": 1.25},
+ {"matrix": [0, 16], "x": 21.5, "y": 1.25},
+
+ {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 9], "x": 1.5, "y": 2.25},
+ {"matrix": [5, 8], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 7], "x": 3.5, "y": 2.25},
+ {"matrix": [5, 6], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 7.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+ {"matrix": [5, 17], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 17], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 12.5, "y": 2.25},
+ {"matrix": [3, 1], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [4, 10], "x": 15.25, "y": 2.25},
+ {"matrix": [7, 14], "x": 16.25, "y": 2.25},
+ {"matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [5, 10], "x": 18.5, "y": 2.25},
+ {"matrix": [5, 11], "x": 19.5, "y": 2.25},
+ {"matrix": [5, 16], "x": 20.5, "y": 2.25},
+ {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
+
+ {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 9], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 4.75, "y": 3.25},
+ {"matrix": [6, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 17], "x": 10.75, "y": 3.25},
+ {"matrix": [6, 17], "x": 11.75, "y": 3.25},
+ {"matrix": [1, 1], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [2, 10], "x": 18.5, "y": 3.25},
+ {"matrix": [2, 11], "x": 19.5, "y": 3.25},
+ {"matrix": [2, 16], "x": 20.5, "y": 3.25},
+
+ {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [1, 9], "x": 2.25, "y": 4.25},
+ {"matrix": [1, 8], "x": 3.25, "y": 4.25},
+ {"matrix": [1, 7], "x": 4.25, "y": 4.25},
+ {"matrix": [1, 6], "x": 5.25, "y": 4.25},
+ {"matrix": [0, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [0, 5], "x": 7.25, "y": 4.25},
+ {"matrix": [1, 5], "x": 8.25, "y": 4.25},
+ {"matrix": [1, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [1, 3], "x": 10.25, "y": 4.25},
+ {"matrix": [0, 17], "x": 11.25, "y": 4.25},
+ {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [6, 14], "x": 16.25, "y": 4.25},
+
+ {"matrix": [3, 10], "x": 18.5, "y": 4.25},
+ {"matrix": [3, 11], "x": 19.5, "y": 4.25},
+ {"matrix": [3, 16], "x": 20.5, "y": 4.25},
+ {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [0, 10], "x": 16.25, "y": 5.25},
+ {"matrix": [0, 11], "x": 17.25, "y": 5.25},
+
+ {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
+ {"matrix": [6, 16], "x": 20.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_fullsize_iso": {
+ "layout": [
+ {"matrix": [6, 9], "x": 0, "y": 0},
+
+ {"matrix": [4, 8], "x": 2, "y": 0},
+ {"matrix": [4, 7], "x": 3, "y": 0},
+ {"matrix": [2, 7], "x": 4, "y": 0},
+ {"matrix": [6, 7], "x": 5, "y": 0},
+
+ {"matrix": [7, 0], "x": 6.5, "y": 0},
+ {"matrix": [6, 4], "x": 7.5, "y": 0},
+ {"matrix": [2, 3], "x": 8.5, "y": 0},
+ {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [6, 1], "x": 13, "y": 0},
+ {"matrix": [0, 1], "x": 14, "y": 0},
+
+ {"matrix": [7, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 2], "x": 16.25, "y": 0},
+ {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 9], "x": 0, "y": 1.25},
+ {"matrix": [7, 9], "x": 1, "y": 1.25},
+ {"matrix": [7, 8], "x": 2, "y": 1.25},
+ {"matrix": [7, 7], "x": 3, "y": 1.25},
+ {"matrix": [7, 6], "x": 4, "y": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 1.25},
+ {"matrix": [7, 5], "x": 7, "y": 1.25},
+ {"matrix": [7, 4], "x": 8, "y": 1.25},
+ {"matrix": [7, 3], "x": 9, "y": 1.25},
+ {"matrix": [7, 17], "x": 10, "y": 1.25},
+ {"matrix": [4, 17], "x": 11, "y": 1.25},
+ {"matrix": [4, 4], "x": 12, "y": 1.25},
+ {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [4, 11], "x": 15.25, "y": 1.25},
+ {"matrix": [4, 14], "x": 16.25, "y": 1.25},
+ {"matrix": [4, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [1, 10], "x": 18.5, "y": 1.25},
+ {"matrix": [1, 11], "x": 19.5, "y": 1.25},
+ {"matrix": [1, 16], "x": 20.5, "y": 1.25},
+ {"matrix": [0, 16], "x": 21.5, "y": 1.25},
+
+ {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 9], "x": 1.5, "y": 2.25},
+ {"matrix": [5, 8], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 7], "x": 3.5, "y": 2.25},
+ {"matrix": [5, 6], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 7.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+ {"matrix": [5, 17], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 17], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 12.5, "y": 2.25},
+
+ {"matrix": [4, 10], "x": 15.25, "y": 2.25},
+ {"matrix": [7, 14], "x": 16.25, "y": 2.25},
+ {"matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [5, 10], "x": 18.5, "y": 2.25},
+ {"matrix": [5, 11], "x": 19.5, "y": 2.25},
+ {"matrix": [5, 16], "x": 20.5, "y": 2.25},
+ {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
+
+ {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 9], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 4.75, "y": 3.25},
+ {"matrix": [6, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 17], "x": 10.75, "y": 3.25},
+ {"matrix": [6, 17], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 1], "x": 12.75, "y": 3.25},
+ {"matrix": [1, 1], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 10], "x": 18.5, "y": 3.25},
+ {"matrix": [2, 11], "x": 19.5, "y": 3.25},
+ {"matrix": [2, 16], "x": 20.5, "y": 3.25},
+
+ {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [6, 8], "x": 1.25, "y": 4.25},
+ {"matrix": [1, 9], "x": 2.25, "y": 4.25},
+ {"matrix": [1, 8], "x": 3.25, "y": 4.25},
+ {"matrix": [1, 7], "x": 4.25, "y": 4.25},
+ {"matrix": [1, 6], "x": 5.25, "y": 4.25},
+ {"matrix": [0, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [0, 5], "x": 7.25, "y": 4.25},
+ {"matrix": [1, 5], "x": 8.25, "y": 4.25},
+ {"matrix": [1, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [1, 3], "x": 10.25, "y": 4.25},
+ {"matrix": [0, 17], "x": 11.25, "y": 4.25},
+ {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [6, 14], "x": 16.25, "y": 4.25},
+
+ {"matrix": [3, 10], "x": 18.5, "y": 4.25},
+ {"matrix": [3, 11], "x": 19.5, "y": 4.25},
+ {"matrix": [3, 16], "x": 20.5, "y": 4.25},
+ {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [0, 10], "x": 16.25, "y": 5.25},
+ {"matrix": [0, 11], "x": 17.25, "y": 5.25},
+
+ {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
+ {"matrix": [6, 16], "x": 20.5, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bpiphany/ghost_squid/rules.mk b/keyboards/bpiphany/ghost_squid/rules.mk
index 2f6a5a7346e..30ce5d293b7 100644
--- a/keyboards/bpiphany/ghost_squid/rules.mk
+++ b/keyboards/bpiphany/ghost_squid/rules.mk
@@ -1,14 +1,2 @@
-# 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
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
index 2e41e1f7005..8ba4e7c73b5 100755
--- a/keyboards/bpiphany/hid_liber/config.h
+++ b/keyboards/bpiphany/hid_liber/config.h
@@ -24,11 +24,6 @@
// HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3.
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json
deleted file mode 100644
index 82fd77781a0..00000000000
--- a/keyboards/bpiphany/hid_liber/info.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
- "keyboard_name": "HIDLiberation",
- "manufacturer": "bpiphany",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0xB919",
- "device_version": "0.0.1"
- },
- "indicators": {
- "caps_lock": "B5",
- "scroll_lock": "B6",
- "on_state": 0
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [6, 1], "x": 0, "y": 0},
-
- {"matrix": [7, 7], "x": 2, "y": 0},
- {"matrix": [9, 7], "x": 3, "y": 0},
- {"matrix": [9, 6], "x": 4, "y": 0},
- {"matrix": [9, 1], "x": 5, "y": 0},
-
- {"matrix": [14, 5], "x": 6.5, "y": 0},
- {"matrix": [11, 1], "x": 7.5, "y": 0},
- {"matrix": [0, 6], "x": 8.5, "y": 0},
- {"matrix": [0, 7], "x": 9.5, "y": 0},
-
- {"matrix": [3, 7], "x": 11, "y": 0},
- {"matrix": [3, 5], "x": 12, "y": 0},
- {"matrix": [3, 1], "x": 13, "y": 0},
- {"matrix": [3, 2], "x": 14, "y": 0},
-
- {"matrix": [1, 5], "x": 15.25, "y": 0},
- {"matrix": [1, 3], "x": 16.25, "y": 0},
- {"matrix": [14, 3], "x": 17.25, "y": 0},
-
- {"matrix": [6, 7], "x": 0, "y": 1.5},
- {"matrix": [6, 5], "x": 1, "y": 1.5},
- {"matrix": [7, 5], "x": 2, "y": 1.5},
- {"matrix": [9, 5], "x": 3, "y": 1.5},
- {"matrix": [8, 5], "x": 4, "y": 1.5},
- {"matrix": [8, 7], "x": 5, "y": 1.5},
- {"matrix": [10, 7], "x": 6, "y": 1.5},
- {"matrix": [10, 5], "x": 7, "y": 1.5},
- {"matrix": [11, 5], "x": 8, "y": 1.5},
- {"matrix": [0, 5], "x": 9, "y": 1.5},
- {"matrix": [2, 5], "x": 10, "y": 1.5},
- {"matrix": [2, 7], "x": 11, "y": 1.5},
- {"matrix": [11, 7], "x": 12, "y": 1.5},
- {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [16, 7], "x": 15.25, "y": 1.5},
- {"matrix": [13, 7], "x": 16.25, "y": 1.5},
- {"matrix": [12, 7], "x": 17.25, "y": 1.5},
-
- {"matrix": [6, 6], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [6, 3], "x": 1.5, "y": 2.5},
- {"matrix": [7, 3], "x": 2.5, "y": 2.5},
- {"matrix": [9, 3], "x": 3.5, "y": 2.5},
- {"matrix": [8, 3], "x": 4.5, "y": 2.5},
- {"matrix": [8, 6], "x": 5.5, "y": 2.5},
- {"matrix": [10, 6], "x": 6.5, "y": 2.5},
- {"matrix": [10, 3], "x": 7.5, "y": 2.5},
- {"matrix": [11, 3], "x": 8.5, "y": 2.5},
- {"matrix": [0, 3], "x": 9.5, "y": 2.5},
- {"matrix": [2, 3], "x": 10.5, "y": 2.5},
- {"matrix": [2, 6], "x": 11.5, "y": 2.5},
- {"matrix": [11, 6], "x": 12.5, "y": 2.5},
- {"matrix": [3, 4], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [15, 7], "x": 15.25, "y": 2.5},
- {"matrix": [13, 5], "x": 16.25, "y": 2.5},
- {"matrix": [12, 5], "x": 17.25, "y": 2.5},
-
- {"matrix": [7, 6], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [6, 4], "x": 1.75, "y": 3.5},
- {"matrix": [7, 4], "x": 2.75, "y": 3.5},
- {"matrix": [9, 4], "x": 3.75, "y": 3.5},
- {"matrix": [8, 4], "x": 4.75, "y": 3.5},
- {"matrix": [8, 1], "x": 5.75, "y": 3.5},
- {"matrix": [10, 1], "x": 6.75, "y": 3.5},
- {"matrix": [10, 4], "x": 7.75, "y": 3.5},
- {"matrix": [11, 4], "x": 8.75, "y": 3.5},
- {"matrix": [0, 4], "x": 9.75, "y": 3.5},
- {"matrix": [2, 4], "x": 10.75, "y": 3.5},
- {"matrix": [2, 1], "x": 11.75, "y": 3.5},
- {"matrix": [3, 0], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [5, 6], "x": 0, "y": 4.5, "w": 1.25},
- {"matrix": [7, 1], "x": 1.25, "y": 4.5},
- {"matrix": [6, 0], "x": 2.25, "y": 4.5},
- {"matrix": [7, 0], "x": 3.25, "y": 4.5},
- {"matrix": [9, 0], "x": 4.25, "y": 4.5},
- {"matrix": [8, 0], "x": 5.25, "y": 4.5},
- {"matrix": [8, 2], "x": 6.25, "y": 4.5},
- {"matrix": [10, 2], "x": 7.25, "y": 4.5},
- {"matrix": [10, 0], "x": 8.25, "y": 4.5},
- {"matrix": [11, 0], "x": 9.25, "y": 4.5},
- {"matrix": [0, 0], "x": 10.25, "y": 4.5},
- {"matrix": [2, 2], "x": 11.25, "y": 4.5},
- {"matrix": [5, 4], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [13, 1], "x": 16.25, "y": 4.5},
-
- {"matrix": [14, 7], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [4, 6], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [1, 1], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [15, 1], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [1, 2], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [17, 4], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 2], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [14, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [13, 2], "x": 15.25, "y": 5.5},
- {"matrix": [15, 2], "x": 16.25, "y": 5.5},
- {"matrix": [16, 2], "x": 17.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/bpiphany/hid_liber/keyboard.json b/keyboards/bpiphany/hid_liber/keyboard.json
new file mode 100644
index 00000000000..67c8416849f
--- /dev/null
+++ b/keyboards/bpiphany/hid_liber/keyboard.json
@@ -0,0 +1,139 @@
+{
+ "keyboard_name": "HIDLiberation",
+ "manufacturer": "bpiphany",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xB919",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "indicators": {
+ "caps_lock": "B5",
+ "scroll_lock": "B6",
+ "on_state": 0
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [6, 1], "x": 0, "y": 0},
+
+ {"matrix": [7, 7], "x": 2, "y": 0},
+ {"matrix": [9, 7], "x": 3, "y": 0},
+ {"matrix": [9, 6], "x": 4, "y": 0},
+ {"matrix": [9, 1], "x": 5, "y": 0},
+
+ {"matrix": [14, 5], "x": 6.5, "y": 0},
+ {"matrix": [11, 1], "x": 7.5, "y": 0},
+ {"matrix": [0, 6], "x": 8.5, "y": 0},
+ {"matrix": [0, 7], "x": 9.5, "y": 0},
+
+ {"matrix": [3, 7], "x": 11, "y": 0},
+ {"matrix": [3, 5], "x": 12, "y": 0},
+ {"matrix": [3, 1], "x": 13, "y": 0},
+ {"matrix": [3, 2], "x": 14, "y": 0},
+
+ {"matrix": [1, 5], "x": 15.25, "y": 0},
+ {"matrix": [1, 3], "x": 16.25, "y": 0},
+ {"matrix": [14, 3], "x": 17.25, "y": 0},
+
+ {"matrix": [6, 7], "x": 0, "y": 1.5},
+ {"matrix": [6, 5], "x": 1, "y": 1.5},
+ {"matrix": [7, 5], "x": 2, "y": 1.5},
+ {"matrix": [9, 5], "x": 3, "y": 1.5},
+ {"matrix": [8, 5], "x": 4, "y": 1.5},
+ {"matrix": [8, 7], "x": 5, "y": 1.5},
+ {"matrix": [10, 7], "x": 6, "y": 1.5},
+ {"matrix": [10, 5], "x": 7, "y": 1.5},
+ {"matrix": [11, 5], "x": 8, "y": 1.5},
+ {"matrix": [0, 5], "x": 9, "y": 1.5},
+ {"matrix": [2, 5], "x": 10, "y": 1.5},
+ {"matrix": [2, 7], "x": 11, "y": 1.5},
+ {"matrix": [11, 7], "x": 12, "y": 1.5},
+ {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [16, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [13, 7], "x": 16.25, "y": 1.5},
+ {"matrix": [12, 7], "x": 17.25, "y": 1.5},
+
+ {"matrix": [6, 6], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [6, 3], "x": 1.5, "y": 2.5},
+ {"matrix": [7, 3], "x": 2.5, "y": 2.5},
+ {"matrix": [9, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [8, 3], "x": 4.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 5.5, "y": 2.5},
+ {"matrix": [10, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [10, 3], "x": 7.5, "y": 2.5},
+ {"matrix": [11, 3], "x": 8.5, "y": 2.5},
+ {"matrix": [0, 3], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 11.5, "y": 2.5},
+ {"matrix": [11, 6], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [15, 7], "x": 15.25, "y": 2.5},
+ {"matrix": [13, 5], "x": 16.25, "y": 2.5},
+ {"matrix": [12, 5], "x": 17.25, "y": 2.5},
+
+ {"matrix": [7, 6], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [6, 4], "x": 1.75, "y": 3.5},
+ {"matrix": [7, 4], "x": 2.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 3.75, "y": 3.5},
+ {"matrix": [8, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [8, 1], "x": 5.75, "y": 3.5},
+ {"matrix": [10, 1], "x": 6.75, "y": 3.5},
+ {"matrix": [10, 4], "x": 7.75, "y": 3.5},
+ {"matrix": [11, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [0, 4], "x": 9.75, "y": 3.5},
+ {"matrix": [2, 4], "x": 10.75, "y": 3.5},
+ {"matrix": [2, 1], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 0], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [5, 6], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [7, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [6, 0], "x": 2.25, "y": 4.5},
+ {"matrix": [7, 0], "x": 3.25, "y": 4.5},
+ {"matrix": [9, 0], "x": 4.25, "y": 4.5},
+ {"matrix": [8, 0], "x": 5.25, "y": 4.5},
+ {"matrix": [8, 2], "x": 6.25, "y": 4.5},
+ {"matrix": [10, 2], "x": 7.25, "y": 4.5},
+ {"matrix": [10, 0], "x": 8.25, "y": 4.5},
+ {"matrix": [11, 0], "x": 9.25, "y": 4.5},
+ {"matrix": [0, 0], "x": 10.25, "y": 4.5},
+ {"matrix": [2, 2], "x": 11.25, "y": 4.5},
+ {"matrix": [5, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [13, 1], "x": 16.25, "y": 4.5},
+
+ {"matrix": [14, 7], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [4, 6], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [15, 1], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [1, 2], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [17, 4], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 2], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [14, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [13, 2], "x": 15.25, "y": 5.5},
+ {"matrix": [15, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [16, 2], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bpiphany/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk
index fc98be5c123..3215e3588a3 100755
--- a/keyboards/bpiphany/hid_liber/rules.mk
+++ b/keyboards/bpiphany/hid_liber/rules.mk
@@ -1,16 +1,2 @@
-# 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
-CUSTOM_MATRIX = yes # Custom matrix file
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-AUDIO_ENABLE = no # Audio output
-
-# Project specific files
+CUSTOM_MATRIX = yes
SRC = matrix.c
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index 0d23223dc93..3b934626f3a 100644
--- a/keyboards/bpiphany/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
@@ -22,11 +22,6 @@ along with this program. If not, see .
#define MATRIX_ROWS 8
#define MATRIX_COLS 18
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json
deleted file mode 100644
index 64a38a6e566..00000000000
--- a/keyboards/bpiphany/kitten_paw/info.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
- "keyboard_name": "Kitten Paw",
- "manufacturer": "bpiphany",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x6050",
- "device_version": "1.0.4"
- },
- "indicators": {
- "caps_lock": "C6",
- "num_lock": "B7",
- "scroll_lock": "C5",
- "on_state": 0
- },
- "processor": "atmega32u2",
- "bootloader": "atmel-dfu",
- "community_layouts": ["fullsize_ansi"],
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [6, 9], "x": 0, "y": 0},
-
- {"matrix": [4, 8], "x": 2, "y": 0},
- {"matrix": [4, 7], "x": 3, "y": 0},
- {"matrix": [2, 7], "x": 4, "y": 0},
- {"matrix": [6, 7], "x": 5, "y": 0},
-
- {"matrix": [7, 0], "x": 6.5, "y": 0},
- {"matrix": [6, 4], "x": 7.5, "y": 0},
- {"matrix": [2, 3], "x": 8.5, "y": 0},
- {"matrix": [4, 3], "x": 9.5, "y": 0},
-
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [7, 1], "x": 12, "y": 0},
- {"matrix": [6, 1], "x": 13, "y": 0},
- {"matrix": [0, 1], "x": 14, "y": 0},
-
- {"matrix": [7, 2], "x": 15.25, "y": 0},
- {"matrix": [5, 2], "x": 16.25, "y": 0},
- {"matrix": [5, 0], "x": 17.25, "y": 0},
-
- {"matrix": [4, 9], "x": 0, "y": 1.5},
- {"matrix": [7, 9], "x": 1, "y": 1.5},
- {"matrix": [7, 8], "x": 2, "y": 1.5},
- {"matrix": [7, 7], "x": 3, "y": 1.5},
- {"matrix": [7, 6], "x": 4, "y": 1.5},
- {"matrix": [4, 6], "x": 5, "y": 1.5},
- {"matrix": [4, 5], "x": 6, "y": 1.5},
- {"matrix": [7, 5], "x": 7, "y": 1.5},
- {"matrix": [7, 4], "x": 8, "y": 1.5},
- {"matrix": [7, 3], "x": 9, "y": 1.5},
- {"matrix": [7, 17], "x": 10, "y": 1.5},
- {"matrix": [4, 17], "x": 11, "y": 1.5},
- {"matrix": [4, 4], "x": 12, "y": 1.5},
- {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [4, 11], "x": 15.25, "y": 1.5},
- {"matrix": [4, 14], "x": 16.25, "y": 1.5},
- {"matrix": [4, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [1, 10], "x": 18.5, "y": 1.5},
- {"matrix": [1, 11], "x": 19.5, "y": 1.5},
- {"matrix": [1, 16], "x": 20.5, "y": 1.5},
- {"matrix": [0, 16], "x": 21.5, "y": 1.5},
-
- {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [5, 9], "x": 1.5, "y": 2.5},
- {"matrix": [5, 8], "x": 2.5, "y": 2.5},
- {"matrix": [5, 7], "x": 3.5, "y": 2.5},
- {"matrix": [5, 6], "x": 4.5, "y": 2.5},
- {"matrix": [2, 6], "x": 5.5, "y": 2.5},
- {"matrix": [2, 5], "x": 6.5, "y": 2.5},
- {"matrix": [5, 5], "x": 7.5, "y": 2.5},
- {"matrix": [5, 4], "x": 8.5, "y": 2.5},
- {"matrix": [5, 3], "x": 9.5, "y": 2.5},
- {"matrix": [5, 17], "x": 10.5, "y": 2.5},
- {"matrix": [2, 17], "x": 11.5, "y": 2.5},
- {"matrix": [2, 4], "x": 12.5, "y": 2.5},
- {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [4, 10], "x": 15.25, "y": 2.5},
- {"matrix": [7, 14], "x": 16.25, "y": 2.5},
- {"matrix": [7, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [5, 10], "x": 18.5, "y": 2.5},
- {"matrix": [5, 11], "x": 19.5, "y": 2.5},
- {"matrix": [5, 16], "x": 20.5, "y": 2.5},
- {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
-
- {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 9], "x": 1.75, "y": 3.5},
- {"matrix": [3, 8], "x": 2.75, "y": 3.5},
- {"matrix": [3, 7], "x": 3.75, "y": 3.5},
- {"matrix": [3, 6], "x": 4.75, "y": 3.5},
- {"matrix": [6, 6], "x": 5.75, "y": 3.5},
- {"matrix": [6, 5], "x": 6.75, "y": 3.5},
- {"matrix": [3, 5], "x": 7.75, "y": 3.5},
- {"matrix": [3, 4], "x": 8.75, "y": 3.5},
- {"matrix": [3, 3], "x": 9.75, "y": 3.5},
- {"matrix": [3, 17], "x": 10.75, "y": 3.5},
- {"matrix": [6, 17], "x": 11.75, "y": 3.5},
- {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [2, 10], "x": 18.5, "y": 3.5},
- {"matrix": [2, 11], "x": 19.5, "y": 3.5},
- {"matrix": [2, 16], "x": 20.5, "y": 3.5},
-
- {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
- {"matrix": [6, 8], "x": 1.25, "y": 4.5},
- {"matrix": [1, 9], "x": 2.25, "y": 4.5},
- {"matrix": [1, 8], "x": 3.25, "y": 4.5},
- {"matrix": [1, 7], "x": 4.25, "y": 4.5},
- {"matrix": [1, 6], "x": 5.25, "y": 4.5},
- {"matrix": [0, 6], "x": 6.25, "y": 4.5},
- {"matrix": [0, 5], "x": 7.25, "y": 4.5},
- {"matrix": [1, 5], "x": 8.25, "y": 4.5},
- {"matrix": [1, 4], "x": 9.25, "y": 4.5},
- {"matrix": [1, 3], "x": 10.25, "y": 4.5},
- {"matrix": [0, 17], "x": 11.25, "y": 4.5},
- {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [6, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [3, 10], "x": 18.5, "y": 4.5},
- {"matrix": [3, 11], "x": 19.5, "y": 4.5},
- {"matrix": [3, 16], "x": 20.5, "y": 4.5},
- {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [0, 14], "x": 15.25, "y": 5.5},
- {"matrix": [0, 10], "x": 16.25, "y": 5.5},
- {"matrix": [0, 11], "x": 17.25, "y": 5.5},
-
- {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
- {"matrix": [6, 16], "x": 20.5, "y": 5.5}
- ]
- },
- "LAYOUT_fullsize_ansi": {
- "layout": [
- {"matrix": [6, 9], "x": 0, "y": 0},
-
- {"matrix": [4, 8], "x": 2, "y": 0},
- {"matrix": [4, 7], "x": 3, "y": 0},
- {"matrix": [2, 7], "x": 4, "y": 0},
- {"matrix": [6, 7], "x": 5, "y": 0},
-
- {"matrix": [7, 0], "x": 6.5, "y": 0},
- {"matrix": [6, 4], "x": 7.5, "y": 0},
- {"matrix": [2, 3], "x": 8.5, "y": 0},
- {"matrix": [4, 3], "x": 9.5, "y": 0},
-
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [7, 1], "x": 12, "y": 0},
- {"matrix": [6, 1], "x": 13, "y": 0},
- {"matrix": [0, 1], "x": 14, "y": 0},
-
- {"matrix": [7, 2], "x": 15.25, "y": 0},
- {"matrix": [5, 2], "x": 16.25, "y": 0},
- {"matrix": [5, 0], "x": 17.25, "y": 0},
-
- {"matrix": [4, 9], "x": 0, "y": 1.5},
- {"matrix": [7, 9], "x": 1, "y": 1.5},
- {"matrix": [7, 8], "x": 2, "y": 1.5},
- {"matrix": [7, 7], "x": 3, "y": 1.5},
- {"matrix": [7, 6], "x": 4, "y": 1.5},
- {"matrix": [4, 6], "x": 5, "y": 1.5},
- {"matrix": [4, 5], "x": 6, "y": 1.5},
- {"matrix": [7, 5], "x": 7, "y": 1.5},
- {"matrix": [7, 4], "x": 8, "y": 1.5},
- {"matrix": [7, 3], "x": 9, "y": 1.5},
- {"matrix": [7, 17], "x": 10, "y": 1.5},
- {"matrix": [4, 17], "x": 11, "y": 1.5},
- {"matrix": [4, 4], "x": 12, "y": 1.5},
- {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [4, 11], "x": 15.25, "y": 1.5},
- {"matrix": [4, 14], "x": 16.25, "y": 1.5},
- {"matrix": [4, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [1, 10], "x": 18.5, "y": 1.5},
- {"matrix": [1, 11], "x": 19.5, "y": 1.5},
- {"matrix": [1, 16], "x": 20.5, "y": 1.5},
- {"matrix": [0, 16], "x": 21.5, "y": 1.5},
-
- {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [5, 9], "x": 1.5, "y": 2.5},
- {"matrix": [5, 8], "x": 2.5, "y": 2.5},
- {"matrix": [5, 7], "x": 3.5, "y": 2.5},
- {"matrix": [5, 6], "x": 4.5, "y": 2.5},
- {"matrix": [2, 6], "x": 5.5, "y": 2.5},
- {"matrix": [2, 5], "x": 6.5, "y": 2.5},
- {"matrix": [5, 5], "x": 7.5, "y": 2.5},
- {"matrix": [5, 4], "x": 8.5, "y": 2.5},
- {"matrix": [5, 3], "x": 9.5, "y": 2.5},
- {"matrix": [5, 17], "x": 10.5, "y": 2.5},
- {"matrix": [2, 17], "x": 11.5, "y": 2.5},
- {"matrix": [2, 4], "x": 12.5, "y": 2.5},
- {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [4, 10], "x": 15.25, "y": 2.5},
- {"matrix": [7, 14], "x": 16.25, "y": 2.5},
- {"matrix": [7, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [5, 10], "x": 18.5, "y": 2.5},
- {"matrix": [5, 11], "x": 19.5, "y": 2.5},
- {"matrix": [5, 16], "x": 20.5, "y": 2.5},
- {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
-
- {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 9], "x": 1.75, "y": 3.5},
- {"matrix": [3, 8], "x": 2.75, "y": 3.5},
- {"matrix": [3, 7], "x": 3.75, "y": 3.5},
- {"matrix": [3, 6], "x": 4.75, "y": 3.5},
- {"matrix": [6, 6], "x": 5.75, "y": 3.5},
- {"matrix": [6, 5], "x": 6.75, "y": 3.5},
- {"matrix": [3, 5], "x": 7.75, "y": 3.5},
- {"matrix": [3, 4], "x": 8.75, "y": 3.5},
- {"matrix": [3, 3], "x": 9.75, "y": 3.5},
- {"matrix": [3, 17], "x": 10.75, "y": 3.5},
- {"matrix": [6, 17], "x": 11.75, "y": 3.5},
- {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [2, 10], "x": 18.5, "y": 3.5},
- {"matrix": [2, 11], "x": 19.5, "y": 3.5},
- {"matrix": [2, 16], "x": 20.5, "y": 3.5},
-
- {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [1, 9], "x": 2.25, "y": 4.5},
- {"matrix": [1, 8], "x": 3.25, "y": 4.5},
- {"matrix": [1, 7], "x": 4.25, "y": 4.5},
- {"matrix": [1, 6], "x": 5.25, "y": 4.5},
- {"matrix": [0, 6], "x": 6.25, "y": 4.5},
- {"matrix": [0, 5], "x": 7.25, "y": 4.5},
- {"matrix": [1, 5], "x": 8.25, "y": 4.5},
- {"matrix": [1, 4], "x": 9.25, "y": 4.5},
- {"matrix": [1, 3], "x": 10.25, "y": 4.5},
- {"matrix": [0, 17], "x": 11.25, "y": 4.5},
- {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [6, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [3, 10], "x": 18.5, "y": 4.5},
- {"matrix": [3, 11], "x": 19.5, "y": 4.5},
- {"matrix": [3, 16], "x": 20.5, "y": 4.5},
- {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [0, 14], "x": 15.25, "y": 5.5},
- {"matrix": [0, 10], "x": 16.25, "y": 5.5},
- {"matrix": [0, 11], "x": 17.25, "y": 5.5},
-
- {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
- {"matrix": [6, 16], "x": 20.5, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/bpiphany/kitten_paw/keyboard.json b/keyboards/bpiphany/kitten_paw/keyboard.json
new file mode 100644
index 00000000000..829129d4063
--- /dev/null
+++ b/keyboards/bpiphany/kitten_paw/keyboard.json
@@ -0,0 +1,288 @@
+{
+ "keyboard_name": "Kitten Paw",
+ "manufacturer": "bpiphany",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6050",
+ "device_version": "1.0.4"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "indicators": {
+ "caps_lock": "C6",
+ "num_lock": "B7",
+ "scroll_lock": "C5",
+ "on_state": 0
+ },
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["fullsize_ansi"],
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [6, 9], "x": 0, "y": 0},
+
+ {"matrix": [4, 8], "x": 2, "y": 0},
+ {"matrix": [4, 7], "x": 3, "y": 0},
+ {"matrix": [2, 7], "x": 4, "y": 0},
+ {"matrix": [6, 7], "x": 5, "y": 0},
+
+ {"matrix": [7, 0], "x": 6.5, "y": 0},
+ {"matrix": [6, 4], "x": 7.5, "y": 0},
+ {"matrix": [2, 3], "x": 8.5, "y": 0},
+ {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [6, 1], "x": 13, "y": 0},
+ {"matrix": [0, 1], "x": 14, "y": 0},
+
+ {"matrix": [7, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 2], "x": 16.25, "y": 0},
+ {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 9], "x": 0, "y": 1.5},
+ {"matrix": [7, 9], "x": 1, "y": 1.5},
+ {"matrix": [7, 8], "x": 2, "y": 1.5},
+ {"matrix": [7, 7], "x": 3, "y": 1.5},
+ {"matrix": [7, 6], "x": 4, "y": 1.5},
+ {"matrix": [4, 6], "x": 5, "y": 1.5},
+ {"matrix": [4, 5], "x": 6, "y": 1.5},
+ {"matrix": [7, 5], "x": 7, "y": 1.5},
+ {"matrix": [7, 4], "x": 8, "y": 1.5},
+ {"matrix": [7, 3], "x": 9, "y": 1.5},
+ {"matrix": [7, 17], "x": 10, "y": 1.5},
+ {"matrix": [4, 17], "x": 11, "y": 1.5},
+ {"matrix": [4, 4], "x": 12, "y": 1.5},
+ {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+ {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+ {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+ {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+ {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+ {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+ {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+ {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+ {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+ {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+ {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+ {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+ {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+ {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+ {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+ {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+ {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+ {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+ {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+ {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+ {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+ {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+ {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+ {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+ {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+ {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+ {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+ {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+ {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+ {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+ ]
+ },
+ "LAYOUT_fullsize_ansi": {
+ "layout": [
+ {"matrix": [6, 9], "x": 0, "y": 0},
+
+ {"matrix": [4, 8], "x": 2, "y": 0},
+ {"matrix": [4, 7], "x": 3, "y": 0},
+ {"matrix": [2, 7], "x": 4, "y": 0},
+ {"matrix": [6, 7], "x": 5, "y": 0},
+
+ {"matrix": [7, 0], "x": 6.5, "y": 0},
+ {"matrix": [6, 4], "x": 7.5, "y": 0},
+ {"matrix": [2, 3], "x": 8.5, "y": 0},
+ {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [6, 1], "x": 13, "y": 0},
+ {"matrix": [0, 1], "x": 14, "y": 0},
+
+ {"matrix": [7, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 2], "x": 16.25, "y": 0},
+ {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 9], "x": 0, "y": 1.5},
+ {"matrix": [7, 9], "x": 1, "y": 1.5},
+ {"matrix": [7, 8], "x": 2, "y": 1.5},
+ {"matrix": [7, 7], "x": 3, "y": 1.5},
+ {"matrix": [7, 6], "x": 4, "y": 1.5},
+ {"matrix": [4, 6], "x": 5, "y": 1.5},
+ {"matrix": [4, 5], "x": 6, "y": 1.5},
+ {"matrix": [7, 5], "x": 7, "y": 1.5},
+ {"matrix": [7, 4], "x": 8, "y": 1.5},
+ {"matrix": [7, 3], "x": 9, "y": 1.5},
+ {"matrix": [7, 17], "x": 10, "y": 1.5},
+ {"matrix": [4, 17], "x": 11, "y": 1.5},
+ {"matrix": [4, 4], "x": 12, "y": 1.5},
+ {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+ {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+ {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+ {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+ {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+ {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+ {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+ {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+ {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+ {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+ {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+ {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+ {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+ {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+ {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+ {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+ {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+ {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+ {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+ {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+ {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+ {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+ {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+ {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+ {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+ {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+ {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+ {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+ {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bpiphany/kitten_paw/rules.mk b/keyboards/bpiphany/kitten_paw/rules.mk
index 43ebddd3574..8784813b335 100644
--- a/keyboards/bpiphany/kitten_paw/rules.mk
+++ b/keyboards/bpiphany/kitten_paw/rules.mk
@@ -1,14 +1,2 @@
-# 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 = 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
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/keyboard.json
similarity index 100%
rename from keyboards/bpiphany/pegasushoof/2013/info.json
rename to keyboards/bpiphany/pegasushoof/2013/keyboard.json
diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/keyboard.json
similarity index 100%
rename from keyboards/bpiphany/pegasushoof/2015/info.json
rename to keyboards/bpiphany/pegasushoof/2015/keyboard.json
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h
index cb63e867fc7..c6817a89448 100644
--- a/keyboards/bpiphany/tiger_lily/config.h
+++ b/keyboards/bpiphany/tiger_lily/config.h
@@ -38,11 +38,6 @@ along with this program. If not, see .
#define MATRIX_ROW_PINS { C2, B3, B4, B2, B1, C7, B6, B5 }
#define MATRIX_COL_PINS { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json
deleted file mode 100644
index 659c6f3267a..00000000000
--- a/keyboards/bpiphany/tiger_lily/info.json
+++ /dev/null
@@ -1,275 +0,0 @@
-{
- "keyboard_name": "tiger_lily",
- "manufacturer": "Bathroom Epiphanies",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x4245",
- "pid": "0x544C",
- "device_version": "0.0.1"
- },
- "indicators": {
- "caps_lock": "C6",
- "num_lock": "C5",
- "scroll_lock": "B7",
- "on_state": 0
- },
- "processor": "atmega32u2",
- "bootloader": "atmel-dfu",
- "community_layouts": ["fullsize_ansi"],
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [6, 9], "x": 0, "y": 0},
-
- {"matrix": [4, 8], "x": 2, "y": 0},
- {"matrix": [4, 7], "x": 3, "y": 0},
- {"matrix": [2, 7], "x": 4, "y": 0},
- {"matrix": [6, 7], "x": 5, "y": 0},
-
- {"matrix": [7, 0], "x": 6.5, "y": 0},
- {"matrix": [6, 4], "x": 7.5, "y": 0},
- {"matrix": [2, 3], "x": 8.5, "y": 0},
- {"matrix": [4, 3], "x": 9.5, "y": 0},
-
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [7, 1], "x": 12, "y": 0},
- {"matrix": [6, 1], "x": 13, "y": 0},
- {"matrix": [0, 1], "x": 14, "y": 0},
-
- {"matrix": [7, 2], "x": 15.25, "y": 0},
- {"matrix": [5, 2], "x": 16.25, "y": 0},
- {"matrix": [5, 0], "x": 17.25, "y": 0},
-
- {"matrix": [4, 9], "x": 0, "y": 1.5},
- {"matrix": [7, 9], "x": 1, "y": 1.5},
- {"matrix": [7, 8], "x": 2, "y": 1.5},
- {"matrix": [7, 7], "x": 3, "y": 1.5},
- {"matrix": [7, 6], "x": 4, "y": 1.5},
- {"matrix": [4, 6], "x": 5, "y": 1.5},
- {"matrix": [4, 5], "x": 6, "y": 1.5},
- {"matrix": [7, 5], "x": 7, "y": 1.5},
- {"matrix": [7, 4], "x": 8, "y": 1.5},
- {"matrix": [7, 3], "x": 9, "y": 1.5},
- {"matrix": [7, 17], "x": 10, "y": 1.5},
- {"matrix": [4, 17], "x": 11, "y": 1.5},
- {"matrix": [4, 4], "x": 12, "y": 1.5},
- {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [4, 11], "x": 15.25, "y": 1.5},
- {"matrix": [4, 14], "x": 16.25, "y": 1.5},
- {"matrix": [4, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [1, 10], "x": 18.5, "y": 1.5},
- {"matrix": [1, 11], "x": 19.5, "y": 1.5},
- {"matrix": [1, 16], "x": 20.5, "y": 1.5},
- {"matrix": [0, 16], "x": 21.5, "y": 1.5},
-
- {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [5, 9], "x": 1.5, "y": 2.5},
- {"matrix": [5, 8], "x": 2.5, "y": 2.5},
- {"matrix": [5, 7], "x": 3.5, "y": 2.5},
- {"matrix": [5, 6], "x": 4.5, "y": 2.5},
- {"matrix": [2, 6], "x": 5.5, "y": 2.5},
- {"matrix": [2, 5], "x": 6.5, "y": 2.5},
- {"matrix": [5, 5], "x": 7.5, "y": 2.5},
- {"matrix": [5, 4], "x": 8.5, "y": 2.5},
- {"matrix": [5, 3], "x": 9.5, "y": 2.5},
- {"matrix": [5, 17], "x": 10.5, "y": 2.5},
- {"matrix": [2, 17], "x": 11.5, "y": 2.5},
- {"matrix": [2, 4], "x": 12.5, "y": 2.5},
- {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [4, 10], "x": 15.25, "y": 2.5},
- {"matrix": [7, 14], "x": 16.25, "y": 2.5},
- {"matrix": [7, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [5, 10], "x": 18.5, "y": 2.5},
- {"matrix": [5, 11], "x": 19.5, "y": 2.5},
- {"matrix": [5, 16], "x": 20.5, "y": 2.5},
- {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
-
- {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 9], "x": 1.75, "y": 3.5},
- {"matrix": [3, 8], "x": 2.75, "y": 3.5},
- {"matrix": [3, 7], "x": 3.75, "y": 3.5},
- {"matrix": [3, 6], "x": 4.75, "y": 3.5},
- {"matrix": [6, 6], "x": 5.75, "y": 3.5},
- {"matrix": [6, 5], "x": 6.75, "y": 3.5},
- {"matrix": [3, 5], "x": 7.75, "y": 3.5},
- {"matrix": [3, 4], "x": 8.75, "y": 3.5},
- {"matrix": [3, 3], "x": 9.75, "y": 3.5},
- {"matrix": [3, 17], "x": 10.75, "y": 3.5},
- {"matrix": [6, 17], "x": 11.75, "y": 3.5},
- {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [2, 10], "x": 18.5, "y": 3.5},
- {"matrix": [2, 11], "x": 19.5, "y": 3.5},
- {"matrix": [2, 16], "x": 20.5, "y": 3.5},
-
- {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
- {"matrix": [6, 8], "x": 1.25, "y": 4.5},
- {"matrix": [1, 9], "x": 2.25, "y": 4.5},
- {"matrix": [1, 8], "x": 3.25, "y": 4.5},
- {"matrix": [1, 7], "x": 4.25, "y": 4.5},
- {"matrix": [1, 6], "x": 5.25, "y": 4.5},
- {"matrix": [0, 6], "x": 6.25, "y": 4.5},
- {"matrix": [0, 5], "x": 7.25, "y": 4.5},
- {"matrix": [1, 5], "x": 8.25, "y": 4.5},
- {"matrix": [1, 4], "x": 9.25, "y": 4.5},
- {"matrix": [1, 3], "x": 10.25, "y": 4.5},
- {"matrix": [0, 17], "x": 11.25, "y": 4.5},
- {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [6, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [3, 10], "x": 18.5, "y": 4.5},
- {"matrix": [3, 11], "x": 19.5, "y": 4.5},
- {"matrix": [3, 16], "x": 20.5, "y": 4.5},
- {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [0, 14], "x": 15.25, "y": 5.5},
- {"matrix": [0, 10], "x": 16.25, "y": 5.5},
- {"matrix": [0, 11], "x": 17.25, "y": 5.5},
-
- {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
- {"matrix": [6, 16], "x": 20.5, "y": 5.5}
- ]
- },
- "LAYOUT_fullsize_ansi": {
- "layout": [
- {"matrix": [6, 9], "x": 0, "y": 0},
-
- {"matrix": [4, 8], "x": 2, "y": 0},
- {"matrix": [4, 7], "x": 3, "y": 0},
- {"matrix": [2, 7], "x": 4, "y": 0},
- {"matrix": [6, 7], "x": 5, "y": 0},
-
- {"matrix": [7, 0], "x": 6.5, "y": 0},
- {"matrix": [6, 4], "x": 7.5, "y": 0},
- {"matrix": [2, 3], "x": 8.5, "y": 0},
- {"matrix": [4, 3], "x": 9.5, "y": 0},
-
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [7, 1], "x": 12, "y": 0},
- {"matrix": [6, 1], "x": 13, "y": 0},
- {"matrix": [0, 1], "x": 14, "y": 0},
-
- {"matrix": [7, 2], "x": 15.25, "y": 0},
- {"matrix": [5, 2], "x": 16.25, "y": 0},
- {"matrix": [5, 0], "x": 17.25, "y": 0},
-
- {"matrix": [4, 9], "x": 0, "y": 1.5},
- {"matrix": [7, 9], "x": 1, "y": 1.5},
- {"matrix": [7, 8], "x": 2, "y": 1.5},
- {"matrix": [7, 7], "x": 3, "y": 1.5},
- {"matrix": [7, 6], "x": 4, "y": 1.5},
- {"matrix": [4, 6], "x": 5, "y": 1.5},
- {"matrix": [4, 5], "x": 6, "y": 1.5},
- {"matrix": [7, 5], "x": 7, "y": 1.5},
- {"matrix": [7, 4], "x": 8, "y": 1.5},
- {"matrix": [7, 3], "x": 9, "y": 1.5},
- {"matrix": [7, 17], "x": 10, "y": 1.5},
- {"matrix": [4, 17], "x": 11, "y": 1.5},
- {"matrix": [4, 4], "x": 12, "y": 1.5},
- {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [4, 11], "x": 15.25, "y": 1.5},
- {"matrix": [4, 14], "x": 16.25, "y": 1.5},
- {"matrix": [4, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [1, 10], "x": 18.5, "y": 1.5},
- {"matrix": [1, 11], "x": 19.5, "y": 1.5},
- {"matrix": [1, 16], "x": 20.5, "y": 1.5},
- {"matrix": [0, 16], "x": 21.5, "y": 1.5},
-
- {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [5, 9], "x": 1.5, "y": 2.5},
- {"matrix": [5, 8], "x": 2.5, "y": 2.5},
- {"matrix": [5, 7], "x": 3.5, "y": 2.5},
- {"matrix": [5, 6], "x": 4.5, "y": 2.5},
- {"matrix": [2, 6], "x": 5.5, "y": 2.5},
- {"matrix": [2, 5], "x": 6.5, "y": 2.5},
- {"matrix": [5, 5], "x": 7.5, "y": 2.5},
- {"matrix": [5, 4], "x": 8.5, "y": 2.5},
- {"matrix": [5, 3], "x": 9.5, "y": 2.5},
- {"matrix": [5, 17], "x": 10.5, "y": 2.5},
- {"matrix": [2, 17], "x": 11.5, "y": 2.5},
- {"matrix": [2, 4], "x": 12.5, "y": 2.5},
- {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [4, 10], "x": 15.25, "y": 2.5},
- {"matrix": [7, 14], "x": 16.25, "y": 2.5},
- {"matrix": [7, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [5, 10], "x": 18.5, "y": 2.5},
- {"matrix": [5, 11], "x": 19.5, "y": 2.5},
- {"matrix": [5, 16], "x": 20.5, "y": 2.5},
- {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
-
- {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 9], "x": 1.75, "y": 3.5},
- {"matrix": [3, 8], "x": 2.75, "y": 3.5},
- {"matrix": [3, 7], "x": 3.75, "y": 3.5},
- {"matrix": [3, 6], "x": 4.75, "y": 3.5},
- {"matrix": [6, 6], "x": 5.75, "y": 3.5},
- {"matrix": [6, 5], "x": 6.75, "y": 3.5},
- {"matrix": [3, 5], "x": 7.75, "y": 3.5},
- {"matrix": [3, 4], "x": 8.75, "y": 3.5},
- {"matrix": [3, 3], "x": 9.75, "y": 3.5},
- {"matrix": [3, 17], "x": 10.75, "y": 3.5},
- {"matrix": [6, 17], "x": 11.75, "y": 3.5},
- {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [2, 10], "x": 18.5, "y": 3.5},
- {"matrix": [2, 11], "x": 19.5, "y": 3.5},
- {"matrix": [2, 16], "x": 20.5, "y": 3.5},
-
- {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [1, 9], "x": 2.25, "y": 4.5},
- {"matrix": [1, 8], "x": 3.25, "y": 4.5},
- {"matrix": [1, 7], "x": 4.25, "y": 4.5},
- {"matrix": [1, 6], "x": 5.25, "y": 4.5},
- {"matrix": [0, 6], "x": 6.25, "y": 4.5},
- {"matrix": [0, 5], "x": 7.25, "y": 4.5},
- {"matrix": [1, 5], "x": 8.25, "y": 4.5},
- {"matrix": [1, 4], "x": 9.25, "y": 4.5},
- {"matrix": [1, 3], "x": 10.25, "y": 4.5},
- {"matrix": [0, 17], "x": 11.25, "y": 4.5},
- {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [6, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [3, 10], "x": 18.5, "y": 4.5},
- {"matrix": [3, 11], "x": 19.5, "y": 4.5},
- {"matrix": [3, 16], "x": 20.5, "y": 4.5},
- {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [0, 14], "x": 15.25, "y": 5.5},
- {"matrix": [0, 10], "x": 16.25, "y": 5.5},
- {"matrix": [0, 11], "x": 17.25, "y": 5.5},
-
- {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
- {"matrix": [6, 16], "x": 20.5, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/bpiphany/tiger_lily/keyboard.json b/keyboards/bpiphany/tiger_lily/keyboard.json
new file mode 100644
index 00000000000..118f89f39d0
--- /dev/null
+++ b/keyboards/bpiphany/tiger_lily/keyboard.json
@@ -0,0 +1,288 @@
+{
+ "keyboard_name": "tiger_lily",
+ "manufacturer": "Bathroom Epiphanies",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4245",
+ "pid": "0x544C",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "indicators": {
+ "caps_lock": "C6",
+ "num_lock": "C5",
+ "scroll_lock": "B7",
+ "on_state": 0
+ },
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["fullsize_ansi"],
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [6, 9], "x": 0, "y": 0},
+
+ {"matrix": [4, 8], "x": 2, "y": 0},
+ {"matrix": [4, 7], "x": 3, "y": 0},
+ {"matrix": [2, 7], "x": 4, "y": 0},
+ {"matrix": [6, 7], "x": 5, "y": 0},
+
+ {"matrix": [7, 0], "x": 6.5, "y": 0},
+ {"matrix": [6, 4], "x": 7.5, "y": 0},
+ {"matrix": [2, 3], "x": 8.5, "y": 0},
+ {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [6, 1], "x": 13, "y": 0},
+ {"matrix": [0, 1], "x": 14, "y": 0},
+
+ {"matrix": [7, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 2], "x": 16.25, "y": 0},
+ {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 9], "x": 0, "y": 1.5},
+ {"matrix": [7, 9], "x": 1, "y": 1.5},
+ {"matrix": [7, 8], "x": 2, "y": 1.5},
+ {"matrix": [7, 7], "x": 3, "y": 1.5},
+ {"matrix": [7, 6], "x": 4, "y": 1.5},
+ {"matrix": [4, 6], "x": 5, "y": 1.5},
+ {"matrix": [4, 5], "x": 6, "y": 1.5},
+ {"matrix": [7, 5], "x": 7, "y": 1.5},
+ {"matrix": [7, 4], "x": 8, "y": 1.5},
+ {"matrix": [7, 3], "x": 9, "y": 1.5},
+ {"matrix": [7, 17], "x": 10, "y": 1.5},
+ {"matrix": [4, 17], "x": 11, "y": 1.5},
+ {"matrix": [4, 4], "x": 12, "y": 1.5},
+ {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+ {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+ {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+ {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+ {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+ {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+ {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+ {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+ {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+ {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+ {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+ {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+ {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+ {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+ {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+ {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+ {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+ {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+ {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+ {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+ {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+ {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+ {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+ {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+ {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+ {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+ {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+ {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+ {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+ {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+ ]
+ },
+ "LAYOUT_fullsize_ansi": {
+ "layout": [
+ {"matrix": [6, 9], "x": 0, "y": 0},
+
+ {"matrix": [4, 8], "x": 2, "y": 0},
+ {"matrix": [4, 7], "x": 3, "y": 0},
+ {"matrix": [2, 7], "x": 4, "y": 0},
+ {"matrix": [6, 7], "x": 5, "y": 0},
+
+ {"matrix": [7, 0], "x": 6.5, "y": 0},
+ {"matrix": [6, 4], "x": 7.5, "y": 0},
+ {"matrix": [2, 3], "x": 8.5, "y": 0},
+ {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [6, 1], "x": 13, "y": 0},
+ {"matrix": [0, 1], "x": 14, "y": 0},
+
+ {"matrix": [7, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 2], "x": 16.25, "y": 0},
+ {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 9], "x": 0, "y": 1.5},
+ {"matrix": [7, 9], "x": 1, "y": 1.5},
+ {"matrix": [7, 8], "x": 2, "y": 1.5},
+ {"matrix": [7, 7], "x": 3, "y": 1.5},
+ {"matrix": [7, 6], "x": 4, "y": 1.5},
+ {"matrix": [4, 6], "x": 5, "y": 1.5},
+ {"matrix": [4, 5], "x": 6, "y": 1.5},
+ {"matrix": [7, 5], "x": 7, "y": 1.5},
+ {"matrix": [7, 4], "x": 8, "y": 1.5},
+ {"matrix": [7, 3], "x": 9, "y": 1.5},
+ {"matrix": [7, 17], "x": 10, "y": 1.5},
+ {"matrix": [4, 17], "x": 11, "y": 1.5},
+ {"matrix": [4, 4], "x": 12, "y": 1.5},
+ {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+ {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+ {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+ {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+ {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+ {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+ {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+ {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+ {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+ {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+ {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+ {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+ {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+ {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+ {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+ {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+ {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+ {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+ {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+ {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+ {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+ {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+ {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+ {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+ {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+ {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+ {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+ {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+ {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bpiphany/tiger_lily/rules.mk b/keyboards/bpiphany/tiger_lily/rules.mk
index 43ebddd3574..8784813b335 100644
--- a/keyboards/bpiphany/tiger_lily/rules.mk
+++ b/keyboards/bpiphany/tiger_lily/rules.mk
@@ -1,14 +1,2 @@
-# 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 = 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
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h
index af212673576..55322288ace 100644
--- a/keyboards/bpiphany/unloved_bastard/config.h
+++ b/keyboards/bpiphany/unloved_bastard/config.h
@@ -22,11 +22,6 @@ along with this program. If not, see .
#define MATRIX_ROWS 8
#define MATRIX_COLS 18
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/info.json
deleted file mode 100644
index 4ca48fee995..00000000000
--- a/keyboards/bpiphany/unloved_bastard/info.json
+++ /dev/null
@@ -1,338 +0,0 @@
-{
- "keyboard_name": "Unloved Bastard",
- "manufacturer": "Bathroom Epiphanies",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x1337",
- "device_version": "0.0.1"
- },
- "indicators": {
- "caps_lock": "C5",
- "num_lock": "B7",
- "scroll_lock": "C6",
- "on_state": 0
- },
- "processor": "atmega32u2",
- "bootloader": "atmel-dfu",
- "community_layouts": ["tkl_ansi", "tkl_iso"],
- "layout_aliases": {
- "LAYOUT": "LAYOUT_all"
- },
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [6, 6], "x": 0, "y": 0},
-
- {"matrix": [4, 7], "x": 2, "y": 0},
- {"matrix": [4, 8], "x": 3, "y": 0},
- {"matrix": [2, 8], "x": 4, "y": 0},
- {"matrix": [6, 8], "x": 5, "y": 0},
-
- {"matrix": [5, 15], "x": 6.5, "y": 0},
- {"matrix": [6, 11], "x": 7.5, "y": 0},
- {"matrix": [2, 12], "x": 8.5, "y": 0},
- {"matrix": [4, 12], "x": 9.5, "y": 0},
-
- {"matrix": [4, 14], "x": 11, "y": 0},
- {"matrix": [5, 14], "x": 12, "y": 0},
- {"matrix": [6, 14], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [5, 13], "x": 15.25, "y": 0},
- {"matrix": [7, 13], "x": 16.25, "y": 0},
- {"matrix": [7, 15], "x": 17.25, "y": 0},
-
- {"matrix": [4, 6], "x": 0, "y": 1.5},
- {"matrix": [5, 6], "x": 1, "y": 1.5},
- {"matrix": [5, 7], "x": 2, "y": 1.5},
- {"matrix": [5, 8], "x": 3, "y": 1.5},
- {"matrix": [5, 9], "x": 4, "y": 1.5},
- {"matrix": [4, 9], "x": 5, "y": 1.5},
- {"matrix": [4, 10], "x": 6, "y": 1.5},
- {"matrix": [5, 10], "x": 7, "y": 1.5},
- {"matrix": [5, 11], "x": 8, "y": 1.5},
- {"matrix": [5, 12], "x": 9, "y": 1.5},
- {"matrix": [5, 5], "x": 10, "y": 1.5},
- {"matrix": [4, 5], "x": 11, "y": 1.5},
- {"matrix": [4, 11], "x": 12, "y": 1.5},
- {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [4, 17], "x": 15.25, "y": 1.5},
- {"matrix": [4, 2], "x": 16.25, "y": 1.5},
- {"matrix": [4, 4], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [7, 6], "x": 1.5, "y": 2.5},
- {"matrix": [7, 7], "x": 2.5, "y": 2.5},
- {"matrix": [7, 8], "x": 3.5, "y": 2.5},
- {"matrix": [7, 9], "x": 4.5, "y": 2.5},
- {"matrix": [2, 9], "x": 5.5, "y": 2.5},
- {"matrix": [2, 10], "x": 6.5, "y": 2.5},
- {"matrix": [7, 10], "x": 7.5, "y": 2.5},
- {"matrix": [7, 11], "x": 8.5, "y": 2.5},
- {"matrix": [7, 12], "x": 9.5, "y": 2.5},
- {"matrix": [7, 5], "x": 10.5, "y": 2.5},
- {"matrix": [2, 5], "x": 11.5, "y": 2.5},
- {"matrix": [2, 11], "x": 12.5, "y": 2.5},
- {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [4, 16], "x": 15.25, "y": 2.5},
- {"matrix": [5, 2], "x": 16.25, "y": 2.5},
- {"matrix": [5, 4], "x": 17.25, "y": 2.5},
-
- {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 6], "x": 1.75, "y": 3.5},
- {"matrix": [3, 7], "x": 2.75, "y": 3.5},
- {"matrix": [3, 8], "x": 3.75, "y": 3.5},
- {"matrix": [3, 9], "x": 4.75, "y": 3.5},
- {"matrix": [6, 9], "x": 5.75, "y": 3.5},
- {"matrix": [6, 10], "x": 6.75, "y": 3.5},
- {"matrix": [3, 10], "x": 7.75, "y": 3.5},
- {"matrix": [3, 11], "x": 8.75, "y": 3.5},
- {"matrix": [3, 12], "x": 9.75, "y": 3.5},
- {"matrix": [3, 5], "x": 10.75, "y": 3.5},
- {"matrix": [6, 5], "x": 11.75, "y": 3.5},
- {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
- {"matrix": [6, 7], "x": 1.25, "y": 4.5},
- {"matrix": [1, 6], "x": 2.25, "y": 4.5},
- {"matrix": [1, 7], "x": 3.25, "y": 4.5},
- {"matrix": [1, 8], "x": 4.25, "y": 4.5},
- {"matrix": [1, 9], "x": 5.25, "y": 4.5},
- {"matrix": [0, 9], "x": 6.25, "y": 4.5},
- {"matrix": [0, 10], "x": 7.25, "y": 4.5},
- {"matrix": [1, 10], "x": 8.25, "y": 4.5},
- {"matrix": [1, 11], "x": 9.25, "y": 4.5},
- {"matrix": [1, 12], "x": 10.25, "y": 4.5},
- {"matrix": [0, 5], "x": 11.25, "y": 4.5},
- {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [6, 2], "x": 16.25, "y": 4.5},
-
- {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [0, 2], "x": 15.25, "y": 5.5},
- {"matrix": [0, 16], "x": 16.25, "y": 5.5},
- {"matrix": [0, 17], "x": 17.25, "y": 5.5}
- ]
- },
- "LAYOUT_tkl_iso": {
- "layout": [
- {"matrix": [6, 6], "x": 0, "y": 0},
-
- {"matrix": [4, 7], "x": 2, "y": 0},
- {"matrix": [4, 8], "x": 3, "y": 0},
- {"matrix": [2, 8], "x": 4, "y": 0},
- {"matrix": [6, 8], "x": 5, "y": 0},
-
- {"matrix": [5, 15], "x": 6.5, "y": 0},
- {"matrix": [6, 11], "x": 7.5, "y": 0},
- {"matrix": [2, 12], "x": 8.5, "y": 0},
- {"matrix": [4, 12], "x": 9.5, "y": 0},
-
- {"matrix": [4, 14], "x": 11, "y": 0},
- {"matrix": [5, 14], "x": 12, "y": 0},
- {"matrix": [6, 14], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [5, 13], "x": 15.25, "y": 0},
- {"matrix": [7, 13], "x": 16.25, "y": 0},
- {"matrix": [7, 15], "x": 17.25, "y": 0},
-
- {"matrix": [4, 6], "x": 0, "y": 1.5},
- {"matrix": [5, 6], "x": 1, "y": 1.5},
- {"matrix": [5, 7], "x": 2, "y": 1.5},
- {"matrix": [5, 8], "x": 3, "y": 1.5},
- {"matrix": [5, 9], "x": 4, "y": 1.5},
- {"matrix": [4, 9], "x": 5, "y": 1.5},
- {"matrix": [4, 10], "x": 6, "y": 1.5},
- {"matrix": [5, 10], "x": 7, "y": 1.5},
- {"matrix": [5, 11], "x": 8, "y": 1.5},
- {"matrix": [5, 12], "x": 9, "y": 1.5},
- {"matrix": [5, 5], "x": 10, "y": 1.5},
- {"matrix": [4, 5], "x": 11, "y": 1.5},
- {"matrix": [4, 11], "x": 12, "y": 1.5},
- {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [4, 17], "x": 15.25, "y": 1.5},
- {"matrix": [4, 2], "x": 16.25, "y": 1.5},
- {"matrix": [4, 4], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [7, 6], "x": 1.5, "y": 2.5},
- {"matrix": [7, 7], "x": 2.5, "y": 2.5},
- {"matrix": [7, 8], "x": 3.5, "y": 2.5},
- {"matrix": [7, 9], "x": 4.5, "y": 2.5},
- {"matrix": [2, 9], "x": 5.5, "y": 2.5},
- {"matrix": [2, 10], "x": 6.5, "y": 2.5},
- {"matrix": [7, 10], "x": 7.5, "y": 2.5},
- {"matrix": [7, 11], "x": 8.5, "y": 2.5},
- {"matrix": [7, 12], "x": 9.5, "y": 2.5},
- {"matrix": [7, 5], "x": 10.5, "y": 2.5},
- {"matrix": [2, 5], "x": 11.5, "y": 2.5},
- {"matrix": [2, 11], "x": 12.5, "y": 2.5},
-
- {"matrix": [4, 16], "x": 15.25, "y": 2.5},
- {"matrix": [5, 2], "x": 16.25, "y": 2.5},
- {"matrix": [5, 4], "x": 17.25, "y": 2.5},
-
- {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 6], "x": 1.75, "y": 3.5},
- {"matrix": [3, 7], "x": 2.75, "y": 3.5},
- {"matrix": [3, 8], "x": 3.75, "y": 3.5},
- {"matrix": [3, 9], "x": 4.75, "y": 3.5},
- {"matrix": [6, 9], "x": 5.75, "y": 3.5},
- {"matrix": [6, 10], "x": 6.75, "y": 3.5},
- {"matrix": [3, 10], "x": 7.75, "y": 3.5},
- {"matrix": [3, 11], "x": 8.75, "y": 3.5},
- {"matrix": [3, 12], "x": 9.75, "y": 3.5},
- {"matrix": [3, 5], "x": 10.75, "y": 3.5},
- {"matrix": [6, 5], "x": 11.75, "y": 3.5},
- {"matrix": [3, 14], "x": 12.75, "y": 3.5},
- {"matrix": [1, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
- {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
- {"matrix": [6, 7], "x": 1.25, "y": 4.5},
- {"matrix": [1, 6], "x": 2.25, "y": 4.5},
- {"matrix": [1, 7], "x": 3.25, "y": 4.5},
- {"matrix": [1, 8], "x": 4.25, "y": 4.5},
- {"matrix": [1, 9], "x": 5.25, "y": 4.5},
- {"matrix": [0, 9], "x": 6.25, "y": 4.5},
- {"matrix": [0, 10], "x": 7.25, "y": 4.5},
- {"matrix": [1, 10], "x": 8.25, "y": 4.5},
- {"matrix": [1, 11], "x": 9.25, "y": 4.5},
- {"matrix": [1, 12], "x": 10.25, "y": 4.5},
- {"matrix": [0, 5], "x": 11.25, "y": 4.5},
- {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [6, 2], "x": 16.25, "y": 4.5},
-
- {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [0, 2], "x": 15.25, "y": 5.5},
- {"matrix": [0, 16], "x": 16.25, "y": 5.5},
- {"matrix": [0, 17], "x": 17.25, "y": 5.5}
- ]
- },
- "LAYOUT_tkl_ansi": {
- "layout": [
- {"matrix": [6, 6], "x": 0, "y": 0},
-
- {"matrix": [4, 7], "x": 2, "y": 0},
- {"matrix": [4, 8], "x": 3, "y": 0},
- {"matrix": [2, 8], "x": 4, "y": 0},
- {"matrix": [6, 8], "x": 5, "y": 0},
-
- {"matrix": [5, 15], "x": 6.5, "y": 0},
- {"matrix": [6, 11], "x": 7.5, "y": 0},
- {"matrix": [2, 12], "x": 8.5, "y": 0},
- {"matrix": [4, 12], "x": 9.5, "y": 0},
-
- {"matrix": [4, 14], "x": 11, "y": 0},
- {"matrix": [5, 14], "x": 12, "y": 0},
- {"matrix": [6, 14], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [5, 13], "x": 15.25, "y": 0},
- {"matrix": [7, 13], "x": 16.25, "y": 0},
- {"matrix": [7, 15], "x": 17.25, "y": 0},
-
- {"matrix": [4, 6], "x": 0, "y": 1.5},
- {"matrix": [5, 6], "x": 1, "y": 1.5},
- {"matrix": [5, 7], "x": 2, "y": 1.5},
- {"matrix": [5, 8], "x": 3, "y": 1.5},
- {"matrix": [5, 9], "x": 4, "y": 1.5},
- {"matrix": [4, 9], "x": 5, "y": 1.5},
- {"matrix": [4, 10], "x": 6, "y": 1.5},
- {"matrix": [5, 10], "x": 7, "y": 1.5},
- {"matrix": [5, 11], "x": 8, "y": 1.5},
- {"matrix": [5, 12], "x": 9, "y": 1.5},
- {"matrix": [5, 5], "x": 10, "y": 1.5},
- {"matrix": [4, 5], "x": 11, "y": 1.5},
- {"matrix": [4, 11], "x": 12, "y": 1.5},
- {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [4, 17], "x": 15.25, "y": 1.5},
- {"matrix": [4, 2], "x": 16.25, "y": 1.5},
- {"matrix": [4, 4], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [7, 6], "x": 1.5, "y": 2.5},
- {"matrix": [7, 7], "x": 2.5, "y": 2.5},
- {"matrix": [7, 8], "x": 3.5, "y": 2.5},
- {"matrix": [7, 9], "x": 4.5, "y": 2.5},
- {"matrix": [2, 9], "x": 5.5, "y": 2.5},
- {"matrix": [2, 10], "x": 6.5, "y": 2.5},
- {"matrix": [7, 10], "x": 7.5, "y": 2.5},
- {"matrix": [7, 11], "x": 8.5, "y": 2.5},
- {"matrix": [7, 12], "x": 9.5, "y": 2.5},
- {"matrix": [7, 5], "x": 10.5, "y": 2.5},
- {"matrix": [2, 5], "x": 11.5, "y": 2.5},
- {"matrix": [2, 11], "x": 12.5, "y": 2.5},
- {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [4, 16], "x": 15.25, "y": 2.5},
- {"matrix": [5, 2], "x": 16.25, "y": 2.5},
- {"matrix": [5, 4], "x": 17.25, "y": 2.5},
-
- {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 6], "x": 1.75, "y": 3.5},
- {"matrix": [3, 7], "x": 2.75, "y": 3.5},
- {"matrix": [3, 8], "x": 3.75, "y": 3.5},
- {"matrix": [3, 9], "x": 4.75, "y": 3.5},
- {"matrix": [6, 9], "x": 5.75, "y": 3.5},
- {"matrix": [6, 10], "x": 6.75, "y": 3.5},
- {"matrix": [3, 10], "x": 7.75, "y": 3.5},
- {"matrix": [3, 11], "x": 8.75, "y": 3.5},
- {"matrix": [3, 12], "x": 9.75, "y": 3.5},
- {"matrix": [3, 5], "x": 10.75, "y": 3.5},
- {"matrix": [6, 5], "x": 11.75, "y": 3.5},
- {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [1, 6], "x": 2.25, "y": 4.5},
- {"matrix": [1, 7], "x": 3.25, "y": 4.5},
- {"matrix": [1, 8], "x": 4.25, "y": 4.5},
- {"matrix": [1, 9], "x": 5.25, "y": 4.5},
- {"matrix": [0, 9], "x": 6.25, "y": 4.5},
- {"matrix": [0, 10], "x": 7.25, "y": 4.5},
- {"matrix": [1, 10], "x": 8.25, "y": 4.5},
- {"matrix": [1, 11], "x": 9.25, "y": 4.5},
- {"matrix": [1, 12], "x": 10.25, "y": 4.5},
- {"matrix": [0, 5], "x": 11.25, "y": 4.5},
- {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [6, 2], "x": 16.25, "y": 4.5},
-
- {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [0, 2], "x": 15.25, "y": 5.5},
- {"matrix": [0, 16], "x": 16.25, "y": 5.5},
- {"matrix": [0, 17], "x": 17.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/bpiphany/unloved_bastard/keyboard.json b/keyboards/bpiphany/unloved_bastard/keyboard.json
new file mode 100644
index 00000000000..4748057175e
--- /dev/null
+++ b/keyboards/bpiphany/unloved_bastard/keyboard.json
@@ -0,0 +1,352 @@
+{
+ "keyboard_name": "Unloved Bastard",
+ "manufacturer": "Bathroom Epiphanies",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1337",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "sleep_led": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "indicators": {
+ "caps_lock": "C5",
+ "num_lock": "B7",
+ "scroll_lock": "C6",
+ "on_state": 0
+ },
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["tkl_ansi", "tkl_iso"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_all"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [6, 6], "x": 0, "y": 0},
+
+ {"matrix": [4, 7], "x": 2, "y": 0},
+ {"matrix": [4, 8], "x": 3, "y": 0},
+ {"matrix": [2, 8], "x": 4, "y": 0},
+ {"matrix": [6, 8], "x": 5, "y": 0},
+
+ {"matrix": [5, 15], "x": 6.5, "y": 0},
+ {"matrix": [6, 11], "x": 7.5, "y": 0},
+ {"matrix": [2, 12], "x": 8.5, "y": 0},
+ {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+ {"matrix": [4, 14], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [6, 14], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [5, 13], "x": 15.25, "y": 0},
+ {"matrix": [7, 13], "x": 16.25, "y": 0},
+ {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 6], "x": 0, "y": 1.5},
+ {"matrix": [5, 6], "x": 1, "y": 1.5},
+ {"matrix": [5, 7], "x": 2, "y": 1.5},
+ {"matrix": [5, 8], "x": 3, "y": 1.5},
+ {"matrix": [5, 9], "x": 4, "y": 1.5},
+ {"matrix": [4, 9], "x": 5, "y": 1.5},
+ {"matrix": [4, 10], "x": 6, "y": 1.5},
+ {"matrix": [5, 10], "x": 7, "y": 1.5},
+ {"matrix": [5, 11], "x": 8, "y": 1.5},
+ {"matrix": [5, 12], "x": 9, "y": 1.5},
+ {"matrix": [5, 5], "x": 10, "y": 1.5},
+ {"matrix": [4, 5], "x": 11, "y": 1.5},
+ {"matrix": [4, 11], "x": 12, "y": 1.5},
+ {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+ {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+ {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+ {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+ {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+ {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+ {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+ {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+ {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+ {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+ {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+ {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [6, 7], "x": 1.25, "y": 4.5},
+ {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+ {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+ {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+ {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+ {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+ {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+ {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+ {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+ {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+ {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+ {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+ {"matrix": [0, 17], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_iso": {
+ "layout": [
+ {"matrix": [6, 6], "x": 0, "y": 0},
+
+ {"matrix": [4, 7], "x": 2, "y": 0},
+ {"matrix": [4, 8], "x": 3, "y": 0},
+ {"matrix": [2, 8], "x": 4, "y": 0},
+ {"matrix": [6, 8], "x": 5, "y": 0},
+
+ {"matrix": [5, 15], "x": 6.5, "y": 0},
+ {"matrix": [6, 11], "x": 7.5, "y": 0},
+ {"matrix": [2, 12], "x": 8.5, "y": 0},
+ {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+ {"matrix": [4, 14], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [6, 14], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [5, 13], "x": 15.25, "y": 0},
+ {"matrix": [7, 13], "x": 16.25, "y": 0},
+ {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 6], "x": 0, "y": 1.5},
+ {"matrix": [5, 6], "x": 1, "y": 1.5},
+ {"matrix": [5, 7], "x": 2, "y": 1.5},
+ {"matrix": [5, 8], "x": 3, "y": 1.5},
+ {"matrix": [5, 9], "x": 4, "y": 1.5},
+ {"matrix": [4, 9], "x": 5, "y": 1.5},
+ {"matrix": [4, 10], "x": 6, "y": 1.5},
+ {"matrix": [5, 10], "x": 7, "y": 1.5},
+ {"matrix": [5, 11], "x": 8, "y": 1.5},
+ {"matrix": [5, 12], "x": 9, "y": 1.5},
+ {"matrix": [5, 5], "x": 10, "y": 1.5},
+ {"matrix": [4, 5], "x": 11, "y": 1.5},
+ {"matrix": [4, 11], "x": 12, "y": 1.5},
+ {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+ {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+ {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+ {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+ {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+ {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+ {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+ {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+ {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+
+ {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+ {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+ {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+ {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 14], "x": 12.75, "y": 3.5},
+ {"matrix": [1, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [6, 7], "x": 1.25, "y": 4.5},
+ {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+ {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+ {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+ {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+ {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+ {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+ {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+ {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+ {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+ {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+ {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+ {"matrix": [0, 17], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [6, 6], "x": 0, "y": 0},
+
+ {"matrix": [4, 7], "x": 2, "y": 0},
+ {"matrix": [4, 8], "x": 3, "y": 0},
+ {"matrix": [2, 8], "x": 4, "y": 0},
+ {"matrix": [6, 8], "x": 5, "y": 0},
+
+ {"matrix": [5, 15], "x": 6.5, "y": 0},
+ {"matrix": [6, 11], "x": 7.5, "y": 0},
+ {"matrix": [2, 12], "x": 8.5, "y": 0},
+ {"matrix": [4, 12], "x": 9.5, "y": 0},
+
+ {"matrix": [4, 14], "x": 11, "y": 0},
+ {"matrix": [5, 14], "x": 12, "y": 0},
+ {"matrix": [6, 14], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [5, 13], "x": 15.25, "y": 0},
+ {"matrix": [7, 13], "x": 16.25, "y": 0},
+ {"matrix": [7, 15], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 6], "x": 0, "y": 1.5},
+ {"matrix": [5, 6], "x": 1, "y": 1.5},
+ {"matrix": [5, 7], "x": 2, "y": 1.5},
+ {"matrix": [5, 8], "x": 3, "y": 1.5},
+ {"matrix": [5, 9], "x": 4, "y": 1.5},
+ {"matrix": [4, 9], "x": 5, "y": 1.5},
+ {"matrix": [4, 10], "x": 6, "y": 1.5},
+ {"matrix": [5, 10], "x": 7, "y": 1.5},
+ {"matrix": [5, 11], "x": 8, "y": 1.5},
+ {"matrix": [5, 12], "x": 9, "y": 1.5},
+ {"matrix": [5, 5], "x": 10, "y": 1.5},
+ {"matrix": [4, 5], "x": 11, "y": 1.5},
+ {"matrix": [4, 11], "x": 12, "y": 1.5},
+ {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [4, 17], "x": 15.25, "y": 1.5},
+ {"matrix": [4, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [4, 4], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 6], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [7, 6], "x": 1.5, "y": 2.5},
+ {"matrix": [7, 7], "x": 2.5, "y": 2.5},
+ {"matrix": [7, 8], "x": 3.5, "y": 2.5},
+ {"matrix": [7, 9], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+ {"matrix": [7, 10], "x": 7.5, "y": 2.5},
+ {"matrix": [7, 11], "x": 8.5, "y": 2.5},
+ {"matrix": [7, 12], "x": 9.5, "y": 2.5},
+ {"matrix": [7, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 16], "x": 15.25, "y": 2.5},
+ {"matrix": [5, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [5, 4], "x": 17.25, "y": 2.5},
+
+ {"matrix": [2, 7], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 6], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 4.75, "y": 3.5},
+ {"matrix": [6, 9], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 10], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [1, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [2, 1], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [1, 6], "x": 2.25, "y": 4.5},
+ {"matrix": [1, 7], "x": 3.25, "y": 4.5},
+ {"matrix": [1, 8], "x": 4.25, "y": 4.5},
+ {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+ {"matrix": [0, 9], "x": 6.25, "y": 4.5},
+ {"matrix": [0, 10], "x": 7.25, "y": 4.5},
+ {"matrix": [1, 10], "x": 8.25, "y": 4.5},
+ {"matrix": [1, 11], "x": 9.25, "y": 4.5},
+ {"matrix": [1, 12], "x": 10.25, "y": 4.5},
+ {"matrix": [0, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [3, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [6, 2], "x": 16.25, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 13], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 13], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [6, 16], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [0, 13], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [3, 13], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 15], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [0, 2], "x": 15.25, "y": 5.5},
+ {"matrix": [0, 16], "x": 16.25, "y": 5.5},
+ {"matrix": [0, 17], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bpiphany/unloved_bastard/rules.mk b/keyboards/bpiphany/unloved_bastard/rules.mk
index 7a32c860327..8784813b335 100644
--- a/keyboards/bpiphany/unloved_bastard/rules.mk
+++ b/keyboards/bpiphany/unloved_bastard/rules.mk
@@ -1,15 +1,2 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-SLEEP_LED_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index b49e0a11cd5..d7ce751a649 100644
--- a/keyboards/bt66tech/bt66tech60/config.h
+++ b/keyboards/bt66tech/bt66tech60/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 1
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define WS2812_SPI_DRIVER SPID2
#define WS2812_SPI_MOSI_PAL_MODE 5
/*
diff --git a/keyboards/bt66tech/bt66tech60/keyboard.json b/keyboards/bt66tech/bt66tech60/keyboard.json
index 0eeb488edef..778e27fe67a 100644
--- a/keyboards/bt66tech/bt66tech60/keyboard.json
+++ b/keyboards/bt66tech/bt66tech60/keyboard.json
@@ -20,6 +20,12 @@
"rgblight": true,
"sleep_led": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12"],
"rows": ["B10", "B1", "B0", "A7", "A6"]
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h
deleted file mode 100644
index de1b75d0d66..00000000000
--- a/keyboards/bubble75/hotswap/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Velocifire
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/bubble75/hotswap/hotswap.c b/keyboards/bubble75/hotswap/hotswap.c
index 30c908a79f0..fc10b0fc8ca 100644
--- a/keyboards/bubble75/hotswap/hotswap.c
+++ b/keyboards/bubble75/hotswap/hotswap.c
@@ -17,34 +17,6 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = {
- {
- /* Key Matrix to LED Index */
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NO_LED, 13 },
- { 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
- { 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43 },
- { 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, NO_LED, 44 },
- { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, NO_LED, 70, 71 },
- { 80, 79, 78, NO_LED, NO_LED, 77, NO_LED, NO_LED, 76, 75, NO_LED, 74, NO_LED, 73, 72 }
- }, {
- /* LED Index to Physical Position */
- // Switch LEDs
- {0,0}, {23,0}, {38,0}, {54,0}, {69,0}, {75,0}, {90,0}, {105,0}, {120,0}, {143,0}, {158,0}, {173,0}, {188,0}, {225,0},
- {225,18}, {203,18}, {180,18}, {165,18}, {150,18}, {135,18}, {120,18}, {105,18}, {90,18}, {75,18}, {60,18}, {45,18}, {30,18}, {15,18}, {0,18},
- {4,30}, {19,30}, {34,30}, {49,30}, {64,30}, {79,30}, {84,30}, {99,30}, {114,30}, {129,30}, {144,30}, {159,30}, {174,30}, {219,30}, {225,30},
- {225,41}, {201,41}, {191,41}, {161,41}, {146,41}, {131,41}, {116,41}, {101,41}, {86,41}, {71,41}, {56,41}, {41,41}, {26,41}, {6,41},
- {13,52}, {34,52}, {49,52}, {64,52}, {79,52}, {94,52}, {109,52}, {124,52}, {139,52}, {154,52}, {169,52}, {189,52}, {210,52}, {225,52},
- {225,64}, {210,64}, {195,64}, {186,64}, {167,64}, {94,64}, {39,64}, {21,64}, {2,64},
- }, {
- 4,4,4,4,4,4,4,4,4,4,4,4, 4,4,
- 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
- 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
- 4,4,4,4,4,4,4,4,4,4,4,4,4, 4,
- 4,4,4,4,4,4,4,4,4,4,4,4, 4,4,
- 4,4,4, 4, 4,4, 4, 4,4,
- }
-};
-
bool rgb_matrix_indicators_kb(void) {
if (!rgb_matrix_indicators_user()) {
return false;
@@ -54,6 +26,4 @@ bool rgb_matrix_indicators_kb(void) {
}
return true;
}
-
-
#endif
diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json
deleted file mode 100644
index 99cfc4064e0..00000000000
--- a/keyboards/bubble75/hotswap/info.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
- "keyboard_name": "bubble75",
- "url": "",
- "manufacturer": "phl",
- "maintainer": "velocifire",
- "usb": {
- "vid": "0x4242",
- "pid": "0x5A4C",
- "device_version": "0.0.1",
- "force_nkro": true
- },
- "ws2812": {
- "pin": "B7"
- },
- "rgb_matrix": {
- "animations": {
- "breathing": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "raindrops": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "driver": "ws2812",
- "max_brightness": 180
- },
- "matrix_pins": {
- "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
- "rows": ["F4", "F5", "F6", "F7", "C7", "F1"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "K001", "matrix": [0, 1], "x": 1.5, "y": 0},
- {"label": "K002", "matrix": [0, 2], "x": 2.5, "y": 0},
- {"label": "K003", "matrix": [0, 3], "x": 3.5, "y": 0},
- {"label": "K004", "matrix": [0, 4], "x": 4.5, "y": 0},
-
- {"label": "K005", "matrix": [0, 5], "x": 6, "y": 0},
- {"label": "K006", "matrix": [0, 6], "x": 7, "y": 0},
- {"label": "K007", "matrix": [0, 7], "x": 8, "y": 0},
- {"label": "K008", "matrix": [0, 8], "x": 9, "y": 0},
-
- {"label": "K009", "matrix": [0, 9], "x": 10.5, "y": 0},
- {"label": "K010", "matrix": [0, 10], "x": 11.5, "y": 0},
- {"label": "K011", "matrix": [0, 11], "x": 12.5, "y": 0},
- {"label": "K012", "matrix": [0, 12], "x": 13.5, "y": 0},
-
- {"label": "K014", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.5},
- {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.5},
- {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.5},
- {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.5},
- {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.5},
- {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.5},
- {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.5},
- {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.5},
- {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.5},
- {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.5},
- {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.5},
- {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.5},
- {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.5},
- {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
- {"label": "K114", "matrix": [1, 14], "x": 15, "y": 1.5},
-
- {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
- {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.5},
- {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.5},
- {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.5},
- {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.5},
- {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.5},
- {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.5},
- {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.5},
- {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.5},
- {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.5},
- {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.5},
- {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.5},
- {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
- {"label": "K214", "matrix": [2, 14], "x": 15, "y": 2.5},
-
- {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
- {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.5},
- {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.5},
- {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.5},
- {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.5},
- {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.5},
- {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.5},
- {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.5},
- {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.5},
- {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.5},
- {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.5},
- {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.5},
- {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
- {"label": "K314", "matrix": [3, 14], "x": 15, "y": 3.5},
-
- {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
- {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.5},
- {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.5},
- {"label": "K403", "matrix": [4, 3], "x": 4.25, "y": 4.5},
- {"label": "K404", "matrix": [4, 4], "x": 5.25, "y": 4.5},
- {"label": "K405", "matrix": [4, 5], "x": 6.25, "y": 4.5},
- {"label": "K406", "matrix": [4, 6], "x": 7.25, "y": 4.5},
- {"label": "K407", "matrix": [4, 7], "x": 8.25, "y": 4.5},
- {"label": "K408", "matrix": [4, 8], "x": 9.25, "y": 4.5},
- {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.5},
- {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.5},
- {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
- {"label": "K413", "matrix": [4, 13], "x": 14, "y": 4.5},
- {"label": "K414", "matrix": [4, 14], "x": 15, "y": 4.5},
-
- {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"label": "K505", "matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
- {"label": "K508", "matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
- {"label": "K509", "matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25},
- {"label": "K511", "matrix": [5, 11], "x": 13, "y": 5.5},
- {"label": "K513", "matrix": [5, 13], "x": 14, "y": 5.5},
- {"label": "K514", "matrix": [5, 14], "x": 15, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/bubble75/hotswap/keyboard.json b/keyboards/bubble75/hotswap/keyboard.json
new file mode 100644
index 00000000000..011ce33ec40
--- /dev/null
+++ b/keyboards/bubble75/hotswap/keyboard.json
@@ -0,0 +1,247 @@
+{
+ "keyboard_name": "bubble75",
+ "url": "",
+ "manufacturer": "phl",
+ "maintainer": "velocifire",
+ "usb": {
+ "vid": "0x4242",
+ "pid": "0x5A4C",
+ "device_version": "0.0.1",
+ "force_nkro": true,
+ "no_startup_check": true
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "ws2812": {
+ "pin": "B7"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "raindrops": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "driver": "ws2812",
+ "max_brightness": 180,
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 23, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 38, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 54, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 69, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 120, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 143, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 158, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 173, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 188, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 225, "y": 0, "flags": 4},
+ {"matrix": [1, 14], "x": 225, "y": 18, "flags": 4},
+ {"matrix": [1, 13], "x": 203, "y": 18, "flags": 4},
+ {"matrix": [1, 12], "x": 180, "y": 18, "flags": 4},
+ {"matrix": [1, 11], "x": 165, "y": 18, "flags": 4},
+ {"matrix": [1, 10], "x": 150, "y": 18, "flags": 4},
+ {"matrix": [1, 9], "x": 135, "y": 18, "flags": 4},
+ {"matrix": [1, 8], "x": 120, "y": 18, "flags": 4},
+ {"matrix": [1, 7], "x": 105, "y": 18, "flags": 4},
+ {"matrix": [1, 6], "x": 90, "y": 18, "flags": 4},
+ {"matrix": [1, 5], "x": 75, "y": 18, "flags": 4},
+ {"matrix": [1, 4], "x": 60, "y": 18, "flags": 4},
+ {"matrix": [1, 3], "x": 45, "y": 18, "flags": 4},
+ {"matrix": [1, 2], "x": 30, "y": 18, "flags": 4},
+ {"matrix": [1, 1], "x": 15, "y": 18, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 18, "flags": 4},
+ {"matrix": [2, 0], "x": 4, "y": 30, "flags": 4},
+ {"matrix": [2, 1], "x": 19, "y": 30, "flags": 4},
+ {"matrix": [2, 2], "x": 34, "y": 30, "flags": 4},
+ {"matrix": [2, 3], "x": 49, "y": 30, "flags": 4},
+ {"matrix": [2, 4], "x": 64, "y": 30, "flags": 4},
+ {"matrix": [2, 5], "x": 79, "y": 30, "flags": 4},
+ {"matrix": [2, 6], "x": 84, "y": 30, "flags": 4},
+ {"matrix": [2, 7], "x": 99, "y": 30, "flags": 4},
+ {"matrix": [2, 8], "x": 114, "y": 30, "flags": 4},
+ {"matrix": [2, 9], "x": 129, "y": 30, "flags": 4},
+ {"matrix": [2, 10], "x": 144, "y": 30, "flags": 4},
+ {"matrix": [2, 11], "x": 159, "y": 30, "flags": 4},
+ {"matrix": [2, 12], "x": 174, "y": 30, "flags": 4},
+ {"matrix": [2, 13], "x": 219, "y": 30, "flags": 4},
+ {"matrix": [2, 14], "x": 225, "y": 30, "flags": 4},
+ {"matrix": [3, 14], "x": 225, "y": 41, "flags": 4},
+ {"matrix": [3, 12], "x": 201, "y": 41, "flags": 4},
+ {"matrix": [3, 11], "x": 191, "y": 41, "flags": 4},
+ {"matrix": [3, 10], "x": 161, "y": 41, "flags": 4},
+ {"matrix": [3, 9], "x": 146, "y": 41, "flags": 4},
+ {"matrix": [3, 8], "x": 131, "y": 41, "flags": 4},
+ {"matrix": [3, 7], "x": 116, "y": 41, "flags": 4},
+ {"matrix": [3, 6], "x": 101, "y": 41, "flags": 4},
+ {"matrix": [3, 5], "x": 86, "y": 41, "flags": 4},
+ {"matrix": [3, 4], "x": 71, "y": 41, "flags": 4},
+ {"matrix": [3, 3], "x": 56, "y": 41, "flags": 4},
+ {"matrix": [3, 2], "x": 41, "y": 41, "flags": 4},
+ {"matrix": [3, 1], "x": 26, "y": 41, "flags": 4},
+ {"matrix": [3, 0], "x": 6, "y": 41, "flags": 4},
+ {"matrix": [4, 0], "x": 13, "y": 52, "flags": 4},
+ {"matrix": [4, 1], "x": 34, "y": 52, "flags": 4},
+ {"matrix": [4, 2], "x": 49, "y": 52, "flags": 4},
+ {"matrix": [4, 3], "x": 64, "y": 52, "flags": 4},
+ {"matrix": [4, 4], "x": 79, "y": 52, "flags": 4},
+ {"matrix": [4, 5], "x": 94, "y": 52, "flags": 4},
+ {"matrix": [4, 6], "x": 109, "y": 52, "flags": 4},
+ {"matrix": [4, 7], "x": 124, "y": 52, "flags": 4},
+ {"matrix": [4, 8], "x": 139, "y": 52, "flags": 4},
+ {"matrix": [4, 9], "x": 154, "y": 52, "flags": 4},
+ {"matrix": [4, 10], "x": 169, "y": 52, "flags": 4},
+ {"matrix": [4, 11], "x": 189, "y": 52, "flags": 4},
+ {"matrix": [4, 13], "x": 210, "y": 52, "flags": 4},
+ {"matrix": [4, 14], "x": 225, "y": 52, "flags": 4},
+ {"matrix": [5, 14], "x": 225, "y": 64, "flags": 4},
+ {"matrix": [5, 13], "x": 210, "y": 64, "flags": 4},
+ {"matrix": [5, 11], "x": 195, "y": 64, "flags": 4},
+ {"matrix": [5, 9], "x": 186, "y": 64, "flags": 4},
+ {"matrix": [5, 8], "x": 167, "y": 64, "flags": 4},
+ {"matrix": [5, 5], "x": 94, "y": 64, "flags": 4},
+ {"matrix": [5, 2], "x": 39, "y": 64, "flags": 4},
+ {"matrix": [5, 1], "x": 21, "y": 64, "flags": 4},
+ {"matrix": [5, 0], "x": 2, "y": 64, "flags": 4}
+ ]
+ },
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
+ "rows": ["F4", "F5", "F6", "F7", "C7", "F1"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "K001", "matrix": [0, 1], "x": 1.5, "y": 0},
+ {"label": "K002", "matrix": [0, 2], "x": 2.5, "y": 0},
+ {"label": "K003", "matrix": [0, 3], "x": 3.5, "y": 0},
+ {"label": "K004", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+ {"label": "K005", "matrix": [0, 5], "x": 6, "y": 0},
+ {"label": "K006", "matrix": [0, 6], "x": 7, "y": 0},
+ {"label": "K007", "matrix": [0, 7], "x": 8, "y": 0},
+ {"label": "K008", "matrix": [0, 8], "x": 9, "y": 0},
+
+ {"label": "K009", "matrix": [0, 9], "x": 10.5, "y": 0},
+ {"label": "K010", "matrix": [0, 10], "x": 11.5, "y": 0},
+ {"label": "K011", "matrix": [0, 11], "x": 12.5, "y": 0},
+ {"label": "K012", "matrix": [0, 12], "x": 13.5, "y": 0},
+
+ {"label": "K014", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.5},
+ {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.5},
+ {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.5},
+ {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.5},
+ {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.5},
+ {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.5},
+ {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.5},
+ {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.5},
+ {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.5},
+ {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.5},
+ {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.5},
+ {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.5},
+ {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.5},
+ {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+ {"label": "K114", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+ {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"label": "K214", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+ {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"label": "K314", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+ {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"label": "K403", "matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"label": "K404", "matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"label": "K405", "matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"label": "K406", "matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"label": "K407", "matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"label": "K408", "matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"label": "K413", "matrix": [4, 13], "x": 14, "y": 4.5},
+ {"label": "K414", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+ {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"label": "K505", "matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"label": "K508", "matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+ {"label": "K509", "matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"label": "K511", "matrix": [5, 11], "x": 13, "y": 5.5},
+ {"label": "K513", "matrix": [5, 13], "x": 14, "y": 5.5},
+ {"label": "K514", "matrix": [5, 14], "x": 15, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/bubble75/hotswap/rules.mk b/keyboards/bubble75/hotswap/rules.mk
deleted file mode 100644
index c11ab0df94c..00000000000
--- a/keyboards/bubble75/hotswap/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-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
-AUDIO_ENABLE = no # Audio output
-
-RGB_MATRIX_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
\ No newline at end of file
diff --git a/keyboards/budgy/info.json b/keyboards/budgy/info.json
deleted file mode 100644
index 5903daa68d0..00000000000
--- a/keyboards/budgy/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "manufacturer": "KeyboardDweebs",
- "keyboard_name": "budgy",
- "maintainer": "doesntfazer",
- "bootloader": "rp2040",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true
- },
- "processor": "RP2040",
- "url": "",
- "usb": {
- "device_version": "1.0.0",
- "pid": "0x0117",
- "vid": "0xFABE"
- },
- "matrix_pins": {
- "direct": [
- ["GP6", "GP5", "GP4", "GP3", "GP2"],
- ["GP11", "GP10", "GP9", "GP8", "GP7"],
- ["GP15", "GP14", "GP13", "GP12", "GP16"],
- ["GP17", "GP18", null, null, null]
- ]
- },
- "split": {
- "matrix_pins": {
- "right": {
- "direct": [
- ["GP2", "GP3", "GP4", "GP5", "GP6"],
- ["GP7", "GP8", "GP9", "GP10", "GP11"],
- ["GP16", "GP12", "GP13", "GP14", "GP15"],
- ["GP18", "GP17", null, null, null]
- ]
- }
- }
- },
- "community_layouts": ["split_3x5_2"],
- "layouts": {
- "LAYOUT_split_3x5_2": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.25},
- {"matrix": [0, 1], "x": 1, "y": 0.25},
- {"matrix": [0, 2], "x": 2, "y": 0.125},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.125},
- {"matrix": [4, 0], "x": 8, "y": 0.25},
- {"matrix": [4, 1], "x": 9, "y": 0.125},
- {"matrix": [4, 2], "x": 10, "y": 0},
- {"matrix": [4, 3], "x": 11, "y": 0.125},
- {"matrix": [4, 4], "x": 12, "y": 0.25},
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.125},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.125},
- {"matrix": [5, 0], "x": 8, "y": 1.25},
- {"matrix": [5, 1], "x": 9, "y": 1.125},
- {"matrix": [5, 2], "x": 10, "y": 1},
- {"matrix": [5, 3], "x": 11, "y": 1.125},
- {"matrix": [5, 4], "x": 12, "y": 1.25},
- {"matrix": [2, 0], "x": 0, "y": 2.25},
- {"matrix": [2, 1], "x": 1, "y": 2.25},
- {"matrix": [2, 2], "x": 2, "y": 2.125},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.125},
- {"matrix": [6, 0], "x": 8, "y": 2.25},
- {"matrix": [6, 1], "x": 9, "y": 2.125},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 3], "x": 11, "y": 2.125},
- {"matrix": [6, 4], "x": 12, "y": 2.25},
- {"matrix": [3, 0], "x": 3.5, "y": 3.25},
- {"matrix": [3, 1], "x": 4.5, "y": 3.5},
- {"matrix": [7, 0], "x": 7.5, "y": 3.75},
- {"matrix": [7, 1], "x": 8.5, "y": 3.5}
- ]
- }
- }
-}
diff --git a/keyboards/budgy/keyboard.json b/keyboards/budgy/keyboard.json
new file mode 100644
index 00000000000..645336e8ad9
--- /dev/null
+++ b/keyboards/budgy/keyboard.json
@@ -0,0 +1,83 @@
+{
+ "manufacturer": "KeyboardDweebs",
+ "keyboard_name": "budgy",
+ "maintainer": "doesntfazer",
+ "bootloader": "rp2040",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "processor": "RP2040",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0117",
+ "vid": "0xFABE"
+ },
+ "matrix_pins": {
+ "direct": [
+ ["GP6", "GP5", "GP4", "GP3", "GP2"],
+ ["GP11", "GP10", "GP9", "GP8", "GP7"],
+ ["GP15", "GP14", "GP13", "GP12", "GP16"],
+ ["GP17", "GP18", null, null, null]
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "matrix_pins": {
+ "right": {
+ "direct": [
+ ["GP2", "GP3", "GP4", "GP5", "GP6"],
+ ["GP7", "GP8", "GP9", "GP10", "GP11"],
+ ["GP16", "GP12", "GP13", "GP14", "GP15"],
+ ["GP18", "GP17", null, null, null]
+ ]
+ }
+ }
+ },
+ "community_layouts": ["split_3x5_2"],
+ "layouts": {
+ "LAYOUT_split_3x5_2": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.25},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [4, 0], "x": 8, "y": 0.25},
+ {"matrix": [4, 1], "x": 9, "y": 0.125},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0.125},
+ {"matrix": [4, 4], "x": 12, "y": 0.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [5, 0], "x": 8, "y": 1.25},
+ {"matrix": [5, 1], "x": 9, "y": 1.125},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 3], "x": 11, "y": 1.125},
+ {"matrix": [5, 4], "x": 12, "y": 1.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [6, 0], "x": 8, "y": 2.25},
+ {"matrix": [6, 1], "x": 9, "y": 2.125},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2.125},
+ {"matrix": [6, 4], "x": 12, "y": 2.25},
+ {"matrix": [3, 0], "x": 3.5, "y": 3.25},
+ {"matrix": [3, 1], "x": 4.5, "y": 3.5},
+ {"matrix": [7, 0], "x": 7.5, "y": 3.75},
+ {"matrix": [7, 1], "x": 8.5, "y": 3.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/budgy/rules.mk b/keyboards/budgy/rules.mk
index 95546c6ef58..161ec22b16e 100644
--- a/keyboards/budgy/rules.mk
+++ b/keyboards/budgy/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = vendor
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
deleted file mode 100644
index 5b25baa8c4b..00000000000
--- a/keyboards/buildakb/potato65/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 Maelkk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/buildakb/potato65/keyboard.json b/keyboards/buildakb/potato65/keyboard.json
index 1aeba49bde2..db203531424 100644
--- a/keyboards/buildakb/potato65/keyboard.json
+++ b/keyboards/buildakb/potato65/keyboard.json
@@ -39,6 +39,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
"rows": ["E6", "B7", "F7", "F4", "F5"]
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
deleted file mode 100644
index d60fc7af019..00000000000
--- a/keyboards/buildakb/potato65hs/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Maelkk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/buildakb/potato65hs/keyboard.json b/keyboards/buildakb/potato65hs/keyboard.json
index 61ecd61a150..9e5edd6adb4 100644
--- a/keyboards/buildakb/potato65hs/keyboard.json
+++ b/keyboards/buildakb/potato65hs/keyboard.json
@@ -39,6 +39,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
"rows": ["F5", "F4", "F6", "F0", "D2"]
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
deleted file mode 100644
index d60fc7af019..00000000000
--- a/keyboards/buildakb/potato65s/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Maelkk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/buildakb/potato65s/keyboard.json b/keyboards/buildakb/potato65s/keyboard.json
index 915f9674268..8dd9b6cc53c 100644
--- a/keyboards/buildakb/potato65s/keyboard.json
+++ b/keyboards/buildakb/potato65s/keyboard.json
@@ -39,6 +39,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
"rows": ["F5", "F4", "F6", "F0", "D2"]
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index 36313a1c6a2..a040e92dfd5 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -3,11 +3,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#ifdef OLED_ENABLE
#define OLED_DISPLAY_128X32
#endif
diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json
deleted file mode 100644
index 0e7d246ae37..00000000000
--- a/keyboards/buzzard/rev1/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
- "keyboard_name": "Buzzard",
- "manufacturer": "crehmann",
- "url": "https://github.com/crehmann/buzzard",
- "maintainer": "crehmann",
- "usb": {
- "vid": "0xFEED",
- "pid": "0xB077",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B1", "B3", "B2", "B6", "B5", "B4"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2",
- "transport": {
- "sync": {
- "oled": true
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 4], "x": 1, "y": 0},
- {"matrix": [0, 3], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 1], "x": 4, "y": 0},
- {"matrix": [0, 0], "x": 5, "y": 0},
-
- {"matrix": [4, 0], "x": 11, "y": 0},
- {"matrix": [4, 1], "x": 12, "y": 0},
- {"matrix": [4, 2], "x": 13, "y": 0},
- {"matrix": [4, 3], "x": 14, "y": 0},
- {"matrix": [4, 4], "x": 15, "y": 0},
-
- {"matrix": [1, 5], "x": 0, "y": 1},
- {"matrix": [1, 4], "x": 1, "y": 1},
- {"matrix": [1, 3], "x": 2, "y": 1},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 1], "x": 4, "y": 1},
- {"matrix": [1, 0], "x": 5, "y": 1},
-
- {"matrix": [5, 0], "x": 11, "y": 1},
- {"matrix": [5, 1], "x": 12, "y": 1},
- {"matrix": [5, 2], "x": 13, "y": 1},
- {"matrix": [5, 3], "x": 14, "y": 1},
- {"matrix": [5, 4], "x": 15, "y": 1},
- {"matrix": [5, 5], "x": 16, "y": 1},
-
- {"matrix": [2, 5], "x": 0, "y": 2},
- {"matrix": [2, 4], "x": 1, "y": 2},
- {"matrix": [2, 3], "x": 2, "y": 2},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 1], "x": 4, "y": 2},
- {"matrix": [2, 0], "x": 5, "y": 2},
-
- {"matrix": [6, 0], "x": 11, "y": 2},
- {"matrix": [6, 1], "x": 12, "y": 2},
- {"matrix": [6, 2], "x": 13, "y": 2},
- {"matrix": [6, 3], "x": 14, "y": 2},
- {"matrix": [6, 4], "x": 15, "y": 2},
- {"matrix": [6, 5], "x": 16, "y": 2},
-
- {"matrix": [3, 2], "x": 5, "y": 3},
- {"matrix": [3, 1], "x": 6, "y": 3},
- {"matrix": [3, 0], "x": 7, "y": 3},
-
- {"matrix": [7, 0], "x": 9, "y": 3},
- {"matrix": [7, 1], "x": 10, "y": 3},
- {"matrix": [7, 2], "x": 11, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/buzzard/rev1/keyboard.json b/keyboards/buzzard/rev1/keyboard.json
new file mode 100644
index 00000000000..dd17a82754b
--- /dev/null
+++ b/keyboards/buzzard/rev1/keyboard.json
@@ -0,0 +1,95 @@
+{
+ "keyboard_name": "Buzzard",
+ "manufacturer": "crehmann",
+ "url": "https://github.com/crehmann/buzzard",
+ "maintainer": "crehmann",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xB077",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "ps2": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B1", "B3", "B2", "B6", "B5", "B4"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "transport": {
+ "sync": {
+ "oled": true
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+
+ {"matrix": [4, 0], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 3], "x": 14, "y": 0},
+ {"matrix": [4, 4], "x": 15, "y": 0},
+
+ {"matrix": [1, 5], "x": 0, "y": 1},
+ {"matrix": [1, 4], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+
+ {"matrix": [5, 0], "x": 11, "y": 1},
+ {"matrix": [5, 1], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1},
+ {"matrix": [5, 3], "x": 14, "y": 1},
+ {"matrix": [5, 4], "x": 15, "y": 1},
+ {"matrix": [5, 5], "x": 16, "y": 1},
+
+ {"matrix": [2, 5], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+
+ {"matrix": [6, 0], "x": 11, "y": 2},
+ {"matrix": [6, 1], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2},
+ {"matrix": [6, 3], "x": 14, "y": 2},
+ {"matrix": [6, 4], "x": 15, "y": 2},
+ {"matrix": [6, 5], "x": 16, "y": 2},
+
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 7, "y": 3},
+
+ {"matrix": [7, 0], "x": 9, "y": 3},
+ {"matrix": [7, 1], "x": 10, "y": 3},
+ {"matrix": [7, 2], "x": 11, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/buzzard/rev1/rules.mk b/keyboards/buzzard/rev1/rules.mk
index 2beb545ece1..848877e3751 100644
--- a/keyboards/buzzard/rev1/rules.mk
+++ b/keyboards/buzzard/rev1/rules.mk
@@ -1,2 +1 @@
-PS2_ENABLE = yes
PS2_DRIVER = interrupt
diff --git a/keyboards/buzzard/rules.mk b/keyboards/buzzard/rules.mk
index c0b4e9943d2..2f66720b774 100644
--- a/keyboards/buzzard/rules.mk
+++ b/keyboards/buzzard/rules.mk
@@ -1,16 +1 @@
-# 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
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
-
DEFAULT_FOLDER = buzzard/rev1
diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json
index 49aaaddd525..3f5e92a99c9 100644
--- a/keyboards/cannonkeys/is0gr/info.json
+++ b/keyboards/cannonkeys/is0gr/info.json
@@ -18,8 +18,8 @@
"url": "https://cannonkeys.com",
"usb": {
"device_version": "0.0.1",
- "pid": "0x0028",
- "vid": "0xCA04"
+ "pid": "0xCA04",
+ "vid": "0x0028"
},
"community_layouts": ["ortho_1x1"],
"layouts": {
diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json
index 9a0945258f5..a9d84e6c8f4 100644
--- a/keyboards/cantor/info.json
+++ b/keyboards/cantor/info.json
@@ -26,6 +26,7 @@
]
},
"split": {
+ "enabled": true,
"bootmagic": {
"matrix": [4, 5]
},
diff --git a/keyboards/cantor/rules.mk b/keyboards/cantor/rules.mk
index 6bd8b9bf770..c6e29883213 100644
--- a/keyboards/cantor/rules.mk
+++ b/keyboards/cantor/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c
index 4dfa570cbcc..9bd7f227dc1 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _CL: Control layer
*/
[_CL] = LAYOUT_66_ansi(
- BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI,
+ LM_NEXT,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI,
_______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD,
_______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,
_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI,
diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
index 2a1a7722721..07f7d0f7dea 100644
--- a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
+++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c
@@ -68,11 +68,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Keymap _CL: Control layer
*/
[_CL] = LAYOUT(
- BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, BL_TOGG, BL_UP,
- _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN,
+ LM_NEXT,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, LM_TOGG, LM_BRIU,
+ _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, LM_BRID,
_______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,
_______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI,
- _______,_______,_______, BL_BRTG,BL_BRTG, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
+ _______,_______,_______, _______,_______, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI),
};
diff --git a/keyboards/compensator/keyboard.json b/keyboards/compensator/keyboard.json
index ceaa1763338..fbba0d750e8 100644
--- a/keyboards/compensator/keyboard.json
+++ b/keyboards/compensator/keyboard.json
@@ -28,8 +28,7 @@
"layer_count": 3
},
"indicators": {
- "caps_lock": "E6",
- "on_state": 0
+ "caps_lock": "E6"
},
"layouts": {
"LAYOUT": {
diff --git a/keyboards/compensator/keymaps/default/keymap.c b/keyboards/compensator/keymaps/default/keymap.c
index 5e39c20e72f..0bdf18496a8 100644
--- a/keyboards/compensator/keymaps/default/keymap.c
+++ b/keyboards/compensator/keymaps/default/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
- KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2,
+ KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2,
KC_F3, KC_F4, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_F3, KC_F4,
KC_F5, KC_F6, KC_PENT, KC_P1, KC_P2, KC_P3, KC_NO, KC_UP, KC_NO, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_NO, KC_UP, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_F5, KC_F6,
KC_F7, KC_F8, KC_PMNS, KC_PDOT, KC_P0, KC_P00, KC_LEFT, KC_DOWN, KC_RIGHT, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P00, KC_P0, KC_PDOT, KC_PMNS, KC_F7, KC_F8
diff --git a/keyboards/compensator/keymaps/via/keymap.c b/keyboards/compensator/keymaps/via/keymap.c
index d9124a96aff..a7285b32577 100644
--- a/keyboards/compensator/keymaps/via/keymap.c
+++ b/keyboards/compensator/keymaps/via/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
- KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2,
+ KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2,
KC_F3, KC_F4, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_F3, KC_F4,
KC_F5, KC_F6, KC_PENT, KC_P1, KC_P2, KC_P3, KC_NO, KC_UP, KC_NO, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_NO, KC_UP, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_F5, KC_F6,
KC_F7, KC_F8, KC_PMNS, KC_PDOT, KC_P0, KC_P00, KC_LEFT, KC_DOWN, KC_RIGHT, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P00, KC_P0, KC_PDOT, KC_PMNS, KC_F7, KC_F8
diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json
deleted file mode 100644
index 622e534864b..00000000000
--- a/keyboards/dailycraft/claw44/rev1/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
- "keyboard_name": "claw44",
- "manufacturer": "yfuku",
- "url": "",
- "maintainer": "yfuku",
- "usb": {
- "vid": "0x5946",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
- "rows": ["D4", "C6", "D7", "E6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 1.18},
- {"matrix": [0, 1], "x": 1, "y": 1.03},
- {"matrix": [0, 2], "x": 2, "y": 0.35},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.05},
- {"matrix": [0, 5], "x": 5, "y": 0.1},
-
- {"matrix": [4, 5], "x": 11.5, "y": 0.1},
- {"matrix": [4, 4], "x": 12.5, "y": 0.05},
- {"matrix": [4, 3], "x": 13.5, "y": 0},
- {"matrix": [4, 2], "x": 14.5, "y": 0.35},
- {"matrix": [4, 1], "x": 15.5, "y": 1.08},
- {"matrix": [4, 0], "x": 16.5, "y": 1.18},
-
- {"matrix": [1, 0], "x": 0, "y": 2.18},
- {"matrix": [1, 1], "x": 1, "y": 2.03},
- {"matrix": [1, 2], "x": 2, "y": 1.35},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.05},
- {"matrix": [1, 5], "x": 5, "y": 1.1},
-
- {"matrix": [5, 5], "x": 11.5, "y": 1.1},
- {"matrix": [5, 4], "x": 12.5, "y": 1.05},
- {"matrix": [5, 3], "x": 13.5, "y": 1},
- {"matrix": [5, 2], "x": 14.5, "y": 1.35},
- {"matrix": [5, 1], "x": 15.5, "y": 2.03},
- {"matrix": [5, 0], "x": 16.5, "y": 2.18},
-
- {"matrix": [2, 0], "x": 0, "y": 3.18},
- {"matrix": [2, 1], "x": 1, "y": 3.03},
- {"matrix": [2, 2], "x": 2, "y": 2.35},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.05},
- {"matrix": [2, 5], "x": 5, "y": 2.1},
-
- {"matrix": [6, 5], "x": 11.5, "y": 2.1},
- {"matrix": [6, 4], "x": 12.5, "y": 2.05},
- {"matrix": [6, 3], "x": 13.5, "y": 2},
- {"matrix": [6, 2], "x": 14.5, "y": 2.35},
- {"matrix": [6, 1], "x": 15.5, "y": 3.03},
- {"matrix": [6, 0], "x": 16.5, "y": 3.18},
-
- {"matrix": [3, 2], "x": 4, "y": 3.05},
- {"matrix": [3, 3], "x": 5, "y": 3.1},
- {"matrix": [3, 4], "x": 6, "y": 3.2, "w": 1.25},
-
- {"matrix": [3, 5], "x": 7.25, "y": 3.5},
-
- {"matrix": [7, 5], "x": 9.25, "y": 3.5},
- {"matrix": [7, 4], "x": 10.25, "y": 3.2, "w": 1.25},
- {"matrix": [7, 3], "x": 11.5, "y": 3.1},
- {"matrix": [7, 2], "x": 12.5, "y": 3.05}
- ]
- }
- }
-}
diff --git a/keyboards/dailycraft/claw44/rev1/keyboard.json b/keyboards/dailycraft/claw44/rev1/keyboard.json
new file mode 100644
index 00000000000..724cf5979fb
--- /dev/null
+++ b/keyboards/dailycraft/claw44/rev1/keyboard.json
@@ -0,0 +1,85 @@
+{
+ "keyboard_name": "claw44",
+ "manufacturer": "yfuku",
+ "url": "",
+ "maintainer": "yfuku",
+ "usb": {
+ "vid": "0x5946",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 1.18},
+ {"matrix": [0, 1], "x": 1, "y": 1.03},
+ {"matrix": [0, 2], "x": 2, "y": 0.35},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.05},
+ {"matrix": [0, 5], "x": 5, "y": 0.1},
+
+ {"matrix": [4, 5], "x": 11.5, "y": 0.1},
+ {"matrix": [4, 4], "x": 12.5, "y": 0.05},
+ {"matrix": [4, 3], "x": 13.5, "y": 0},
+ {"matrix": [4, 2], "x": 14.5, "y": 0.35},
+ {"matrix": [4, 1], "x": 15.5, "y": 1.08},
+ {"matrix": [4, 0], "x": 16.5, "y": 1.18},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.18},
+ {"matrix": [1, 1], "x": 1, "y": 2.03},
+ {"matrix": [1, 2], "x": 2, "y": 1.35},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.05},
+ {"matrix": [1, 5], "x": 5, "y": 1.1},
+
+ {"matrix": [5, 5], "x": 11.5, "y": 1.1},
+ {"matrix": [5, 4], "x": 12.5, "y": 1.05},
+ {"matrix": [5, 3], "x": 13.5, "y": 1},
+ {"matrix": [5, 2], "x": 14.5, "y": 1.35},
+ {"matrix": [5, 1], "x": 15.5, "y": 2.03},
+ {"matrix": [5, 0], "x": 16.5, "y": 2.18},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.18},
+ {"matrix": [2, 1], "x": 1, "y": 3.03},
+ {"matrix": [2, 2], "x": 2, "y": 2.35},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.05},
+ {"matrix": [2, 5], "x": 5, "y": 2.1},
+
+ {"matrix": [6, 5], "x": 11.5, "y": 2.1},
+ {"matrix": [6, 4], "x": 12.5, "y": 2.05},
+ {"matrix": [6, 3], "x": 13.5, "y": 2},
+ {"matrix": [6, 2], "x": 14.5, "y": 2.35},
+ {"matrix": [6, 1], "x": 15.5, "y": 3.03},
+ {"matrix": [6, 0], "x": 16.5, "y": 3.18},
+
+ {"matrix": [3, 2], "x": 4, "y": 3.05},
+ {"matrix": [3, 3], "x": 5, "y": 3.1},
+ {"matrix": [3, 4], "x": 6, "y": 3.2, "w": 1.25},
+
+ {"matrix": [3, 5], "x": 7.25, "y": 3.5},
+
+ {"matrix": [7, 5], "x": 9.25, "y": 3.5},
+ {"matrix": [7, 4], "x": 10.25, "y": 3.2, "w": 1.25},
+ {"matrix": [7, 3], "x": 11.5, "y": 3.1},
+ {"matrix": [7, 2], "x": 12.5, "y": 3.05}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dailycraft/claw44/rev1/rules.mk b/keyboards/dailycraft/claw44/rev1/rules.mk
deleted file mode 100644
index a66eb7d352e..00000000000
--- a/keyboards/dailycraft/claw44/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE = no # Enable one-hand typing
-
-OLED_ENABLE = no # Add OLED displays support
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/dailycraft/claw44/rules.mk b/keyboards/dailycraft/claw44/rules.mk
index 6bc66a514a3..0344b3ee285 100644
--- a/keyboards/dailycraft/claw44/rules.mk
+++ b/keyboards/dailycraft/claw44/rules.mk
@@ -1,14 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
DEFAULT_FOLDER = dailycraft/claw44/rev1
diff --git a/keyboards/dailycraft/sandbox/rev1/keyboard.json b/keyboards/dailycraft/sandbox/rev1/keyboard.json
index 8ff7c65a2f0..0a48996815e 100644
--- a/keyboards/dailycraft/sandbox/rev1/keyboard.json
+++ b/keyboards/dailycraft/sandbox/rev1/keyboard.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "oled": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json
deleted file mode 100644
index 99535b94738..00000000000
--- a/keyboards/dailycraft/sandbox/rev2/info.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "keyboard_name": "sandbox rev2",
- "manufacturer": "yfuku",
- "url": "",
- "maintainer": "yfuku",
- "usb": {
- "vid": "0x5946",
- "pid": "0x0011",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F7", "B1", "B3", "B2", "B6"],
- "rows": ["B5", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [2, 0], "x": 6, "y": 0},
- {"matrix": [2, 1], "x": 7, "y": 0},
- {"matrix": [2, 2], "x": 8, "y": 0},
- {"matrix": [2, 3], "x": 9, "y": 0},
- {"matrix": [2, 4], "x": 10, "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": [3, 0], "x": 6, "y": 1},
- {"matrix": [3, 1], "x": 7, "y": 1},
- {"matrix": [3, 2], "x": 8, "y": 1},
- {"matrix": [3, 3], "x": 9, "y": 1},
- {"matrix": [3, 4], "x": 10, "y": 1}
- ]
- }
- }
-}
diff --git a/keyboards/dailycraft/sandbox/rev2/keyboard.json b/keyboards/dailycraft/sandbox/rev2/keyboard.json
new file mode 100644
index 00000000000..d6f0ac2c2a5
--- /dev/null
+++ b/keyboards/dailycraft/sandbox/rev2/keyboard.json
@@ -0,0 +1,57 @@
+{
+ "keyboard_name": "sandbox rev2",
+ "manufacturer": "yfuku",
+ "url": "",
+ "maintainer": "yfuku",
+ "usb": {
+ "vid": "0x5946",
+ "pid": "0x0011",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["F7", "B1", "B3", "B2", "B6"],
+ "rows": ["B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "oled": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [2, 0], "x": 6, "y": 0},
+ {"matrix": [2, 1], "x": 7, "y": 0},
+ {"matrix": [2, 2], "x": 8, "y": 0},
+ {"matrix": [2, 3], "x": 9, "y": 0},
+ {"matrix": [2, 4], "x": 10, "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": [3, 0], "x": 6, "y": 1},
+ {"matrix": [3, 1], "x": 7, "y": 1},
+ {"matrix": [3, 2], "x": 8, "y": 1},
+ {"matrix": [3, 3], "x": 9, "y": 1},
+ {"matrix": [3, 4], "x": 10, "y": 1}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dailycraft/sandbox/rev2/rules.mk b/keyboards/dailycraft/sandbox/rev2/rules.mk
deleted file mode 100644
index d38a6180907..00000000000
--- a/keyboards/dailycraft/sandbox/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/dailycraft/sandbox/rules.mk b/keyboards/dailycraft/sandbox/rules.mk
index 2afb4624d12..c62f01e18f5 100644
--- a/keyboards/dailycraft/sandbox/rules.mk
+++ b/keyboards/dailycraft/sandbox/rules.mk
@@ -1,15 +1 @@
-# 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
-OLED_ENABLE = yes
-
DEFAULT_FOLDER = dailycraft/sandbox/rev2
diff --git a/keyboards/dailycraft/wings42/rev1/keyboard.json b/keyboards/dailycraft/wings42/rev1/keyboard.json
index 657c8a9e512..a32b591bd6e 100644
--- a/keyboards/dailycraft/wings42/rev1/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev1/keyboard.json
@@ -14,10 +14,16 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
"community_layouts": [
"split_3x6_3"
],
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
index 53db2db4ca6..ff665a3bb75 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
@@ -14,10 +14,16 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/dailycraft/wings42/rev2/keyboard.json b/keyboards/dailycraft/wings42/rev2/keyboard.json
index a3c3e2396ef..13f283d92b3 100644
--- a/keyboards/dailycraft/wings42/rev2/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev2/keyboard.json
@@ -14,11 +14,9 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
- "features": {
- "encoder": true
- },
"encoder": {
"rotary": [
{ "pin_a": "B5", "pin_b": "B4" },
@@ -27,6 +25,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true
+ },
"layout_aliases": {
"LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3"
},
diff --git a/keyboards/dailycraft/wings42/rules.mk b/keyboards/dailycraft/wings42/rules.mk
index 9e762b19074..b027fec9b97 100644
--- a/keyboards/dailycraft/wings42/rules.mk
+++ b/keyboards/dailycraft/wings42/rules.mk
@@ -1,16 +1 @@
-# 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
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = dailycraft/wings42/rev2
diff --git a/keyboards/dasky/reverb/info.json b/keyboards/dasky/reverb/keyboard.json
similarity index 100%
rename from keyboards/dasky/reverb/info.json
rename to keyboards/dasky/reverb/keyboard.json
diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/info.json
deleted file mode 100644
index 992b623d45c..00000000000
--- a/keyboards/dc01/arrow/info.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "keyboard_name": "DC01 Arrow",
- "manufacturer": "Mechboards",
- "url": "",
- "maintainer": "Yiancar-Designs",
- "usb": {
- "vid": "0x8968",
- "pid": "0x1012",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
-
- {"matrix": [3, 1], "x": 1, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/dc01/arrow/keyboard.json b/keyboards/dc01/arrow/keyboard.json
new file mode 100644
index 00000000000..85ca25c23e8
--- /dev/null
+++ b/keyboards/dc01/arrow/keyboard.json
@@ -0,0 +1,39 @@
+{
+ "keyboard_name": "DC01 Arrow",
+ "manufacturer": "Mechboards",
+ "url": "",
+ "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x1012",
+ "device_version": "0.0.1",
+ "no_startup_check": true
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dc01/arrow/rules.mk b/keyboards/dc01/arrow/rules.mk
index b2c66861ea5..d4c0eb26725 100644
--- a/keyboards/dc01/arrow/rules.mk
+++ b/keyboards/dc01/arrow/rules.mk
@@ -1,15 +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
-NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes # Use custom matrix
+CUSTOM_MATRIX = yes
SRC += matrix.c \
i2c_slave.c
diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/info.json
deleted file mode 100644
index 17fe3c64a28..00000000000
--- a/keyboards/dc01/left/info.json
+++ /dev/null
@@ -1,242 +0,0 @@
-{
- "keyboard_name": "DC01 Left",
- "manufacturer": "Mechboards",
- "url": "",
- "maintainer": "Yiancar-Designs",
- "usb": {
- "vid": "0x8968",
- "pid": "0x1010",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 0,
- "layouts": {
- "LAYOUT_ansi": {
- "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": [4, 5], "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 6], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [0, 17], "x": 18.5, "y": 0},
- {"matrix": [0, 18], "x": 19.5, "y": 0},
- {"matrix": [0, 19], "x": 20.5, "y": 0},
- {"matrix": [0, 20], "x": 21.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix": [1, 15], "x": 16.25, "y": 1},
- {"matrix": [1, 16], "x": 17.25, "y": 1},
-
- {"matrix": [1, 17], "x": 18.5, "y": 1},
- {"matrix": [1, 18], "x": 19.5, "y": 1},
- {"matrix": [1, 19], "x": 20.5, "y": 1},
- {"matrix": [1, 20], "x": 21.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [2, 17], "x": 18.5, "y": 2},
- {"matrix": [2, 18], "x": 19.5, "y": 2},
- {"matrix": [2, 19], "x": 20.5, "y": 2},
- {"matrix": [2, 20], "x": 21.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [3, 15], "x": 16.25, "y": 3},
-
- {"matrix": [3, 17], "x": 18.5, "y": 3},
- {"matrix": [3, 18], "x": 19.5, "y": 3},
- {"matrix": [3, 19], "x": 20.5, "y": 3},
- {"matrix": [3, 20], "x": 21.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
- {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
- {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
-
- {"matrix": [4, 14], "x": 15.25, "y": 4},
- {"matrix": [4, 15], "x": 16.25, "y": 4},
- {"matrix": [4, 16], "x": 17.25, "y": 4},
-
- {"matrix": [4, 17], "x": 18.5, "y": 4},
- {"matrix": [4, 18], "x": 19.5, "y": 4},
- {"matrix": [4, 19], "x": 20.5, "y": 4},
- {"matrix": [4, 20], "x": 21.5, "y": 4}
- ]
- },
- "LAYOUT_all": {
- "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": [4, 5], "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 6], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [0, 17], "x": 18.5, "y": 0},
- {"matrix": [0, 18], "x": 19.5, "y": 0},
- {"matrix": [0, 19], "x": 20.5, "y": 0},
- {"matrix": [0, 20], "x": 21.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix": [1, 15], "x": 16.25, "y": 1},
- {"matrix": [1, 16], "x": 17.25, "y": 1},
-
- {"matrix": [1, 17], "x": 18.5, "y": 1},
- {"matrix": [1, 18], "x": 19.5, "y": 1},
- {"matrix": [1, 19], "x": 20.5, "y": 1},
- {"matrix": [1, 20], "x": 21.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"matrix": [2, 17], "x": 18.5, "y": 2},
- {"matrix": [2, 18], "x": 19.5, "y": 2},
- {"matrix": [2, 19], "x": 20.5, "y": 2},
- {"matrix": [2, 20], "x": 21.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [4, 4], "x": 1.25, "y": 3},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [3, 15], "x": 16.25, "y": 3},
-
- {"matrix": [3, 17], "x": 18.5, "y": 3},
- {"matrix": [3, 18], "x": 19.5, "y": 3},
- {"matrix": [3, 19], "x": 20.5, "y": 3},
- {"matrix": [3, 20], "x": 21.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
- {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
- {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
-
- {"matrix": [4, 14], "x": 15.25, "y": 4},
- {"matrix": [4, 15], "x": 16.25, "y": 4},
- {"matrix": [4, 16], "x": 17.25, "y": 4},
-
- {"matrix": [4, 17], "x": 18.5, "y": 4},
- {"matrix": [4, 18], "x": 19.5, "y": 4},
- {"matrix": [4, 19], "x": 20.5, "y": 4},
- {"matrix": [4, 20], "x": 21.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/dc01/left/keyboard.json b/keyboards/dc01/left/keyboard.json
new file mode 100644
index 00000000000..e2967909955
--- /dev/null
+++ b/keyboards/dc01/left/keyboard.json
@@ -0,0 +1,248 @@
+{
+ "keyboard_name": "DC01 Left",
+ "manufacturer": "Mechboards",
+ "url": "",
+ "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x1010",
+ "device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
+ "debounce": 0,
+ "layouts": {
+ "LAYOUT_ansi": {
+ "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": [4, 5], "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+ {"matrix": [0, 19], "x": 20.5, "y": 0},
+ {"matrix": [0, 20], "x": 21.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+ {"matrix": [1, 16], "x": 17.25, "y": 1},
+
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+ {"matrix": [1, 18], "x": 19.5, "y": 1},
+ {"matrix": [1, 19], "x": 20.5, "y": 1},
+ {"matrix": [1, 20], "x": 21.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 17], "x": 18.5, "y": 2},
+ {"matrix": [2, 18], "x": 19.5, "y": 2},
+ {"matrix": [2, 19], "x": 20.5, "y": 2},
+ {"matrix": [2, 20], "x": 21.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+ {"matrix": [3, 17], "x": 18.5, "y": 3},
+ {"matrix": [3, 18], "x": 19.5, "y": 3},
+ {"matrix": [3, 19], "x": 20.5, "y": 3},
+ {"matrix": [3, 20], "x": 21.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4},
+ {"matrix": [4, 16], "x": 17.25, "y": 4},
+
+ {"matrix": [4, 17], "x": 18.5, "y": 4},
+ {"matrix": [4, 18], "x": 19.5, "y": 4},
+ {"matrix": [4, 19], "x": 20.5, "y": 4},
+ {"matrix": [4, 20], "x": 21.5, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "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": [4, 5], "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+ {"matrix": [0, 19], "x": 20.5, "y": 0},
+ {"matrix": [0, 20], "x": 21.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+ {"matrix": [1, 16], "x": 17.25, "y": 1},
+
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+ {"matrix": [1, 18], "x": 19.5, "y": 1},
+ {"matrix": [1, 19], "x": 20.5, "y": 1},
+ {"matrix": [1, 20], "x": 21.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [2, 17], "x": 18.5, "y": 2},
+ {"matrix": [2, 18], "x": 19.5, "y": 2},
+ {"matrix": [2, 19], "x": 20.5, "y": 2},
+ {"matrix": [2, 20], "x": 21.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [4, 4], "x": 1.25, "y": 3},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [3, 15], "x": 16.25, "y": 3},
+
+ {"matrix": [3, 17], "x": 18.5, "y": 3},
+ {"matrix": [3, 18], "x": 19.5, "y": 3},
+ {"matrix": [3, 19], "x": 20.5, "y": 3},
+ {"matrix": [3, 20], "x": 21.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4},
+ {"matrix": [4, 16], "x": 17.25, "y": 4},
+
+ {"matrix": [4, 17], "x": 18.5, "y": 4},
+ {"matrix": [4, 18], "x": 19.5, "y": 4},
+ {"matrix": [4, 19], "x": 20.5, "y": 4},
+ {"matrix": [4, 20], "x": 21.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dc01/left/rules.mk b/keyboards/dc01/left/rules.mk
index 3a9422733c1..2493924f46a 100644
--- a/keyboards/dc01/left/rules.mk
+++ b/keyboards/dc01/left/rules.mk
@@ -1,15 +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
-
-CUSTOM_MATRIX = yes # Use custom matrix
+CUSTOM_MATRIX = yes
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/info.json
deleted file mode 100644
index eab2d0c33f4..00000000000
--- a/keyboards/dc01/numpad/info.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "keyboard_name": "DC01 Numpad",
- "manufacturer": "Mechboards",
- "url": "",
- "maintainer": "Yiancar-Designs",
- "usb": {
- "vid": "0x8968",
- "pid": "0x1013",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["numpad_5x4", "ortho_5x4"],
- "layouts": {
- "LAYOUT_numpad_5x4": {
- "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": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
- ]
- },
- "LAYOUT_ortho_5x4": {
- "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/dc01/numpad/keyboard.json b/keyboards/dc01/numpad/keyboard.json
new file mode 100644
index 00000000000..0cf73c23e33
--- /dev/null
+++ b/keyboards/dc01/numpad/keyboard.json
@@ -0,0 +1,76 @@
+{
+ "keyboard_name": "DC01 Numpad",
+ "manufacturer": "Mechboards",
+ "url": "",
+ "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x1013",
+ "device_version": "0.0.1",
+ "no_startup_check": true
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
+ "community_layouts": ["numpad_5x4", "ortho_5x4"],
+ "layouts": {
+ "LAYOUT_numpad_5x4": {
+ "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": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 3, "h": 2}
+ ]
+ },
+ "LAYOUT_ortho_5x4": {
+ "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dc01/numpad/rules.mk b/keyboards/dc01/numpad/rules.mk
index b2c66861ea5..d4c0eb26725 100644
--- a/keyboards/dc01/numpad/rules.mk
+++ b/keyboards/dc01/numpad/rules.mk
@@ -1,15 +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
-NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes # Use custom matrix
+CUSTOM_MATRIX = yes
SRC += matrix.c \
i2c_slave.c
diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/info.json
deleted file mode 100644
index 2b89117c44b..00000000000
--- a/keyboards/dc01/right/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
- "keyboard_name": "DC01 Right",
- "manufacturer": "Mechboards",
- "url": "",
- "maintainer": "Yiancar-Designs",
- "usb": {
- "vid": "0x8968",
- "pid": "0x1011",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 1], "x": 0.5, "y": 0},
- {"matrix": [0, 2], "x": 1.5, "y": 0},
- {"matrix": [0, 3], "x": 2.5, "y": 0},
- {"matrix": [0, 4], "x": 3.5, "y": 0},
- {"matrix": [0, 5], "x": 4.5, "y": 0},
- {"matrix": [0, 6], "x": 5.5, "y": 0},
- {"matrix": [0, 7], "x": 6.5, "y": 0},
- {"matrix": [0, 0], "x": 7.5, "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, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0.25, "y": 2},
- {"matrix": [2, 1], "x": 1.25, "y": 2},
- {"matrix": [2, 2], "x": 2.25, "y": 2},
- {"matrix": [2, 3], "x": 3.25, "y": 2},
- {"matrix": [2, 4], "x": 4.25, "y": 2},
- {"matrix": [2, 5], "x": 5.25, "y": 2},
- {"matrix": [2, 6], "x": 6.25, "y": 2},
- {"matrix": [2, 7], "x": 7.25, "y": 2, "w": 1.25},
-
- {"matrix": [3, 0], "x": 0.75, "y": 3},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.75},
- {"matrix": [3, 7], "x": 7.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
- {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_ansi": {
- "layout": [
- {"matrix": [0, 1], "x": 0.5, "y": 0},
- {"matrix": [0, 2], "x": 1.5, "y": 0},
- {"matrix": [0, 3], "x": 2.5, "y": 0},
- {"matrix": [0, 4], "x": 3.5, "y": 0},
- {"matrix": [0, 5], "x": 4.5, "y": 0},
- {"matrix": [0, 6], "x": 5.5, "y": 0},
- {"matrix": [0, 7], "x": 6.5, "y": 0},
- {"matrix": [0, 0], "x": 7.5, "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, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0.25, "y": 2},
- {"matrix": [2, 1], "x": 1.25, "y": 2},
- {"matrix": [2, 2], "x": 2.25, "y": 2},
- {"matrix": [2, 3], "x": 3.25, "y": 2},
- {"matrix": [2, 4], "x": 4.25, "y": 2},
- {"matrix": [2, 5], "x": 5.25, "y": 2},
- {"matrix": [2, 7], "x": 6.25, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0.75, "y": 3},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.75},
- {"matrix": [3, 7], "x": 7.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
- {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/dc01/right/keyboard.json b/keyboards/dc01/right/keyboard.json
new file mode 100644
index 00000000000..6f48e05483e
--- /dev/null
+++ b/keyboards/dc01/right/keyboard.json
@@ -0,0 +1,111 @@
+{
+ "keyboard_name": "DC01 Right",
+ "manufacturer": "Mechboards",
+ "url": "",
+ "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x1011",
+ "device_version": "0.0.1",
+ "no_startup_check": true
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 1], "x": 0.5, "y": 0},
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+ {"matrix": [0, 6], "x": 5.5, "y": 0},
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 0], "x": 7.5, "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, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+ {"matrix": [2, 6], "x": 6.25, "y": 2},
+ {"matrix": [2, 7], "x": 7.25, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"matrix": [0, 1], "x": 0.5, "y": 0},
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+ {"matrix": [0, 6], "x": 5.5, "y": 0},
+ {"matrix": [0, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 0], "x": 7.5, "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, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+ {"matrix": [2, 7], "x": 6.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dc01/right/rules.mk b/keyboards/dc01/right/rules.mk
index b2c66861ea5..d4c0eb26725 100644
--- a/keyboards/dc01/right/rules.mk
+++ b/keyboards/dc01/right/rules.mk
@@ -1,15 +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
-NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
-CUSTOM_MATRIX = yes # Use custom matrix
+CUSTOM_MATRIX = yes
SRC += matrix.c \
i2c_slave.c
diff --git a/keyboards/dcpedit/redherring/info.json b/keyboards/dcpedit/redherring/keyboard.json
similarity index 100%
rename from keyboards/dcpedit/redherring/info.json
rename to keyboards/dcpedit/redherring/keyboard.json
diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json
index 67bec439f13..520cd92b09c 100644
--- a/keyboards/delikeeb/vanana/info.json
+++ b/keyboards/delikeeb/vanana/info.json
@@ -2,15 +2,6 @@
"manufacturer": "dELIKEEb",
"url": "",
"maintainer": "noclew",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "encoder": true,
- "extrakey": true,
- "mousekey": true,
- "nkro": false
- },
"usb": {
"vid": "0x9906",
"pid": "0x0013"
diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json
deleted file mode 100644
index a4c101ec237..00000000000
--- a/keyboards/delikeeb/vanana/rev1/info.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "keyboard_name": "Vanana rev1",
- "usb": {
- "device_version": "0.0.1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 16,
- "sleep": true,
- "animations": {
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "static_gradient": true
- }
- },
- "ws2812": {
- "pin": "F0"
- },
- "matrix_pins": {
- "cols": ["B2", "B3", "B1", "F7", "F5", "F6", "D3", "D1", "D0", "D4", "C6", "E6"],
- "rows": ["D2", "D7", "B4", "B5", "B6"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "C7", "pin_b": "D5"},
- {"pin_a": "F1", "pin_b": "F0"}
- ]
- },
- "layouts": {
- "LAYOUT": {
- "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": 9, "y": 0},
- {"matrix": [0, 7], "x": 10, "y": 0},
- {"matrix": [0, 8], "x": 11, "y": 0},
- {"matrix": [0, 9], "x": 12, "y": 0},
- {"matrix": [0, 10], "x": 13, "y": 0},
- {"matrix": [0, 11], "x": 14, "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": 9, "y": 1},
- {"matrix": [1, 7], "x": 10, "y": 1},
- {"matrix": [1, 8], "x": 11, "y": 1},
- {"matrix": [1, 9], "x": 12, "y": 1},
- {"matrix": [1, 10], "x": 13, "y": 1},
- {"matrix": [1, 11], "x": 14, "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": [4, 0], "x": 7, "y": 2},
-
- {"matrix": [2, 6], "x": 9, "y": 2},
- {"matrix": [2, 7], "x": 10, "y": 2},
- {"matrix": [2, 8], "x": 11, "y": 2},
- {"matrix": [2, 9], "x": 12, "y": 2},
- {"matrix": [2, 10], "x": 13, "y": 2},
- {"matrix": [2, 11], "x": 14, "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": [4, 11], "x": 7, "y": 3},
-
- {"matrix": [3, 6], "x": 9, "y": 3},
- {"matrix": [3, 7], "x": 10, "y": 3},
- {"matrix": [3, 8], "x": 11, "y": 3},
- {"matrix": [3, 9], "x": 12, "y": 3},
- {"matrix": [3, 10], "x": 13, "y": 3},
- {"matrix": [3, 11], "x": 14, "y": 3},
-
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.5},
-
- {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 1.5},
- {"matrix": [4, 7], "x": 9.75, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 11, "y": 4},
- {"matrix": [4, 9], "x": 12, "y": 4},
- {"matrix": [4, 10], "x": 13, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/delikeeb/vanana/rev1/keyboard.json b/keyboards/delikeeb/vanana/rev1/keyboard.json
new file mode 100644
index 00000000000..9ae59761de9
--- /dev/null
+++ b/keyboards/delikeeb/vanana/rev1/keyboard.json
@@ -0,0 +1,117 @@
+{
+ "keyboard_name": "Vanana rev1",
+ "usb": {
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 16,
+ "sleep": true,
+ "animations": {
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "static_gradient": true
+ }
+ },
+ "ws2812": {
+ "pin": "F0"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B1", "F7", "F5", "F6", "D3", "D1", "D0", "D4", "C6", "E6"],
+ "rows": ["D2", "D7", "B4", "B5", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "C7", "pin_b": "D5"},
+ {"pin_a": "F1", "pin_b": "F0"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": 9, "y": 0},
+ {"matrix": [0, 7], "x": 10, "y": 0},
+ {"matrix": [0, 8], "x": 11, "y": 0},
+ {"matrix": [0, 9], "x": 12, "y": 0},
+ {"matrix": [0, 10], "x": 13, "y": 0},
+ {"matrix": [0, 11], "x": 14, "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": 9, "y": 1},
+ {"matrix": [1, 7], "x": 10, "y": 1},
+ {"matrix": [1, 8], "x": 11, "y": 1},
+ {"matrix": [1, 9], "x": 12, "y": 1},
+ {"matrix": [1, 10], "x": 13, "y": 1},
+ {"matrix": [1, 11], "x": 14, "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": [4, 0], "x": 7, "y": 2},
+
+ {"matrix": [2, 6], "x": 9, "y": 2},
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2},
+ {"matrix": [2, 10], "x": 13, "y": 2},
+ {"matrix": [2, 11], "x": 14, "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": [4, 11], "x": 7, "y": 3},
+
+ {"matrix": [3, 6], "x": 9, "y": 3},
+ {"matrix": [3, 7], "x": 10, "y": 3},
+ {"matrix": [3, 8], "x": 11, "y": 3},
+ {"matrix": [3, 9], "x": 12, "y": 3},
+ {"matrix": [3, 10], "x": 13, "y": 3},
+ {"matrix": [3, 11], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 11, "y": 4},
+ {"matrix": [4, 9], "x": 12, "y": 4},
+ {"matrix": [4, 10], "x": 13, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/delikeeb/vanana/rev1/rules.mk b/keyboards/delikeeb/vanana/rev1/rules.mk
deleted file mode 100644
index eee766eca6c..00000000000
--- a/keyboards/delikeeb/vanana/rev1/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json
deleted file mode 100644
index 252e111fb2a..00000000000
--- a/keyboards/delikeeb/vanana/rev2/info.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "keyboard_name": "Vanana rev2",
- "usb": {
- "device_version": "0.0.2"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 16,
- "sleep": true,
- "animations": {
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "static_gradient": true
- }
- },
- "ws2812": {
- "pin": "C7"
- },
- "matrix_pins": {
- "cols": ["B3", "B1", "F7", "F6", "F4", "D2", "D3", "D0", "D4", "D7"],
- "rows": ["D1", "C6", "E6", "B4", "B5", "F5"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B6", "pin_b": "B2"},
- {"pin_a": "F0", "pin_b": "F1"}
- ]
- },
- "layouts": {
- "LAYOUT": {
- "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": [5, 4], "x": 5, "y": 0},
-
- {"matrix": [5, 9], "x": 9, "y": 0},
- {"matrix": [0, 5], "x": 10, "y": 0},
- {"matrix": [0, 6], "x": 11, "y": 0},
- {"matrix": [0, 7], "x": 12, "y": 0},
- {"matrix": [0, 8], "x": 13, "y": 0},
- {"matrix": [0, 9], "x": 14, "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": [5, 3], "x": 5, "y": 1},
-
- {"matrix": [5, 8], "x": 9, "y": 1},
- {"matrix": [1, 5], "x": 10, "y": 1},
- {"matrix": [1, 6], "x": 11, "y": 1},
- {"matrix": [1, 7], "x": 12, "y": 1},
- {"matrix": [1, 8], "x": 13, "y": 1},
- {"matrix": [1, 9], "x": 14, "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": [5, 2], "x": 5, "y": 2},
-
- {"matrix": [5, 5], "x": 7, "y": 2},
-
- {"matrix": [5, 7], "x": 9, "y": 2},
- {"matrix": [2, 5], "x": 10, "y": 2},
- {"matrix": [2, 6], "x": 11, "y": 2},
- {"matrix": [2, 7], "x": 12, "y": 2},
- {"matrix": [2, 8], "x": 13, "y": 2},
- {"matrix": [2, 9], "x": 14, "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": [5, 1], "x": 5, "y": 3},
-
- {"matrix": [5, 0], "x": 7, "y": 3},
-
- {"matrix": [5, 6], "x": 9, "y": 3},
- {"matrix": [3, 5], "x": 10, "y": 3},
- {"matrix": [3, 6], "x": 11, "y": 3},
- {"matrix": [3, 7], "x": 12, "y": 3},
- {"matrix": [3, 8], "x": 13, "y": 3},
- {"matrix": [3, 9], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 1, "y": 4},
- {"matrix": [4, 1], "x": 2, "y": 4},
- {"matrix": [4, 2], "x": 3, "y": 4},
- {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
-
- {"matrix": [4, 5], "x": 8.25, "y": 4, "w": 1.5},
- {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 11, "y": 4},
- {"matrix": [4, 8], "x": 12, "y": 4},
- {"matrix": [4, 9], "x": 13, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/delikeeb/vanana/rev2/keyboard.json b/keyboards/delikeeb/vanana/rev2/keyboard.json
new file mode 100644
index 00000000000..a15ad3e71a3
--- /dev/null
+++ b/keyboards/delikeeb/vanana/rev2/keyboard.json
@@ -0,0 +1,119 @@
+{
+ "keyboard_name": "Vanana rev2",
+ "usb": {
+ "device_version": "0.0.2"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 16,
+ "sleep": true,
+ "animations": {
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "static_gradient": true
+ }
+ },
+ "ws2812": {
+ "pin": "C7"
+ },
+ "matrix_pins": {
+ "cols": ["B3", "B1", "F7", "F6", "F4", "D2", "D3", "D0", "D4", "D7"],
+ "rows": ["D1", "C6", "E6", "B4", "B5", "F5"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B6", "pin_b": "B2"},
+ {"pin_a": "F0", "pin_b": "F1"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true,
+ "audio": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 4], "x": 5, "y": 0},
+
+ {"matrix": [5, 9], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [0, 6], "x": 11, "y": 0},
+ {"matrix": [0, 7], "x": 12, "y": 0},
+ {"matrix": [0, 8], "x": 13, "y": 0},
+ {"matrix": [0, 9], "x": 14, "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": [5, 3], "x": 5, "y": 1},
+
+ {"matrix": [5, 8], "x": 9, "y": 1},
+ {"matrix": [1, 5], "x": 10, "y": 1},
+ {"matrix": [1, 6], "x": 11, "y": 1},
+ {"matrix": [1, 7], "x": 12, "y": 1},
+ {"matrix": [1, 8], "x": 13, "y": 1},
+ {"matrix": [1, 9], "x": 14, "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": [5, 2], "x": 5, "y": 2},
+
+ {"matrix": [5, 5], "x": 7, "y": 2},
+
+ {"matrix": [5, 7], "x": 9, "y": 2},
+ {"matrix": [2, 5], "x": 10, "y": 2},
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "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": [5, 1], "x": 5, "y": 3},
+
+ {"matrix": [5, 0], "x": 7, "y": 3},
+
+ {"matrix": [5, 6], "x": 9, "y": 3},
+ {"matrix": [3, 5], "x": 10, "y": 3},
+ {"matrix": [3, 6], "x": 11, "y": 3},
+ {"matrix": [3, 7], "x": 12, "y": 3},
+ {"matrix": [3, 8], "x": 13, "y": 3},
+ {"matrix": [3, 9], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 1, "y": 4},
+ {"matrix": [4, 1], "x": 2, "y": 4},
+ {"matrix": [4, 2], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 5], "x": 8.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 11, "y": 4},
+ {"matrix": [4, 8], "x": 12, "y": 4},
+ {"matrix": [4, 9], "x": 13, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/delikeeb/vanana/rev2/rules.mk b/keyboards/delikeeb/vanana/rev2/rules.mk
deleted file mode 100644
index 8bb6ab5d91c..00000000000
--- a/keyboards/delikeeb/vanana/rev2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes # Audio output
diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json b/keyboards/delikeeb/waaffle/rev3/elite_c/info.json
deleted file mode 100644
index 042c41f34d6..00000000000
--- a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json
new file mode 100644
index 00000000000..44fd177e020
--- /dev/null
+++ b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json
@@ -0,0 +1,14 @@
+{
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true,
+ "encoder": true
+ }
+}
diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk
deleted file mode 100644
index 307296b1bae..00000000000
--- a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# supported on Elite-C controllers
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes # Enable Rotary Encoder
diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index 1f9a8124a96..1201411d46b 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/keyboards/delikeeb/waaffle/rev3/info.json
@@ -22,14 +22,6 @@
"ws2812": {
"pin": "C7"
},
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": false
- },
"matrix_pins": {
"cols": ["D3", "D2", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
"rows": ["F4", "B6", "B2", "B3", "B1", "F5", "F6", "F7"]
diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json
deleted file mode 100644
index 4369a041038..00000000000
--- a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "processor": "atmega32u4",
- "bootloader": "caterina"
-}
diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json
new file mode 100644
index 00000000000..a97bf794ea1
--- /dev/null
+++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json
@@ -0,0 +1,12 @@
+{
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ }
+}
diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk
deleted file mode 100644
index 17c9907319d..00000000000
--- a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# not supported on Pro Micro controllers
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-ENCODER_ENABLE = no # Enable Rotary Encoder
diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk
index 8285c29cb78..ee888337e5e 100644
--- a/keyboards/deltasplit75/rules.mk
+++ b/keyboards/deltasplit75/rules.mk
@@ -1,16 +1 @@
-# 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 = 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
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = deltasplit75/v2
diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/info.json
deleted file mode 100644
index d583f3bb65b..00000000000
--- a/keyboards/deltasplit75/v2/info.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
- "keyboard_name": "DeltaSplit75",
- "manufacturer": "xyxjj",
- "maintainer": "xyxjj & itsaferbie",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "B5", "B4", "E6", "D7", "C6", "D4", "D1"],
- "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_v2": {
- "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": [7, 0], "x": 8, "y": 0},
- {"matrix": [7, 1], "x": 9, "y": 0},
- {"matrix": [7, 2], "x": 10, "y": 0},
- {"matrix": [7, 3], "x": 11, "y": 0},
- {"matrix": [7, 4], "x": 12, "y": 0},
- {"matrix": [7, 5], "x": 13, "y": 0},
- {"matrix": [7, 6], "x": 14, "y": 0},
- {"matrix": [7, 7], "x": 15, "y": 0},
- {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
- {"matrix": [8, 1], "x": 9, "y": 1},
- {"matrix": [8, 2], "x": 10, "y": 1},
- {"matrix": [8, 3], "x": 11, "y": 1},
- {"matrix": [8, 4], "x": 12, "y": 1},
- {"matrix": [8, 5], "x": 13, "y": 1},
- {"matrix": [8, 6], "x": 14, "y": 1},
- {"matrix": [8, 7], "x": 15, "y": 1},
- {"matrix": [13, 3], "x": 16, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [9, 0], "x": 7.5, "y": 2},
- {"matrix": [9, 1], "x": 8.5, "y": 2},
- {"matrix": [9, 2], "x": 9.5, "y": 2},
- {"matrix": [9, 3], "x": 10.5, "y": 2},
- {"matrix": [9, 4], "x": 11.5, "y": 2},
- {"matrix": [9, 5], "x": 12.5, "y": 2},
- {"matrix": [9, 6], "x": 13.5, "y": 2},
- {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
- {"matrix": [13, 4], "x": 16, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [10, 0], "x": 7.75, "y": 3},
- {"matrix": [10, 1], "x": 8.75, "y": 3},
- {"matrix": [10, 2], "x": 9.75, "y": 3},
- {"matrix": [10, 3], "x": 10.75, "y": 3},
- {"matrix": [10, 4], "x": 11.75, "y": 3},
- {"matrix": [10, 5], "x": 12.75, "y": 3},
- {"matrix": [10, 6], "x": 13.75, "y": 3},
- {"matrix": [10, 7], "x": 14.75, "y": 3, "w": 1.25},
- {"matrix": [13, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [5, 3], "x": 1.25, "y": 4},
- {"matrix": [4, 1], "x": 2.25, "y": 4},
- {"matrix": [4, 2], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [4, 4], "x": 5.25, "y": 4},
- {"matrix": [4, 5], "x": 6.25, "y": 4},
- {"matrix": [11, 0], "x": 7.25, "y": 4},
- {"matrix": [11, 1], "x": 8.25, "y": 4},
- {"matrix": [11, 2], "x": 9.25, "y": 4},
- {"matrix": [11, 3], "x": 10.25, "y": 4},
- {"matrix": [11, 4], "x": 11.25, "y": 4},
- {"matrix": [11, 5], "x": 12.25, "y": 4},
- {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
- {"matrix": [11, 7], "x": 15, "y": 4},
- {"matrix": [13, 6], "x": 16, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2},
- {"matrix": [5, 5], "x": 5.75, "y": 5},
- {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
- {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
- {"matrix": [12, 2], "x": 11.75, "y": 5},
- {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
- {"matrix": [12, 6], "x": 14, "y": 5},
- {"matrix": [12, 7], "x": 15, "y": 5},
- {"matrix": [13, 7], "x": 16, "y": 5}
- ]
- },
- "LAYOUT_protosplit": {
- "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": [7, 0], "x": 8, "y": 0},
- {"matrix": [7, 1], "x": 9, "y": 0},
- {"matrix": [7, 2], "x": 10, "y": 0},
- {"matrix": [7, 3], "x": 11, "y": 0},
- {"matrix": [7, 4], "x": 12, "y": 0},
- {"matrix": [7, 5], "x": 13, "y": 0},
- {"matrix": [7, 6], "x": 14, "y": 0},
- {"matrix": [7, 7], "x": 15, "y": 0},
- {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
- {"matrix": [8, 1], "x": 9, "y": 1},
- {"matrix": [8, 2], "x": 10, "y": 1},
- {"matrix": [8, 3], "x": 11, "y": 1},
- {"matrix": [8, 4], "x": 12, "y": 1},
- {"matrix": [8, 5], "x": 13, "y": 1},
- {"matrix": [8, 6], "x": 14, "y": 1},
- {"matrix": [8, 7], "x": 15, "y": 1},
- {"matrix": [13, 3], "x": 16, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
-
- {"matrix": [9, 0], "x": 7.5, "y": 2},
- {"matrix": [9, 1], "x": 8.5, "y": 2},
- {"matrix": [9, 2], "x": 9.5, "y": 2},
- {"matrix": [9, 3], "x": 10.5, "y": 2},
- {"matrix": [9, 4], "x": 11.5, "y": 2},
- {"matrix": [9, 5], "x": 12.5, "y": 2},
- {"matrix": [9, 6], "x": 13.5, "y": 2},
- {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
- {"matrix": [13, 4], "x": 16, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
-
- {"matrix": [10, 0], "x": 7.75, "y": 3},
- {"matrix": [10, 1], "x": 8.75, "y": 3},
- {"matrix": [10, 2], "x": 9.75, "y": 3},
- {"matrix": [10, 3], "x": 10.75, "y": 3},
- {"matrix": [10, 4], "x": 11.75, "y": 3},
- {"matrix": [10, 5], "x": 12.75, "y": 3},
- {"matrix": [10, 7], "x": 13.75, "y": 3, "w": 2.25},
- {"matrix": [13, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"matrix": [4, 1], "x": 2.25, "y": 4},
- {"matrix": [4, 2], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [4, 4], "x": 5.25, "y": 4},
- {"matrix": [4, 5], "x": 6.25, "y": 4},
-
- {"matrix": [11, 0], "x": 7.25, "y": 4},
- {"matrix": [11, 1], "x": 8.25, "y": 4},
- {"matrix": [11, 2], "x": 9.25, "y": 4},
- {"matrix": [11, 3], "x": 10.25, "y": 4},
- {"matrix": [11, 4], "x": 11.25, "y": 4},
- {"matrix": [11, 5], "x": 12.25, "y": 4},
- {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
- {"matrix": [11, 7], "x": 15, "y": 4},
- {"matrix": [13, 6], "x": 16, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2},
- {"matrix": [5, 5], "x": 5.75, "y": 5},
-
- {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
- {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
- {"matrix": [12, 2], "x": 11.75, "y": 5},
- {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
- {"matrix": [12, 6], "x": 14, "y": 5},
- {"matrix": [12, 7], "x": 15, "y": 5},
- {"matrix": [13, 7], "x": 16, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/deltasplit75/v2/keyboard.json b/keyboards/deltasplit75/v2/keyboard.json
new file mode 100644
index 00000000000..2c1968e0b59
--- /dev/null
+++ b/keyboards/deltasplit75/v2/keyboard.json
@@ -0,0 +1,237 @@
+{
+ "keyboard_name": "DeltaSplit75",
+ "manufacturer": "xyxjj",
+ "maintainer": "xyxjj & itsaferbie",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3060",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B5", "B4", "E6", "D7", "C6", "D4", "D1"],
+ "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ },
+ "layouts": {
+ "LAYOUT_v2": {
+ "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": [7, 0], "x": 8, "y": 0},
+ {"matrix": [7, 1], "x": 9, "y": 0},
+ {"matrix": [7, 2], "x": 10, "y": 0},
+ {"matrix": [7, 3], "x": 11, "y": 0},
+ {"matrix": [7, 4], "x": 12, "y": 0},
+ {"matrix": [7, 5], "x": 13, "y": 0},
+ {"matrix": [7, 6], "x": 14, "y": 0},
+ {"matrix": [7, 7], "x": 15, "y": 0},
+ {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
+ {"matrix": [8, 1], "x": 9, "y": 1},
+ {"matrix": [8, 2], "x": 10, "y": 1},
+ {"matrix": [8, 3], "x": 11, "y": 1},
+ {"matrix": [8, 4], "x": 12, "y": 1},
+ {"matrix": [8, 5], "x": 13, "y": 1},
+ {"matrix": [8, 6], "x": 14, "y": 1},
+ {"matrix": [8, 7], "x": 15, "y": 1},
+ {"matrix": [13, 3], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [9, 0], "x": 7.5, "y": 2},
+ {"matrix": [9, 1], "x": 8.5, "y": 2},
+ {"matrix": [9, 2], "x": 9.5, "y": 2},
+ {"matrix": [9, 3], "x": 10.5, "y": 2},
+ {"matrix": [9, 4], "x": 11.5, "y": 2},
+ {"matrix": [9, 5], "x": 12.5, "y": 2},
+ {"matrix": [9, 6], "x": 13.5, "y": 2},
+ {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
+ {"matrix": [13, 4], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [10, 0], "x": 7.75, "y": 3},
+ {"matrix": [10, 1], "x": 8.75, "y": 3},
+ {"matrix": [10, 2], "x": 9.75, "y": 3},
+ {"matrix": [10, 3], "x": 10.75, "y": 3},
+ {"matrix": [10, 4], "x": 11.75, "y": 3},
+ {"matrix": [10, 5], "x": 12.75, "y": 3},
+ {"matrix": [10, 6], "x": 13.75, "y": 3},
+ {"matrix": [10, 7], "x": 14.75, "y": 3, "w": 1.25},
+ {"matrix": [13, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [5, 3], "x": 1.25, "y": 4},
+ {"matrix": [4, 1], "x": 2.25, "y": 4},
+ {"matrix": [4, 2], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.25, "y": 4},
+ {"matrix": [4, 5], "x": 6.25, "y": 4},
+ {"matrix": [11, 0], "x": 7.25, "y": 4},
+ {"matrix": [11, 1], "x": 8.25, "y": 4},
+ {"matrix": [11, 2], "x": 9.25, "y": 4},
+ {"matrix": [11, 3], "x": 10.25, "y": 4},
+ {"matrix": [11, 4], "x": 11.25, "y": 4},
+ {"matrix": [11, 5], "x": 12.25, "y": 4},
+ {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
+ {"matrix": [11, 7], "x": 15, "y": 4},
+ {"matrix": [13, 6], "x": 16, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2},
+ {"matrix": [5, 5], "x": 5.75, "y": 5},
+ {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
+ {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
+ {"matrix": [12, 2], "x": 11.75, "y": 5},
+ {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
+ {"matrix": [12, 6], "x": 14, "y": 5},
+ {"matrix": [12, 7], "x": 15, "y": 5},
+ {"matrix": [13, 7], "x": 16, "y": 5}
+ ]
+ },
+ "LAYOUT_protosplit": {
+ "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": [7, 0], "x": 8, "y": 0},
+ {"matrix": [7, 1], "x": 9, "y": 0},
+ {"matrix": [7, 2], "x": 10, "y": 0},
+ {"matrix": [7, 3], "x": 11, "y": 0},
+ {"matrix": [7, 4], "x": 12, "y": 0},
+ {"matrix": [7, 5], "x": 13, "y": 0},
+ {"matrix": [7, 6], "x": 14, "y": 0},
+ {"matrix": [7, 7], "x": 15, "y": 0},
+ {"matrix": [13, 2], "x": 16, "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": [8, 0], "x": 8, "y": 1},
+ {"matrix": [8, 1], "x": 9, "y": 1},
+ {"matrix": [8, 2], "x": 10, "y": 1},
+ {"matrix": [8, 3], "x": 11, "y": 1},
+ {"matrix": [8, 4], "x": 12, "y": 1},
+ {"matrix": [8, 5], "x": 13, "y": 1},
+ {"matrix": [8, 6], "x": 14, "y": 1},
+ {"matrix": [8, 7], "x": 15, "y": 1},
+ {"matrix": [13, 3], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 2},
+ {"matrix": [9, 1], "x": 8.5, "y": 2},
+ {"matrix": [9, 2], "x": 9.5, "y": 2},
+ {"matrix": [9, 3], "x": 10.5, "y": 2},
+ {"matrix": [9, 4], "x": 11.5, "y": 2},
+ {"matrix": [9, 5], "x": 12.5, "y": 2},
+ {"matrix": [9, 6], "x": 13.5, "y": 2},
+ {"matrix": [9, 7], "x": 14.5, "y": 2, "w": 1.5},
+ {"matrix": [13, 4], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+ {"matrix": [10, 0], "x": 7.75, "y": 3},
+ {"matrix": [10, 1], "x": 8.75, "y": 3},
+ {"matrix": [10, 2], "x": 9.75, "y": 3},
+ {"matrix": [10, 3], "x": 10.75, "y": 3},
+ {"matrix": [10, 4], "x": 11.75, "y": 3},
+ {"matrix": [10, 5], "x": 12.75, "y": 3},
+ {"matrix": [10, 7], "x": 13.75, "y": 3, "w": 2.25},
+ {"matrix": [13, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4},
+ {"matrix": [4, 2], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.25, "y": 4},
+ {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+ {"matrix": [11, 0], "x": 7.25, "y": 4},
+ {"matrix": [11, 1], "x": 8.25, "y": 4},
+ {"matrix": [11, 2], "x": 9.25, "y": 4},
+ {"matrix": [11, 3], "x": 10.25, "y": 4},
+ {"matrix": [11, 4], "x": 11.25, "y": 4},
+ {"matrix": [11, 5], "x": 12.25, "y": 4},
+ {"matrix": [11, 6], "x": 13.25, "y": 4, "w": 1.75},
+ {"matrix": [11, 7], "x": 15, "y": 4},
+ {"matrix": [13, 6], "x": 16, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2},
+ {"matrix": [5, 5], "x": 5.75, "y": 5},
+
+ {"matrix": [12, 0], "x": 7.75, "y": 5, "w": 2.75},
+ {"matrix": [12, 1], "x": 10.5, "y": 5, "w": 1.25},
+ {"matrix": [12, 2], "x": 11.75, "y": 5},
+ {"matrix": [12, 3], "x": 12.75, "y": 5, "w": 1.25},
+ {"matrix": [12, 6], "x": 14, "y": 5},
+ {"matrix": [12, 7], "x": 15, "y": 5},
+ {"matrix": [13, 7], "x": 16, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/deltasplit75/v2/rules.mk b/keyboards/deltasplit75/v2/rules.mk
deleted file mode 100644
index f845616741c..00000000000
--- a/keyboards/deltasplit75/v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json
deleted file mode 100644
index 8e594cccb9c..00000000000
--- a/keyboards/deng/thirty/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "keyboard_name": "Thirty",
- "manufacturer": "Leo Deng",
- "url": "",
- "maintainer": "myst729",
- "usb": {
- "vid": "0xDE29",
- "pid": "0x7342",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_moving_chevron": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_fractal": true,
- "pixel_flow": true,
- "pixel_rain": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "default": {
- "animation": "cycle_all"
- },
- "driver": "ws2812",
- "max_brightness": 200
- },
- "matrix_pins": {
- "cols": ["B13", "B14", "B3", "A4", "A6"],
- "rows": ["B15", "A5", "A3", "A15", "B7", "B8"]
- },
- "diode_direction": "COL2ROW",
- "dynamic_keymap": {
- "layer_count": 8
- },
- "backlight": {
- "pin": "B11",
- "levels": 5,
- "on_state": 0
- },
- "ws2812": {
- "pin": "B12"
- },
- "processor": "STM32F103",
- "bootloader": "stm32duino",
- "layouts": {
- "LAYOUT_ortho_3x10": {
- "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": [3, 4], "x": 5, "y": 0},
- {"matrix": [3, 3], "x": 6, "y": 0},
- {"matrix": [3, 2], "x": 7, "y": 0},
- {"matrix": [3, 1], "x": 8, "y": 0},
- {"matrix": [3, 0], "x": 9, "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": [4, 4], "x": 5, "y": 1},
- {"matrix": [4, 3], "x": 6, "y": 1},
- {"matrix": [4, 2], "x": 7, "y": 1},
- {"matrix": [4, 1], "x": 8, "y": 1},
- {"matrix": [4, 0], "x": 9, "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": [5, 4], "x": 5, "y": 2},
- {"matrix": [5, 3], "x": 6, "y": 2},
- {"matrix": [5, 2], "x": 7, "y": 2},
- {"matrix": [5, 1], "x": 8, "y": 2},
- {"matrix": [5, 0], "x": 9, "y": 2}
- ]
- }
- }
-}
diff --git a/keyboards/deng/thirty/keyboard.json b/keyboards/deng/thirty/keyboard.json
new file mode 100644
index 00000000000..a26d727f12b
--- /dev/null
+++ b/keyboards/deng/thirty/keyboard.json
@@ -0,0 +1,127 @@
+{
+ "keyboard_name": "Thirty",
+ "manufacturer": "Leo Deng",
+ "url": "",
+ "maintainer": "myst729",
+ "usb": {
+ "vid": "0xDE29",
+ "pid": "0x7342",
+ "device_version": "0.0.1"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_moving_chevron": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "pixel_flow": true,
+ "pixel_rain": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "ws2812",
+ "max_brightness": 200
+ },
+ "matrix_pins": {
+ "cols": ["B13", "B14", "B3", "A4", "A6"],
+ "rows": ["B15", "A5", "A3", "A15", "B7", "B8"]
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 8
+ },
+ "backlight": {
+ "pin": "B11",
+ "levels": 5,
+ "on_state": 0
+ },
+ "ws2812": {
+ "pin": "B12"
+ },
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "backlight": true,
+ "rgb_matrix": true
+ },
+ "layouts": {
+ "LAYOUT_ortho_3x10": {
+ "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": [3, 4], "x": 5, "y": 0},
+ {"matrix": [3, 3], "x": 6, "y": 0},
+ {"matrix": [3, 2], "x": 7, "y": 0},
+ {"matrix": [3, 1], "x": 8, "y": 0},
+ {"matrix": [3, 0], "x": 9, "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": [4, 4], "x": 5, "y": 1},
+ {"matrix": [4, 3], "x": 6, "y": 1},
+ {"matrix": [4, 2], "x": 7, "y": 1},
+ {"matrix": [4, 1], "x": 8, "y": 1},
+ {"matrix": [4, 0], "x": 9, "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": [5, 4], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [5, 2], "x": 7, "y": 2},
+ {"matrix": [5, 1], "x": 8, "y": 2},
+ {"matrix": [5, 0], "x": 9, "y": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk
index d1753c1e6c4..04fe1eba2ac 100644
--- a/keyboards/deng/thirty/rules.mk
+++ b/keyboards/deng/thirty/rules.mk
@@ -1,15 +1,2 @@
-
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
-
-# Build Options
-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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/info.json
deleted file mode 100644
index 1b2d9a29c9b..00000000000
--- a/keyboards/dichotomy/info.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- "keyboard_name": "Dichotomy",
- "manufacturer": "Broekhuijsen",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0xACC7",
- "device_version": "0.0.2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.5},
- {"matrix": [0, 1], "x": 1, "y": 0.5},
- {"matrix": [0, 2], "x": 2, "y": 0.25},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.5},
- {"matrix": [0, 5], "x": 5, "y": 0.5},
-
- {"matrix": [0, 6], "x": 7, "y": 0.5},
- {"matrix": [0, 7], "x": 8, "y": 0.5},
- {"matrix": [0, 8], "x": 9, "y": 0},
- {"matrix": [0, 9], "x": 10, "y": 0.25},
- {"matrix": [0, 10], "x": 11, "y": 0.5},
- {"matrix": [0, 11], "x": 12, "y": 0.5},
-
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"matrix": [1, 5], "x": 5, "y": 1.5},
-
- {"matrix": [1, 6], "x": 7, "y": 1.5},
- {"matrix": [1, 7], "x": 8, "y": 1.5},
- {"matrix": [1, 8], "x": 9, "y": 1},
- {"matrix": [1, 9], "x": 10, "y": 1.25},
- {"matrix": [1, 10], "x": 11, "y": 1.5},
- {"matrix": [1, 11], "x": 12, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5},
- {"matrix": [2, 1], "x": 1, "y": 2.5},
- {"matrix": [2, 2], "x": 2, "y": 2.25},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.5},
- {"matrix": [2, 5], "x": 5, "y": 2.5},
-
- {"matrix": [2, 6], "x": 7, "y": 2.5},
- {"matrix": [2, 7], "x": 8, "y": 2.5},
- {"matrix": [2, 8], "x": 9, "y": 2},
- {"matrix": [2, 9], "x": 10, "y": 2.25},
- {"matrix": [2, 10], "x": 11, "y": 2.5},
- {"matrix": [2, 11], "x": 12, "y": 2.5},
-
- {"matrix": [3, 3], "x": 3, "y": 4},
- {"matrix": [3, 4], "x": 4, "y": 4},
- {"matrix": [3, 5], "x": 5, "y": 4},
-
- {"matrix": [3, 6], "x": 7, "y": 4},
- {"matrix": [3, 7], "x": 8, "y": 4},
- {"matrix": [3, 8], "x": 9, "y": 4},
-
- {"matrix": [4, 2], "x": 2, "y": 5},
- {"matrix": [4, 3], "x": 3, "y": 5},
- {"matrix": [4, 4], "x": 4, "y": 5},
- {"matrix": [4, 5], "x": 5, "y": 5},
-
- {"matrix": [4, 6], "x": 7, "y": 5},
- {"matrix": [4, 7], "x": 8, "y": 5},
- {"matrix": [4, 8], "x": 9, "y": 5},
- {"matrix": [4, 9], "x": 10, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/dichotomy/keyboard.json b/keyboards/dichotomy/keyboard.json
new file mode 100644
index 00000000000..bc3546a0829
--- /dev/null
+++ b/keyboards/dichotomy/keyboard.json
@@ -0,0 +1,87 @@
+{
+ "keyboard_name": "Dichotomy",
+ "manufacturer": "Broekhuijsen",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xACC7",
+ "device_version": "0.0.2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "pointing_device": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+ {"matrix": [0, 6], "x": 7, "y": 0.5},
+ {"matrix": [0, 7], "x": 8, "y": 0.5},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0.25},
+ {"matrix": [0, 10], "x": 11, "y": 0.5},
+ {"matrix": [0, 11], "x": 12, "y": 0.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+ {"matrix": [1, 6], "x": 7, "y": 1.5},
+ {"matrix": [1, 7], "x": 8, "y": 1.5},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1.25},
+ {"matrix": [1, 10], "x": 11, "y": 1.5},
+ {"matrix": [1, 11], "x": 12, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+ {"matrix": [2, 5], "x": 5, "y": 2.5},
+
+ {"matrix": [2, 6], "x": 7, "y": 2.5},
+ {"matrix": [2, 7], "x": 8, "y": 2.5},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2.25},
+ {"matrix": [2, 10], "x": 11, "y": 2.5},
+ {"matrix": [2, 11], "x": 12, "y": 2.5},
+
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+
+ {"matrix": [3, 6], "x": 7, "y": 4},
+ {"matrix": [3, 7], "x": 8, "y": 4},
+ {"matrix": [3, 8], "x": 9, "y": 4},
+
+ {"matrix": [4, 2], "x": 2, "y": 5},
+ {"matrix": [4, 3], "x": 3, "y": 5},
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
+
+ {"matrix": [4, 6], "x": 7, "y": 5},
+ {"matrix": [4, 7], "x": 8, "y": 5},
+ {"matrix": [4, 8], "x": 9, "y": 5},
+ {"matrix": [4, 9], "x": 10, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk
index bfa5252a039..fd5fa4db1a9 100755
--- a/keyboards/dichotomy/rules.mk
+++ b/keyboards/dichotomy/rules.mk
@@ -1,16 +1,5 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-#MOUSEKEY_ENABLE = yes # Mouse keys
-POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
POINTING_DEVICE_DRIVER = custom
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
CUSTOM_MATRIX = yes # Remote matrix from the wireless bridge
-NKRO_ENABLE = yes # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
# # project specific files
SRC += matrix.c
diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json
deleted file mode 100644
index 4f3b03b6f9e..00000000000
--- a/keyboards/dm9records/ergoinu/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "keyboard_name": "Ergoinu",
- "manufacturer": "Dm9Records",
- "url": "",
- "maintainer": "hsgw(Takuya Urakawa)",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEE60",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B4", "E6", "D7", "C6", "D4", "F5", "F4"],
- "rows": ["F6", "F7", "B1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 7
- },
- "ws2812": {
- "pin": "B6"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.6},
- {"matrix": [0, 1], "x": 1, "y": 0.4},
- {"matrix": [0, 2], "x": 2, "y": 0.4},
- {"matrix": [0, 3], "x": 3, "y": 0.25},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
- {"matrix": [0, 6], "x": 6, "y": 0.4},
-
- {"matrix": [5, 6], "x": 11, "y": 0.4},
- {"matrix": [5, 5], "x": 12, "y": 0.25},
- {"matrix": [5, 4], "x": 13, "y": 0},
- {"matrix": [5, 3], "x": 14, "y": 0.25},
- {"matrix": [5, 2], "x": 15, "y": 0.4},
- {"matrix": [5, 1], "x": 16, "y": 0.4},
- {"matrix": [5, 0], "x": 17, "y": 0.6},
-
- {"matrix": [1, 0], "x": 0, "y": 1.6},
- {"matrix": [1, 1], "x": 1, "y": 1.4},
- {"matrix": [1, 2], "x": 2, "y": 1.4},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.4},
-
- {"matrix": [6, 6], "x": 11, "y": 1.4},
- {"matrix": [6, 5], "x": 12, "y": 1.25},
- {"matrix": [6, 4], "x": 13, "y": 1},
- {"matrix": [6, 3], "x": 14, "y": 1.25},
- {"matrix": [6, 2], "x": 15, "y": 1.4},
- {"matrix": [6, 1], "x": 16, "y": 1.4},
- {"matrix": [6, 0], "x": 17, "y": 1.6},
-
- {"matrix": [2, 0], "x": 0.25, "y": 2.6, "w": 1.75},
- {"matrix": [2, 2], "x": 2, "y": 2.4},
- {"matrix": [2, 3], "x": 3, "y": 2.25},
- {"matrix": [2, 4], "x": 4, "y": 2},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
- {"matrix": [2, 6], "x": 6, "y": 2.4},
-
- {"matrix": [7, 6], "x": 11, "y": 2.4},
- {"matrix": [7, 5], "x": 12, "y": 2.25},
- {"matrix": [7, 4], "x": 13, "y": 2},
- {"matrix": [7, 3], "x": 14, "y": 2.25},
- {"matrix": [7, 2], "x": 15, "y": 2.4},
- {"matrix": [7, 1], "x": 16, "y": 2.4},
- {"matrix": [7, 0], "x": 17, "y": 2.6},
-
- {"matrix": [3, 0], "x": 0.25, "y": 3.6, "w": 1.75},
- {"matrix": [3, 2], "x": 2, "y": 3.4},
- {"matrix": [3, 3], "x": 3, "y": 3.25},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3.25},
- {"matrix": [3, 6], "x": 6, "y": 3.4},
-
- {"matrix": [8, 6], "x": 11, "y": 3.4},
- {"matrix": [8, 5], "x": 12, "y": 3.25},
- {"matrix": [8, 4], "x": 13, "y": 3},
- {"matrix": [8, 3], "x": 14, "y": 3.25},
- {"matrix": [8, 2], "x": 15, "y": 3.4},
- {"matrix": [8, 1], "x": 16, "y": 3.4},
- {"matrix": [8, 0], "x": 17, "y": 3.6},
-
- {"matrix": [4, 2], "x": 3, "y": 4.25},
- {"matrix": [4, 3], "x": 4, "y": 4},
- {"matrix": [4, 4], "x": 5, "y": 4.25},
- {"matrix": [4, 5], "x": 6, "y": 4.4},
- {"matrix": [4, 6], "x": 7, "y": 4.4, "w": 1.5},
-
- {"matrix": [9, 6], "x": 9.5, "y": 4.4, "w": 1.5},
- {"matrix": [9, 5], "x": 11, "y": 4.4},
- {"matrix": [9, 4], "x": 12, "y": 4.25},
- {"matrix": [9, 3], "x": 13, "y": 4},
- {"matrix": [9, 2], "x": 14, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/dm9records/ergoinu/keyboard.json b/keyboards/dm9records/ergoinu/keyboard.json
new file mode 100644
index 00000000000..c132f18268b
--- /dev/null
+++ b/keyboards/dm9records/ergoinu/keyboard.json
@@ -0,0 +1,114 @@
+{
+ "keyboard_name": "Ergoinu",
+ "manufacturer": "Dm9Records",
+ "url": "",
+ "maintainer": "hsgw(Takuya Urakawa)",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEE60",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["B4", "E6", "D7", "C6", "D4", "F5", "F4"],
+ "rows": ["F6", "F7", "B1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 7
+ },
+ "ws2812": {
+ "pin": "B6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.6},
+ {"matrix": [0, 1], "x": 1, "y": 0.4},
+ {"matrix": [0, 2], "x": 2, "y": 0.4},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.4},
+
+ {"matrix": [5, 6], "x": 11, "y": 0.4},
+ {"matrix": [5, 5], "x": 12, "y": 0.25},
+ {"matrix": [5, 4], "x": 13, "y": 0},
+ {"matrix": [5, 3], "x": 14, "y": 0.25},
+ {"matrix": [5, 2], "x": 15, "y": 0.4},
+ {"matrix": [5, 1], "x": 16, "y": 0.4},
+ {"matrix": [5, 0], "x": 17, "y": 0.6},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.6},
+ {"matrix": [1, 1], "x": 1, "y": 1.4},
+ {"matrix": [1, 2], "x": 2, "y": 1.4},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.4},
+
+ {"matrix": [6, 6], "x": 11, "y": 1.4},
+ {"matrix": [6, 5], "x": 12, "y": 1.25},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 3], "x": 14, "y": 1.25},
+ {"matrix": [6, 2], "x": 15, "y": 1.4},
+ {"matrix": [6, 1], "x": 16, "y": 1.4},
+ {"matrix": [6, 0], "x": 17, "y": 1.6},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2.6, "w": 1.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.4},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.4},
+
+ {"matrix": [7, 6], "x": 11, "y": 2.4},
+ {"matrix": [7, 5], "x": 12, "y": 2.25},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 3], "x": 14, "y": 2.25},
+ {"matrix": [7, 2], "x": 15, "y": 2.4},
+ {"matrix": [7, 1], "x": 16, "y": 2.4},
+ {"matrix": [7, 0], "x": 17, "y": 2.6},
+
+ {"matrix": [3, 0], "x": 0.25, "y": 3.6, "w": 1.75},
+ {"matrix": [3, 2], "x": 2, "y": 3.4},
+ {"matrix": [3, 3], "x": 3, "y": 3.25},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 3.4},
+
+ {"matrix": [8, 6], "x": 11, "y": 3.4},
+ {"matrix": [8, 5], "x": 12, "y": 3.25},
+ {"matrix": [8, 4], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3.25},
+ {"matrix": [8, 2], "x": 15, "y": 3.4},
+ {"matrix": [8, 1], "x": 16, "y": 3.4},
+ {"matrix": [8, 0], "x": 17, "y": 3.6},
+
+ {"matrix": [4, 2], "x": 3, "y": 4.25},
+ {"matrix": [4, 3], "x": 4, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4.25},
+ {"matrix": [4, 5], "x": 6, "y": 4.4},
+ {"matrix": [4, 6], "x": 7, "y": 4.4, "w": 1.5},
+
+ {"matrix": [9, 6], "x": 9.5, "y": 4.4, "w": 1.5},
+ {"matrix": [9, 5], "x": 11, "y": 4.4},
+ {"matrix": [9, 4], "x": 12, "y": 4.25},
+ {"matrix": [9, 3], "x": 13, "y": 4},
+ {"matrix": [9, 2], "x": 14, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk
deleted file mode 100644
index a876de5b539..00000000000
--- a/keyboards/dm9records/ergoinu/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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json
deleted file mode 100644
index a18de0accdb..00000000000
--- a/keyboards/dm9records/plaid/info.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
- "keyboard_name": "Plaid",
- "manufacturer": "Dm9Records",
- "url": "https://github.com/hsgw/plaid",
- "maintainer": "hsgw(Takuya Urakawa)",
- "usb": {
- "vid": "0x16C0",
- "pid": "0x27DB",
- "device_version": "0.0.2",
- "max_power": 100
- },
- "matrix_pins": {
- "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"],
- "rows": ["B4", "B5", "B3", "D4"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega328p",
- "bootloader": "usbasploader",
- "community_layouts": ["ortho_4x12", "planck_mit"],
- "layout_aliases": {
- "LAYOUT": "LAYOUT_ortho_4x12",
- "LAYOUT_plaid_grid": "LAYOUT_ortho_4x12",
- "LAYOUT_plaid_mit": "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}
- ]
- }
- }
-}
diff --git a/keyboards/dm9records/plaid/keyboard.json b/keyboards/dm9records/plaid/keyboard.json
new file mode 100644
index 00000000000..a2052e55621
--- /dev/null
+++ b/keyboards/dm9records/plaid/keyboard.json
@@ -0,0 +1,141 @@
+{
+ "keyboard_name": "Plaid",
+ "manufacturer": "Dm9Records",
+ "url": "https://github.com/hsgw/plaid",
+ "maintainer": "hsgw(Takuya Urakawa)",
+ "usb": {
+ "vid": "0x16C0",
+ "pid": "0x27DB",
+ "device_version": "0.0.2",
+ "max_power": 100
+ },
+ "matrix_pins": {
+ "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"],
+ "rows": ["B4", "B5", "B3", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega328p",
+ "bootloader": "usbasploader",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true
+ },
+ "community_layouts": ["ortho_4x12", "planck_mit"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_4x12",
+ "LAYOUT_plaid_grid": "LAYOUT_ortho_4x12",
+ "LAYOUT_plaid_mit": "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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dm9records/plaid/rules.mk b/keyboards/dm9records/plaid/rules.mk
index 760f9b9650b..16051206467 100644
--- a/keyboards/dm9records/plaid/rules.mk
+++ b/keyboards/dm9records/plaid/rules.mk
@@ -1,16 +1,3 @@
-# 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
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json
deleted file mode 100644
index 0f8168edb9d..00000000000
--- a/keyboards/dm9records/tartan/info.json
+++ /dev/null
@@ -1,447 +0,0 @@
-{
- "keyboard_name": "Tartan",
- "manufacturer": "Dm9Records",
- "url": "https://github.com/hsgw/tartan",
- "maintainer": "hsgw(Takuya Urakawa)",
- "usb": {
- "vid": "0x16C0",
- "pid": "0x27DB",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D7", "D6", "D5", "D4", "B1", "B2", "C1", "C2", "C3", "C5", "D1", "D0", "C4"],
- "rows": ["B4", "B5", "B3", "B0", "C0"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega328p",
- "bootloader": "usbasploader",
- "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift"
- },
- "layouts": {
- "LAYOUT_60_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [4, 9], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [4, 9], "x": 13, "y": 0},
- {"matrix": [4, 10], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [4, 9], "x": 13, "y": 0},
- {"matrix": [4, 10], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [4, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [4, 9], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [4, 11], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_iso_split_bs": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [4, 9], "x": 13, "y": 0},
- {"matrix": [4, 10], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [4, 11], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_iso_split_bs_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [4, 9], "x": 13, "y": 0},
- {"matrix": [4, 10], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [4, 11], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [4, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/dm9records/tartan/keyboard.json b/keyboards/dm9records/tartan/keyboard.json
new file mode 100644
index 00000000000..208dcf330b9
--- /dev/null
+++ b/keyboards/dm9records/tartan/keyboard.json
@@ -0,0 +1,452 @@
+{
+ "keyboard_name": "Tartan",
+ "manufacturer": "Dm9Records",
+ "url": "https://github.com/hsgw/tartan",
+ "maintainer": "hsgw(Takuya Urakawa)",
+ "usb": {
+ "vid": "0x16C0",
+ "pid": "0x27DB",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["D7", "D6", "D5", "D4", "B1", "B2", "C1", "C2", "C3", "C5", "D1", "D0", "C4"],
+ "rows": ["B4", "B5", "B3", "B0", "C0"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega328p",
+ "bootloader": "usbasploader",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true
+ },
+ "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift"
+ },
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [4, 9], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [4, 9], "x": 13, "y": 0},
+ {"matrix": [4, 10], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [4, 9], "x": 13, "y": 0},
+ {"matrix": [4, 10], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [4, 11], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [4, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [4, 9], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [4, 11], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso_split_bs": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [4, 9], "x": 13, "y": 0},
+ {"matrix": [4, 10], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [4, 11], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [4, 9], "x": 13, "y": 0},
+ {"matrix": [4, 10], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [4, 11], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [4, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dm9records/tartan/rules.mk b/keyboards/dm9records/tartan/rules.mk
index 722ea170590..16051206467 100644
--- a/keyboards/dm9records/tartan/rules.mk
+++ b/keyboards/dm9records/tartan/rules.mk
@@ -1,16 +1,3 @@
-# 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
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/doio/kb16/info.json b/keyboards/doio/kb16/info.json
index cadfabdf861..08c19819bb0 100644
--- a/keyboards/doio/kb16/info.json
+++ b/keyboards/doio/kb16/info.json
@@ -8,15 +8,6 @@
"force_nkro": true
},
"diode_direction": "COL2ROW",
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "nkro": true,
- "oled": true,
- "rgb_matrix": true,
- "encoder": true
- },
"build": {
"lto": true
},
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json
deleted file mode 100644
index fc9b30a20a0..00000000000
--- a/keyboards/doio/kb16/rev1/info.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.1"
- },
- "features": {
- "grave_esc": false,
- "space_cadet": false,
- "magic": false
- },
- "matrix_pins": {
- "cols": ["F5", "F4", "F1", "F0", "B7"],
- "rows": ["D5", "D4", "D3", "D2"]
- },
- "encoder": {
- "rotary": [
- {"pin_a": "F7", "pin_b": "E6"},
- {"pin_a": "C7", "pin_b": "C6"},
- {"pin_a": "D7", "pin_b": "D6"}
- ]
- },
- "ws2812": {
- "pin": "F6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/doio/kb16/rev1/keyboard.json b/keyboards/doio/kb16/rev1/keyboard.json
new file mode 100644
index 00000000000..e1382860b8f
--- /dev/null
+++ b/keyboards/doio/kb16/rev1/keyboard.json
@@ -0,0 +1,33 @@
+{
+ "usb": {
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "oled": true,
+ "rgb_matrix": true,
+ "encoder": true,
+ "grave_esc": false,
+ "space_cadet": false,
+ "magic": false
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F4", "F1", "F0", "B7"],
+ "rows": ["D5", "D4", "D3", "D2"]
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F7", "pin_b": "E6"},
+ {"pin_a": "C7", "pin_b": "C6"},
+ {"pin_a": "D7", "pin_b": "D6"}
+ ]
+ },
+ "ws2812": {
+ "pin": "F6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json
deleted file mode 100644
index b3f14e180d7..00000000000
--- a/keyboards/doio/kb16/rev2/info.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["B14", "B13", "B12", "B0", "A7"],
- "rows": ["B3", "B4", "B9", "B8"]
- },
- "encoder": {
- "rotary": [
- {"pin_a": "B5", "pin_b": "B6"},
- {"pin_a": "A1", "pin_b": "A2"},
- {"pin_a": "A3", "pin_b": "A4"}
- ]
- },
- "ws2812": {
- "pin": "A10"
- },
- "processor": "STM32F103",
- "bootloader": "stm32duino"
-}
diff --git a/keyboards/doio/kb16/rev2/keyboard.json b/keyboards/doio/kb16/rev2/keyboard.json
new file mode 100644
index 00000000000..a1157072910
--- /dev/null
+++ b/keyboards/doio/kb16/rev2/keyboard.json
@@ -0,0 +1,30 @@
+{
+ "usb": {
+ "device_version": "0.0.2"
+ },
+ "matrix_pins": {
+ "cols": ["B14", "B13", "B12", "B0", "A7"],
+ "rows": ["B3", "B4", "B9", "B8"]
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "B6"},
+ {"pin_a": "A1", "pin_b": "A2"},
+ {"pin_a": "A3", "pin_b": "A4"}
+ ]
+ },
+ "ws2812": {
+ "pin": "A10"
+ },
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "oled": true,
+ "rgb_matrix": true,
+ "encoder": true
+ }
+}
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json
deleted file mode 100644
index a1775a2b107..00000000000
--- a/keyboards/doio/kb38/info.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
- "manufacturer": "Doio",
- "keyboard_name": "doio/kb38",
- "maintainer": "PepperKats",
- "url": "https://www.keebmonkey.com/products/megalodon-doio-triple-knob-38-keyboard-with-oled-screen",
- "bootloader": "atmel-dfu",
- "diode_direction": "COL2ROW",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true,
- "rgb_matrix": true
- },
- "matrix_pins": {
- "cols": ["F5", "F4", "F1", "F0", "B7", "B6", "B5", "B4"],
- "rows": ["D5", "D4", "D3", "D2", "B3", "B2"]
- },
- "processor": "atmega32u4",
- "usb": {
- "device_version": "1.0.0",
- "pid": "0x3801",
- "vid": "0xD010"
- },
- "encoder": {
- "rotary": [
- {"pin_a": "C7", "pin_b": "C6"},
- {"pin_a": "F7", "pin_b": "E6"},
- {"pin_a": "D6", "pin_b": "D7", "resolution": 2}
- ]
- },
- "ws2812": {
- "pin": "F6"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "cycle_all": true,
- "rainbow_moving_chevron": true
- },
- "driver": "ws2812",
- "layout": [
- {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
- {"flags": 4, "matrix": [0, 1], "x": 62.2, "y": 0},
- {"flags": 4, "matrix": [0, 2], "x": 99.6, "y": 0},
- {"flags": 4, "matrix": [0, 3], "x": 124.4, "y": 0},
- {"flags": 4, "matrix": [0, 4], "x": 149.3, "y": 0},
- {"flags": 4, "matrix": [0, 5], "x": 174.2, "y": 0},
- {"flags": 4, "matrix": [0, 6], "x": 199.1, "y": 0},
- {"flags": 4, "matrix": [0, 7], "x": 224, "y": 0},
-
- {"flags": 4, "matrix": [1, 0], "x": 0, "y": 12.8},
- {"flags": 4, "matrix": [1, 1], "x": 24.9, "y": 12.8},
- {"flags": 4, "matrix": [1, 2], "x": 49.8, "y": 12.8},
- {"flags": 4, "matrix": [1, 3], "x": 74.6, "y": 12.8},
- {"flags": 4, "matrix": [1, 4], "x": 99.6, "y": 12.8},
- {"flags": 4, "matrix": [1, 5], "x": 124.4, "y": 12.8},
- {"flags": 4, "matrix": [1, 6], "x": 149.3, "y": 12.8},
-
- {"flags": 4, "matrix": [2, 0], "x": 0, "y": 25.6},
- {"flags": 4, "matrix": [2, 1], "x": 24.9, "y": 25.6},
- {"flags": 4, "matrix": [2, 2], "x": 49.8, "y": 25.6},
- {"flags": 4, "matrix": [2, 3], "x": 74.6, "y": 32},
- {"flags": 4, "matrix": [2, 4], "x": 90, "y": 25.6},
- {"flags": 4, "matrix": [2, 5], "x": 124.4, "y": 25.6},
- {"flags": 4, "matrix": [2, 6], "x": 149.3, "y": 25.6},
-
- {"flags": 4, "matrix": [3, 0], "x": 0, "y": 38.4},
- {"flags": 4, "matrix": [3, 1], "x": 24.9, "y": 38.4},
- {"flags": 4, "matrix": [3, 2], "x": 49.8, "y": 38.4},
- {"flags": 4, "matrix": [3, 3], "x": 99.6, "y": 38.4},
- {"flags": 4, "matrix": [3, 4], "x": 124.4, "y": 38.4},
- {"flags": 4, "matrix": [3, 5], "x": 149.3, "y": 38.4},
-
- {"flags": 4, "matrix": [4, 0], "x": 0, "y": 51.2},
- {"flags": 4, "matrix": [4, 1], "x": 24.9, "y": 51.2},
- {"flags": 4, "matrix": [4, 2], "x": 49.8, "y": 51.2},
- {"flags": 4, "matrix": [4, 3], "x": 74.6, "y": 57.6},
- {"flags": 4, "matrix": [4, 5], "x": 124.4, "y": 51.2},
-
- {"flags": 4, "matrix": [5, 0], "x": 12.5, "y": 64},
- {"flags": 4, "matrix": [5, 1], "x": 49.8, "y": 64},
- {"flags": 4, "matrix": [5, 2], "x": 99.6, "y": 64},
- {"flags": 4, "matrix": [5, 3], "x": 124.4, "y": 64},
- {"flags": 4, "matrix": [5, 4], "x": 149.3, "y": 64},
-
- {"flags": 2, "x": 224, "y": 64},
- {"flags": 2, "x": 74.6, "y": 64},
- {"flags": 2, "x": 0, "y": 64},
- {"flags": 2, "x": 0, "y": 0},
- {"flags": 2, "x": 74.6, "y": 0},
- {"flags": 2, "x": 224, "y": 0}
- ],
- "max_brightness": 200,
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
- {"matrix": [0, 1], "label": "BSPC", "x": 2, "y": 0, "w": 2},
- {"matrix": [0, 2], "label": "RGB BACK", "x": 4.25, "y": 0},
- {"matrix": [0, 3], "label": "RGB OFF", "x": 5.25, "y": 0},
- {"matrix": [0, 4], "label": "RGB FORW", "x": 6.25, "y": 0},
- {"matrix": [0, 5], "label": "MAKE", "x": 7.5, "y": 0},
- {"matrix": [0, 6], "label": "REBOOT", "x": 8.5, "y": 0},
- {"matrix": [0, 7], "label": "BOOTLOAD", "x": 9.5, "y": 0},
-
- {"matrix": [1, 0], "label": "NUMLOCK", "x": 0, "y": 1.25},
- {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1.25},
- {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1.25},
- {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1.25},
- {"matrix": [1, 4], "label": "PAUS", "x": 4.25, "y": 1.25},
- {"matrix": [1, 5], "label": "SCRL", "x": 5.25, "y": 1.25},
- {"matrix": [1, 6], "label": "PSCR", "x": 6.25, "y": 1.25},
-
- {"matrix": [2, 0], "label": "7", "x": 0, "y": 2.25},
- {"matrix": [2, 1], "label": "8", "x": 1, "y": 2.25},
- {"matrix": [2, 2], "label": "9", "x": 2, "y": 2.25},
- {"matrix": [2, 3], "label": "PPLS", "x": 3, "y": 2.25, "h": 2},
- {"matrix": [2, 4], "label": "INS", "x": 4.25, "y": 2.25},
- {"matrix": [2, 5], "label": "HOME", "x": 5.25, "y": 2.25},
- {"matrix": [2, 6], "label": "PGUP", "x": 6.25, "y": 2.25},
-
- {"matrix": [5, 5], "label": "KNOB_L", "x": 7.5, "y": 2.25},
-
- {"matrix": [5, 6], "label": "KNOB_R", "x": 9.5, "y": 2.25},
-
- {"matrix": [3, 0], "label": "4", "x": 0, "y": 3.25},
- {"matrix": [3, 1], "label": "5", "x": 1, "y": 3.25},
- {"matrix": [3, 2], "label": "6", "x": 2, "y": 3.25},
- {"matrix": [3, 3], "label": "END", "x": 4.25, "y": 3.25},
- {"matrix": [3, 4], "label": "DEL", "x": 5.25, "y": 3.25},
- {"matrix": [3, 5], "label": "PGDN", "x": 6.25, "y": 3.25},
-
- {"matrix": [4, 0], "label": "1", "x": 0, "y": 4.25},
- {"matrix": [4, 1], "label": "2", "x": 1, "y": 4.25},
- {"matrix": [4, 2], "label": "3", "x": 2, "y": 4.25},
- {"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4.25, "h": 2},
- {"matrix": [4, 5], "label": "UP", "x": 5.25, "y": 4.25},
-
- {"matrix": [5, 7], "label": "KNOB_D", "x": 7.5, "y": 3.25, "w": 3, "h": 3}
-
- {"matrix": [5, 0], "label": "0", "x": 0, "y": 5.25, "w": 2},
- {"matrix": [5, 1], "label": "PDOT", "x": 2, "y": 5.25},
- {"matrix": [5, 2], "label": "LEFT", "x": 4.25, "y": 5.25},
- {"matrix": [5, 3], "label": "DOWN", "x": 5.25, "y": 5.25},
- {"matrix": [5, 4], "label": "RIGHT", "x": 6.25, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/doio/kb38/keyboard.json b/keyboards/doio/kb38/keyboard.json
new file mode 100644
index 00000000000..7e978b2be8b
--- /dev/null
+++ b/keyboards/doio/kb38/keyboard.json
@@ -0,0 +1,158 @@
+{
+ "manufacturer": "Doio",
+ "keyboard_name": "doio/kb38",
+ "maintainer": "PepperKats",
+ "url": "https://www.keebmonkey.com/products/megalodon-doio-triple-knob-38-keyboard-with-oled-screen",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "oled": true,
+ "encoder": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F4", "F1", "F0", "B7", "B6", "B5", "B4"],
+ "rows": ["D5", "D4", "D3", "D2", "B3", "B2"]
+ },
+ "processor": "atmega32u4",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x3801",
+ "vid": "0xD010"
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "C7", "pin_b": "C6"},
+ {"pin_a": "F7", "pin_b": "E6"},
+ {"pin_a": "D6", "pin_b": "D7", "resolution": 2}
+ ]
+ },
+ "ws2812": {
+ "pin": "F6"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "cycle_all": true,
+ "rainbow_moving_chevron": true
+ },
+ "driver": "ws2812",
+ "layout": [
+ {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+ {"flags": 4, "matrix": [0, 1], "x": 62.2, "y": 0},
+ {"flags": 4, "matrix": [0, 2], "x": 99.6, "y": 0},
+ {"flags": 4, "matrix": [0, 3], "x": 124.4, "y": 0},
+ {"flags": 4, "matrix": [0, 4], "x": 149.3, "y": 0},
+ {"flags": 4, "matrix": [0, 5], "x": 174.2, "y": 0},
+ {"flags": 4, "matrix": [0, 6], "x": 199.1, "y": 0},
+ {"flags": 4, "matrix": [0, 7], "x": 224, "y": 0},
+
+ {"flags": 4, "matrix": [1, 0], "x": 0, "y": 12.8},
+ {"flags": 4, "matrix": [1, 1], "x": 24.9, "y": 12.8},
+ {"flags": 4, "matrix": [1, 2], "x": 49.8, "y": 12.8},
+ {"flags": 4, "matrix": [1, 3], "x": 74.6, "y": 12.8},
+ {"flags": 4, "matrix": [1, 4], "x": 99.6, "y": 12.8},
+ {"flags": 4, "matrix": [1, 5], "x": 124.4, "y": 12.8},
+ {"flags": 4, "matrix": [1, 6], "x": 149.3, "y": 12.8},
+
+ {"flags": 4, "matrix": [2, 0], "x": 0, "y": 25.6},
+ {"flags": 4, "matrix": [2, 1], "x": 24.9, "y": 25.6},
+ {"flags": 4, "matrix": [2, 2], "x": 49.8, "y": 25.6},
+ {"flags": 4, "matrix": [2, 3], "x": 74.6, "y": 32},
+ {"flags": 4, "matrix": [2, 4], "x": 90, "y": 25.6},
+ {"flags": 4, "matrix": [2, 5], "x": 124.4, "y": 25.6},
+ {"flags": 4, "matrix": [2, 6], "x": 149.3, "y": 25.6},
+
+ {"flags": 4, "matrix": [3, 0], "x": 0, "y": 38.4},
+ {"flags": 4, "matrix": [3, 1], "x": 24.9, "y": 38.4},
+ {"flags": 4, "matrix": [3, 2], "x": 49.8, "y": 38.4},
+ {"flags": 4, "matrix": [3, 3], "x": 99.6, "y": 38.4},
+ {"flags": 4, "matrix": [3, 4], "x": 124.4, "y": 38.4},
+ {"flags": 4, "matrix": [3, 5], "x": 149.3, "y": 38.4},
+
+ {"flags": 4, "matrix": [4, 0], "x": 0, "y": 51.2},
+ {"flags": 4, "matrix": [4, 1], "x": 24.9, "y": 51.2},
+ {"flags": 4, "matrix": [4, 2], "x": 49.8, "y": 51.2},
+ {"flags": 4, "matrix": [4, 3], "x": 74.6, "y": 57.6},
+ {"flags": 4, "matrix": [4, 5], "x": 124.4, "y": 51.2},
+
+ {"flags": 4, "matrix": [5, 0], "x": 12.5, "y": 64},
+ {"flags": 4, "matrix": [5, 1], "x": 49.8, "y": 64},
+ {"flags": 4, "matrix": [5, 2], "x": 99.6, "y": 64},
+ {"flags": 4, "matrix": [5, 3], "x": 124.4, "y": 64},
+ {"flags": 4, "matrix": [5, 4], "x": 149.3, "y": 64},
+
+ {"flags": 2, "x": 224, "y": 64},
+ {"flags": 2, "x": 74.6, "y": 64},
+ {"flags": 2, "x": 0, "y": 64},
+ {"flags": 2, "x": 0, "y": 0},
+ {"flags": 2, "x": 74.6, "y": 0},
+ {"flags": 2, "x": 224, "y": 0}
+ ],
+ "max_brightness": 200,
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+ {"matrix": [0, 1], "label": "BSPC", "x": 2, "y": 0, "w": 2},
+ {"matrix": [0, 2], "label": "RGB BACK", "x": 4.25, "y": 0},
+ {"matrix": [0, 3], "label": "RGB OFF", "x": 5.25, "y": 0},
+ {"matrix": [0, 4], "label": "RGB FORW", "x": 6.25, "y": 0},
+ {"matrix": [0, 5], "label": "MAKE", "x": 7.5, "y": 0},
+ {"matrix": [0, 6], "label": "REBOOT", "x": 8.5, "y": 0},
+ {"matrix": [0, 7], "label": "BOOTLOAD", "x": 9.5, "y": 0},
+
+ {"matrix": [1, 0], "label": "NUMLOCK", "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "label": "PAUS", "x": 4.25, "y": 1.25},
+ {"matrix": [1, 5], "label": "SCRL", "x": 5.25, "y": 1.25},
+ {"matrix": [1, 6], "label": "PSCR", "x": 6.25, "y": 1.25},
+
+ {"matrix": [2, 0], "label": "7", "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "label": "8", "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "label": "9", "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "label": "PPLS", "x": 3, "y": 2.25, "h": 2},
+ {"matrix": [2, 4], "label": "INS", "x": 4.25, "y": 2.25},
+ {"matrix": [2, 5], "label": "HOME", "x": 5.25, "y": 2.25},
+ {"matrix": [2, 6], "label": "PGUP", "x": 6.25, "y": 2.25},
+
+ {"matrix": [5, 5], "label": "KNOB_L", "x": 7.5, "y": 2.25},
+
+ {"matrix": [5, 6], "label": "KNOB_R", "x": 9.5, "y": 2.25},
+
+ {"matrix": [3, 0], "label": "4", "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "label": "5", "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "label": "6", "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "label": "END", "x": 4.25, "y": 3.25},
+ {"matrix": [3, 4], "label": "DEL", "x": 5.25, "y": 3.25},
+ {"matrix": [3, 5], "label": "PGDN", "x": 6.25, "y": 3.25},
+
+ {"matrix": [4, 0], "label": "1", "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "label": "2", "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "label": "3", "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4.25, "h": 2},
+ {"matrix": [4, 5], "label": "UP", "x": 5.25, "y": 4.25},
+
+ {"matrix": [5, 7], "label": "KNOB_D", "x": 7.5, "y": 3.25, "w": 3, "h": 3}
+
+ {"matrix": [5, 0], "label": "0", "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [5, 1], "label": "PDOT", "x": 2, "y": 5.25},
+ {"matrix": [5, 2], "label": "LEFT", "x": 4.25, "y": 5.25},
+ {"matrix": [5, 3], "label": "DOWN", "x": 5.25, "y": 5.25},
+ {"matrix": [5, 4], "label": "RIGHT", "x": 6.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/doio/kb38/rules.mk b/keyboards/doio/kb38/rules.mk
index a5f1063634e..942ef4c5dbd 100644
--- a/keyboards/doio/kb38/rules.mk
+++ b/keyboards/doio/kb38/rules.mk
@@ -1,3 +1 @@
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-RGB_MATRIX_CUSTOM_KB = yes
\ No newline at end of file
+RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json
deleted file mode 100644
index ea53bfb9156..00000000000
--- a/keyboards/doppelganger/info.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
- "keyboard_name": "Doppelganger",
- "manufacturer": "Yiancar-Designs",
- "url": "",
- "maintainer": "yiancar",
- "usb": {
- "vid": "0x8968",
- "pid": "0x4447",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F0", "B7", "B3", "B2", "B1", "D5", "D3", "D2"],
- "rows": ["E6", "F1", "C7", "F7", "F6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D1",
- "matrix_pins": {
- "right": {
- "cols": ["F1", "F0", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
- "rows": ["D7", "D6", "D4", "E6", "B5"]
- }
- }
- },
- "rgblight": {
- "led_count": 2,
- "split_count": [1, 1]
- },
- "ws2812": {
- "pin": "B4"
- },
- "bootmagic": {
- "matrix": [0, 2]
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 1], "x": 1, "y": 0},
-
- {"matrix": [0, 2], "x": 2.5, "y": 0},
- {"matrix": [0, 3], "x": 3.5, "y": 0},
- {"matrix": [0, 4], "x": 4.5, "y": 0},
- {"matrix": [0, 5], "x": 5.5, "y": 0},
- {"matrix": [0, 6], "x": 6.5, "y": 0},
- {"matrix": [0, 7], "x": 7.5, "y": 0},
- {"matrix": [0, 8], "x": 8.5, "y": 0},
-
- {"matrix": [5, 0], "x": 10.5, "y": 0},
- {"matrix": [5, 1], "x": 11.5, "y": 0},
- {"matrix": [5, 2], "x": 12.5, "y": 0},
- {"matrix": [5, 3], "x": 13.5, "y": 0},
- {"matrix": [5, 4], "x": 14.5, "y": 0},
- {"matrix": [5, 5], "x": 15.5, "y": 0},
- {"matrix": [5, 6], "x": 16.5, "y": 0},
- {"matrix": [5, 7], "x": 17.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
-
- {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
- {"matrix": [1, 3], "x": 4, "y": 1},
- {"matrix": [1, 4], "x": 5, "y": 1},
- {"matrix": [1, 5], "x": 6, "y": 1},
- {"matrix": [1, 6], "x": 7, "y": 1},
- {"matrix": [1, 7], "x": 8, "y": 1},
-
- {"matrix": [6, 0], "x": 10, "y": 1},
- {"matrix": [6, 1], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1},
- {"matrix": [6, 3], "x": 13, "y": 1},
- {"matrix": [6, 4], "x": 14, "y": 1},
- {"matrix": [6, 5], "x": 15, "y": 1},
- {"matrix": [6, 6], "x": 16, "y": 1},
- {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
-
- {"matrix": [6, 8], "x": 19, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
-
- {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
- {"matrix": [2, 3], "x": 4.25, "y": 2},
- {"matrix": [2, 4], "x": 5.25, "y": 2},
- {"matrix": [2, 5], "x": 6.25, "y": 2},
- {"matrix": [2, 6], "x": 7.25, "y": 2},
- {"matrix": [2, 7], "x": 8.25, "y": 2},
-
- {"matrix": [7, 0], "x": 10.25, "y": 2},
- {"matrix": [7, 1], "x": 11.25, "y": 2},
- {"matrix": [7, 2], "x": 12.25, "y": 2},
- {"matrix": [7, 3], "x": 13.25, "y": 2},
- {"matrix": [7, 4], "x": 14.25, "y": 2},
- {"matrix": [7, 5], "x": 15.25, "y": 2},
- {"matrix": [7, 6], "x": 16.25, "y": 2},
- {"matrix": [7, 7], "x": 17.25, "y": 2, "w": 1.25},
-
- {"matrix": [7, 8], "x": 19, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
-
- {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
-
- {"matrix": [8, 1], "x": 10.75, "y": 3},
- {"matrix": [8, 2], "x": 11.75, "y": 3},
- {"matrix": [8, 3], "x": 12.75, "y": 3},
- {"matrix": [8, 4], "x": 13.75, "y": 3},
- {"matrix": [8, 5], "x": 14.75, "y": 3},
- {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
-
- {"matrix": [8, 7], "x": 17.75, "y": 3.25},
-
- {"matrix": [8, 8], "x": 19, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
-
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4},
- {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
- {"matrix": [4, 6], "x": 8.25, "y": 4},
-
- {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 2.75},
- {"matrix": [9, 3], "x": 13, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 14.25, "y": 4},
- {"matrix": [9, 5], "x": 15.25, "y": 4, "w": 1.25},
-
- {"matrix": [9, 6], "x": 16.75, "y": 4.25},
- {"matrix": [9, 7], "x": 17.75, "y": 4.25},
- {"matrix": [9, 8], "x": 18.75, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/doppelganger/keyboard.json b/keyboards/doppelganger/keyboard.json
new file mode 100644
index 00000000000..2be90e30abf
--- /dev/null
+++ b/keyboards/doppelganger/keyboard.json
@@ -0,0 +1,150 @@
+{
+ "keyboard_name": "Doppelganger",
+ "manufacturer": "Yiancar-Designs",
+ "url": "",
+ "maintainer": "yiancar",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x4447",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F0", "B7", "B3", "B2", "B1", "D5", "D3", "D2"],
+ "rows": ["E6", "F1", "C7", "F7", "F6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D1",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F1", "F0", "F4", "F5", "F6", "F7", "C7", "C6", "B6"],
+ "rows": ["D7", "D6", "D4", "E6", "B5"]
+ }
+ }
+ },
+ "rgblight": {
+ "led_count": 2,
+ "split_count": [1, 1]
+ },
+ "ws2812": {
+ "pin": "B4"
+ },
+ "bootmagic": {
+ "matrix": [0, 2]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 10.5, "y": 0},
+ {"matrix": [5, 1], "x": 11.5, "y": 0},
+ {"matrix": [5, 2], "x": 12.5, "y": 0},
+ {"matrix": [5, 3], "x": 13.5, "y": 0},
+ {"matrix": [5, 4], "x": 14.5, "y": 0},
+ {"matrix": [5, 5], "x": 15.5, "y": 0},
+ {"matrix": [5, 6], "x": 16.5, "y": 0},
+ {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+
+ {"matrix": [6, 0], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 4], "x": 14, "y": 1},
+ {"matrix": [6, 5], "x": 15, "y": 1},
+ {"matrix": [6, 6], "x": 16, "y": 1},
+ {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 8], "x": 19, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+ {"matrix": [2, 7], "x": 8.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 10.25, "y": 2},
+ {"matrix": [7, 1], "x": 11.25, "y": 2},
+ {"matrix": [7, 2], "x": 12.25, "y": 2},
+ {"matrix": [7, 3], "x": 13.25, "y": 2},
+ {"matrix": [7, 4], "x": 14.25, "y": 2},
+ {"matrix": [7, 5], "x": 15.25, "y": 2},
+ {"matrix": [7, 6], "x": 16.25, "y": 2},
+ {"matrix": [7, 7], "x": 17.25, "y": 2, "w": 1.25},
+
+ {"matrix": [7, 8], "x": 19, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+ {"matrix": [8, 1], "x": 10.75, "y": 3},
+ {"matrix": [8, 2], "x": 11.75, "y": 3},
+ {"matrix": [8, 3], "x": 12.75, "y": 3},
+ {"matrix": [8, 4], "x": 13.75, "y": 3},
+ {"matrix": [8, 5], "x": 14.75, "y": 3},
+ {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 7], "x": 17.75, "y": 3.25},
+
+ {"matrix": [8, 8], "x": 19, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.25, "y": 4},
+
+ {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 13, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 5], "x": 15.25, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 6], "x": 16.75, "y": 4.25},
+ {"matrix": [9, 7], "x": 17.75, "y": 4.25},
+ {"matrix": [9, 8], "x": 18.75, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/doppelganger/rules.mk b/keyboards/doppelganger/rules.mk
deleted file mode 100644
index f1a07bd25ef..00000000000
--- a/keyboards/doppelganger/rules.mk
+++ /dev/null
@@ -1,13 +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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json
index 442d6d6a66d..7fa05f4c121 100644
--- a/keyboards/dp3000/info.json
+++ b/keyboards/dp3000/info.json
@@ -3,16 +3,6 @@
"maintainer": "depermana12",
"diode_direction": "COL2ROW",
"development_board": "promicro",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "encoder": true,
- "oled": true,
- "mousekey": false,
- "nkro": false
- },
"build": {
"lto": true
},
diff --git a/keyboards/dp3000/rev1/keyboard.json b/keyboards/dp3000/rev1/keyboard.json
index 63d023de5cf..aa7ff8bc0a9 100644
--- a/keyboards/dp3000/rev1/keyboard.json
+++ b/keyboards/dp3000/rev1/keyboard.json
@@ -1,6 +1,14 @@
{
"keyboard_name": "dp3000",
"features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "encoder": true,
+ "oled": true,
+ "mousekey": false,
+ "nkro": false,
"rgb_matrix": true
},
"usb": {
diff --git a/keyboards/dp3000/rev2/keyboard.json b/keyboards/dp3000/rev2/keyboard.json
index f6f03eeb639..7d82c384601 100644
--- a/keyboards/dp3000/rev2/keyboard.json
+++ b/keyboards/dp3000/rev2/keyboard.json
@@ -1,6 +1,14 @@
{
"keyboard_name": "dp3000 rev2",
"features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "encoder": true,
+ "oled": true,
+ "mousekey": false,
+ "nkro": false,
"rgblight": true
},
"usb": {
diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json
deleted file mode 100644
index ec36a725c34..00000000000
--- a/keyboards/dp60/info.json
+++ /dev/null
@@ -1,564 +0,0 @@
-{
- "keyboard_name": "DP60",
- "manufacturer": "astro",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x60BE",
- "pid": "0x00BE",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 18,
- "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": {
- "pin": "D7"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true
- },
- "driver": "is31fl3731"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift",
- "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb"
- },
- "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift"],
- "layouts": {
- "LAYOUT_60_ansi_tsangan_split_rshift": {
- "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": [4, 7], "x": 7, "y": 0},
- {"matrix": [0, 7], "x": 8, "y": 0},
- {"matrix": [0, 8], "x": 9, "y": 0},
- {"matrix": [0, 9], "x": 10, "y": 0},
- {"matrix": [0, 10], "x": 11, "y": 0},
- {"matrix": [0, 11], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_ansi": {
- "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": [4, 7], "x": 7, "y": 0},
- {"matrix": [0, 7], "x": 8, "y": 0},
- {"matrix": [0, 8], "x": 9, "y": 0},
- {"matrix": [0, 9], "x": 10, "y": 0},
- {"matrix": [0, 10], "x": 11, "y": 0},
- {"matrix": [0, 11], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_hhkb": {
- "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": [4, 7], "x": 7, "y": 0},
- {"matrix": [0, 7], "x": 8, "y": 0},
- {"matrix": [0, 8], "x": 9, "y": 0},
- {"matrix": [0, 9], "x": 10, "y": 0},
- {"matrix": [0, 10], "x": 11, "y": 0},
- {"matrix": [0, 11], "x": 12, "y": 0},
- {"matrix": [0, 12], "x": 13, "y": 0},
- {"matrix": [0, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4}
- ]
- },
- "LAYOUT_60_iso": {
- "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": [4, 7], "x": 7, "y": 0},
- {"matrix": [0, 7], "x": 8, "y": 0},
- {"matrix": [0, 8], "x": 9, "y": 0},
- {"matrix": [0, 9], "x": 10, "y": 0},
- {"matrix": [0, 10], "x": 11, "y": 0},
- {"matrix": [0, 11], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 1.75, "y": 2},
- {"matrix": [2, 3], "x": 2.75, "y": 2},
- {"matrix": [2, 4], "x": 3.75, "y": 2},
- {"matrix": [2, 5], "x": 4.75, "y": 2},
- {"matrix": [2, 6], "x": 5.75, "y": 2},
- {"matrix": [2, 7], "x": 6.75, "y": 2},
- {"matrix": [2, 8], "x": 7.75, "y": 2},
- {"matrix": [2, 9], "x": 8.75, "y": 2},
- {"matrix": [2, 10], "x": 9.75, "y": 2},
- {"matrix": [2, 11], "x": 10.75, "y": 2},
- {"matrix": [2, 12], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "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": [4, 7], "x": 7, "y": 0},
- {"matrix": [0, 7], "x": 8, "y": 0},
- {"matrix": [0, 8], "x": 9, "y": 0},
- {"matrix": [0, 9], "x": 10, "y": 0},
- {"matrix": [0, 10], "x": 11, "y": 0},
- {"matrix": [0, 11], "x": 12, "y": 0},
- {"matrix": [0, 12], "x": 13, "y": 0},
- {"matrix": [0, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "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": [4, 7], "x": 7, "y": 0},
- {"matrix": [0, 7], "x": 8, "y": 0},
- {"matrix": [0, 8], "x": 9, "y": 0},
- {"matrix": [0, 9], "x": 10, "y": 0},
- {"matrix": [0, 10], "x": 11, "y": 0},
- {"matrix": [0, 11], "x": 12, "y": 0},
- {"matrix": [0, 12], "x": 13, "y": 0},
- {"matrix": [0, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_all": {
- "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": [4, 7], "x": 7, "y": 0},
- {"matrix": [0, 7], "x": 8, "y": 0},
- {"matrix": [0, 8], "x": 9, "y": 0},
- {"matrix": [0, 9], "x": 10, "y": 0},
- {"matrix": [0, 10], "x": 11, "y": 0},
- {"matrix": [0, 11], "x": 12, "y": 0},
- {"matrix": [0, 12], "x": 13, "y": 0},
- {"matrix": [0, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/dp60/keyboard.json b/keyboards/dp60/keyboard.json
new file mode 100644
index 00000000000..c9b3b6fddef
--- /dev/null
+++ b/keyboards/dp60/keyboard.json
@@ -0,0 +1,571 @@
+{
+ "keyboard_name": "DP60",
+ "manufacturer": "astro",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x60BE",
+ "pid": "0x00BE",
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 18,
+ "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": {
+ "pin": "D7"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true
+ },
+ "driver": "is31fl3731"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "layout_aliases": {
+ "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift",
+ "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb"
+ },
+ "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift"],
+ "layouts": {
+ "LAYOUT_60_ansi_tsangan_split_rshift": {
+ "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": [4, 7], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_ansi": {
+ "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": [4, 7], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "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": [4, 7], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "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": [4, 7], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "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": [4, 7], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "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": [4, 7], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "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": [4, 7], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk
index 0aa07f4709d..8784813b335 100644
--- a/keyboards/dp60/rules.mk
+++ b/keyboards/dp60/rules.mk
@@ -1,16 +1,2 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Use RGB underglow light
-RGB_MATRIX_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json
deleted file mode 100644
index cd157a0ed58..00000000000
--- a/keyboards/draculad/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
- "keyboard_name": "DracuLad",
- "manufacturer": "MangoIV",
- "url": "",
- "maintainer": "MangoIV",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x1B1E",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 10,
- "sleep": true,
- "split": true,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "static_gradient": true
- }
- },
- "ws2812": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1"],
- "rows": ["D4", "C6", "D7", "E6"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B2", "pin_b": "B6"},
- {"pin_a": "B4", "pin_b": "B5"}
- ]
- },
- "split": {
- "soft_serial_pin": "D2",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "B2", "pin_b": "B6", "resolution": 4},
- {"pin_a": "B4", "pin_b": "B5", "resolution": 1}
- ]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 1},
- {"matrix": [0, 1], "x": 1, "y": 0.35},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.35},
- {"matrix": [0, 4], "x": 4, "y": 0.5},
-
- {"matrix": [4, 4], "x": 8, "y": 0.5},
- {"matrix": [4, 3], "x": 9, "y": 0.35},
- {"matrix": [4, 2], "x": 10, "y": 0},
- {"matrix": [4, 1], "x": 11, "y": 0.35},
- {"matrix": [4, 0], "x": 12, "y": 1},
-
- {"matrix": [1, 0], "x": 0, "y": 2},
- {"matrix": [1, 1], "x": 1, "y": 1.35},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.35},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
-
- {"matrix": [5, 4], "x": 8, "y": 1.5},
- {"matrix": [5, 3], "x": 9, "y": 1.35},
- {"matrix": [5, 2], "x": 10, "y": 1},
- {"matrix": [5, 1], "x": 11, "y": 1.35},
- {"matrix": [5, 0], "x": 12, "y": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 3},
- {"matrix": [2, 1], "x": 1, "y": 2.35},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.35},
- {"matrix": [2, 4], "x": 4, "y": 2.5},
-
- {"matrix": [6, 4], "x": 8, "y": 2.5},
- {"matrix": [6, 3], "x": 9, "y": 2.35},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 1], "x": 11, "y": 2.35},
- {"matrix": [6, 0], "x": 12, "y": 3},
-
- {"matrix": [3, 1], "x": 4.25, "y": 3.5},
-
- {"matrix": [7, 1], "x": 7.75, "y": 3.5},
-
- {"matrix": [3, 2], "x": 3, "y": 4.5},
- {"matrix": [3, 3], "x": 4, "y": 4.5},
- {"matrix": [3, 4], "x": 5, "y": 4.5},
-
- {"matrix": [7, 4], "x": 7, "y": 4.5},
- {"matrix": [7, 3], "x": 8, "y": 4.5},
- {"matrix": [7, 2], "x": 9, "y": 4.5}
- ]
- }
- }
-}
diff --git a/keyboards/draculad/keyboard.json b/keyboards/draculad/keyboard.json
new file mode 100644
index 00000000000..bfaa8a4979d
--- /dev/null
+++ b/keyboards/draculad/keyboard.json
@@ -0,0 +1,118 @@
+{
+ "keyboard_name": "DracuLad",
+ "manufacturer": "MangoIV",
+ "url": "",
+ "maintainer": "MangoIV",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1B1E",
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 10,
+ "sleep": true,
+ "split": true,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "static_gradient": true
+ }
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "B6"},
+ {"pin_a": "B4", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "B6", "resolution": 4},
+ {"pin_a": "B4", "pin_b": "B5", "resolution": 1}
+ ]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "oled": true,
+ "wpm": true,
+ "encoder": true
+ },
+ "build": {
+ "lto": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.35},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.35},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+ {"matrix": [4, 4], "x": 8, "y": 0.5},
+ {"matrix": [4, 3], "x": 9, "y": 0.35},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0.35},
+ {"matrix": [4, 0], "x": 12, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.35},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.35},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+ {"matrix": [5, 4], "x": 8, "y": 1.5},
+ {"matrix": [5, 3], "x": 9, "y": 1.35},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1.35},
+ {"matrix": [5, 0], "x": 12, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.35},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.35},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+ {"matrix": [6, 4], "x": 8, "y": 2.5},
+ {"matrix": [6, 3], "x": 9, "y": 2.35},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2.35},
+ {"matrix": [6, 0], "x": 12, "y": 3},
+
+ {"matrix": [3, 1], "x": 4.25, "y": 3.5},
+
+ {"matrix": [7, 1], "x": 7.75, "y": 3.5},
+
+ {"matrix": [3, 2], "x": 3, "y": 4.5},
+ {"matrix": [3, 3], "x": 4, "y": 4.5},
+ {"matrix": [3, 4], "x": 5, "y": 4.5},
+
+ {"matrix": [7, 4], "x": 7, "y": 4.5},
+ {"matrix": [7, 3], "x": 8, "y": 4.5},
+ {"matrix": [7, 2], "x": 9, "y": 4.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/draculad/rules.mk b/keyboards/draculad/rules.mk
deleted file mode 100644
index 5f5fd002a1a..00000000000
--- a/keyboards/draculad/rules.mk
+++ /dev/null
@@ -1,17 +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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h
deleted file mode 100644
index 4ae200c6a66..00000000000
--- a/keyboards/draytronics/scarlet/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*Copyright 2020 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-/* disable debug print */
-//#define NO_DEBUG
-/* disable print */
-//#define NO_PRINT
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/info.json
deleted file mode 100644
index cb84baca06c..00000000000
--- a/keyboards/draytronics/scarlet/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "keyboard_name": "SCARLET",
- "manufacturer": "Draytronics",
- "url": "https://www.draytronics.co.uk/scarlet",
- "maintainer": "ghostseven",
- "usb": {
- "vid": "0x4454",
- "pid": "0x5343",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["A5", "A6", "A7", "C7"],
- "rows": ["A0", "A1", "A2", "A3", "A4"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32a",
- "bootloader": "usbasploader",
- "community_layouts": ["numpad_5x4"],
- "layouts": {
- "LAYOUT_numpad_5x4": {
- "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": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/draytronics/scarlet/keyboard.json b/keyboards/draytronics/scarlet/keyboard.json
new file mode 100644
index 00000000000..0eabd378da2
--- /dev/null
+++ b/keyboards/draytronics/scarlet/keyboard.json
@@ -0,0 +1,57 @@
+{
+ "keyboard_name": "SCARLET",
+ "manufacturer": "Draytronics",
+ "url": "https://www.draytronics.co.uk/scarlet",
+ "maintainer": "ghostseven",
+ "usb": {
+ "vid": "0x4454",
+ "pid": "0x5343",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["A5", "A6", "A7", "C7"],
+ "rows": ["A0", "A1", "A2", "A3", "A4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "community_layouts": ["numpad_5x4"],
+ "layouts": {
+ "LAYOUT_numpad_5x4": {
+ "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": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/draytronics/scarlet/rules.mk b/keyboards/draytronics/scarlet/rules.mk
index 1e9f9255447..c2ee0bc86f9 100644
--- a/keyboards/draytronics/scarlet/rules.mk
+++ b/keyboards/draytronics/scarlet/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 16000000
-
-# 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
diff --git a/keyboards/drop/alt/v2/info.json b/keyboards/drop/alt/v2/keyboard.json
similarity index 100%
rename from keyboards/drop/alt/v2/info.json
rename to keyboards/drop/alt/v2/keyboard.json
diff --git a/keyboards/drop/cstm65/info.json b/keyboards/drop/cstm65/keyboard.json
similarity index 100%
rename from keyboards/drop/cstm65/info.json
rename to keyboards/drop/cstm65/keyboard.json
diff --git a/keyboards/drop/cstm80/info.json b/keyboards/drop/cstm80/keyboard.json
similarity index 100%
rename from keyboards/drop/cstm80/info.json
rename to keyboards/drop/cstm80/keyboard.json
diff --git a/keyboards/drop/ctrl/v2/info.json b/keyboards/drop/ctrl/v2/keyboard.json
similarity index 100%
rename from keyboards/drop/ctrl/v2/info.json
rename to keyboards/drop/ctrl/v2/keyboard.json
diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/keyboard.json
similarity index 100%
rename from keyboards/drop/sense75/info.json
rename to keyboards/drop/sense75/keyboard.json
diff --git a/keyboards/drop/shift/v2/info.json b/keyboards/drop/shift/v2/keyboard.json
similarity index 100%
rename from keyboards/drop/shift/v2/info.json
rename to keyboards/drop/shift/v2/keyboard.json
diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json
deleted file mode 100644
index c2acc3b0d95..00000000000
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ /dev/null
@@ -1,396 +0,0 @@
-{
- "keyboard_name": "Eagle/Viper V2",
- "manufacturer": "Duck",
- "usb": {
- "vid": "0x444B",
- "pid": "0x4556",
- "device_version": "0.0.2"
- },
- "backlight": {
- "driver": "custom"
- },
- "bootmagic": {
- "matrix": [4, 10]
- },
- "rgblight": {
- "led_count": 17,
- "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": {
- "pin": "D6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_eagle": "LAYOUT_60_ansi",
- "LAYOUT_viper": "LAYOUT_60_hhkb",
- "LAYOUT_eagle_splits": "LAYOUT_60_ansi_split_bs_lshift_rshift"
- },
- "community_layouts": ["60_ansi", "60_hhkb", "60_ansi_split_bs_rshift"],
- "layouts": {
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 12], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 12], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 12], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_lshift_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 12], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 12], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 14, "y": 3},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 13], "x": 12.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/duck/eagle_viper/v2/keyboard.json b/keyboards/duck/eagle_viper/v2/keyboard.json
new file mode 100644
index 00000000000..9c16c48db3e
--- /dev/null
+++ b/keyboards/duck/eagle_viper/v2/keyboard.json
@@ -0,0 +1,405 @@
+{
+ "keyboard_name": "Eagle/Viper V2",
+ "manufacturer": "Duck",
+ "usb": {
+ "vid": "0x444B",
+ "pid": "0x4556",
+ "device_version": "0.0.2"
+ },
+ "backlight": {
+ "driver": "custom"
+ },
+ "bootmagic": {
+ "matrix": [4, 10]
+ },
+ "rgblight": {
+ "led_count": 17,
+ "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": {
+ "pin": "D6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "layout_aliases": {
+ "LAYOUT_eagle": "LAYOUT_60_ansi",
+ "LAYOUT_viper": "LAYOUT_60_hhkb",
+ "LAYOUT_eagle_splits": "LAYOUT_60_ansi_split_bs_lshift_rshift"
+ },
+ "community_layouts": ["60_ansi", "60_hhkb", "60_ansi_split_bs_rshift"],
+ "layouts": {
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_lshift_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 12], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 8], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 12.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/duck/eagle_viper/v2/rules.mk b/keyboards/duck/eagle_viper/v2/rules.mk
index a2b82ea590e..819cb814ecc 100644
--- a/keyboards/duck/eagle_viper/v2/rules.mk
+++ b/keyboards/duck/eagle_viper/v2/rules.mk
@@ -1,15 +1,2 @@
-# 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 = yes # 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
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json
deleted file mode 100644
index fbd5d8cb140..00000000000
--- a/keyboards/duck/jetfire/info.json
+++ /dev/null
@@ -1,292 +0,0 @@
-{
- "keyboard_name": "Jetfire",
- "manufacturer": "Duck",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444B",
- "pid": "0x4A46",
- "device_version": "0.0.1"
- },
- "backlight": {
- "driver": "custom",
- "levels": 1
- },
- "bootmagic": {
- "matrix": [5, 10]
- },
- "rgblight": {
- "led_count": 23,
- "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": {
- "pin": "D6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
- {"matrix": [0, 8], "x": 7.5, "y": 0},
- {"matrix": [0, 9], "x": 8.5, "y": 0},
- {"matrix": [0, 10], "x": 9.5, "y": 0},
-
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [0, 15], "x": 15.25, "y": 0},
-
- {"matrix": [0, 16], "x": 16.5, "y": 0},
- {"matrix": [0, 17], "x": 17.5, "y": 0},
- {"matrix": [0, 18], "x": 18.5, "y": 0},
- {"matrix": [0, 19], "x": 19.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25},
- {"matrix": [1, 14], "x": 14, "y": 1.25},
-
- {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-
- {"matrix": [1, 16], "x": 16.5, "y": 1.25},
- {"matrix": [1, 17], "x": 17.5, "y": 1.25},
- {"matrix": [1, 18], "x": 18.5, "y": 1.25},
- {"matrix": [1, 19], "x": 19.5, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [2, 15], "x": 15.25, "y": 2.25},
-
- {"matrix": [2, 16], "x": 16.5, "y": 2.25},
- {"matrix": [2, 17], "x": 17.5, "y": 2.25},
- {"matrix": [2, 18], "x": 18.5, "y": 2.25},
- {"matrix": [2, 19], "x": 19.5, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [3, 16], "x": 16.5, "y": 3.25},
- {"matrix": [3, 17], "x": 17.5, "y": 3.25},
- {"matrix": [3, 18], "x": 18.5, "y": 3.25},
- {"matrix": [3, 19], "x": 19.5, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 12], "x": 11.25, "y": 4.25},
- {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
- {"matrix": [4, 14], "x": 14, "y": 4.25},
-
- {"matrix": [4, 15], "x": 15.25, "y": 4.5},
-
- {"matrix": [4, 16], "x": 16.5, "y": 4.25},
- {"matrix": [4, 17], "x": 17.5, "y": 4.25},
- {"matrix": [4, 18], "x": 18.5, "y": 4.25},
- {"matrix": [4, 19], "x": 19.5, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 6.25},
- {"matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 12], "x": 11.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 13], "x": 12.75, "y": 5.25, "w": 1.25},
-
- {"matrix": [5, 14], "x": 14.25, "y": 5.5},
- {"matrix": [5, 15], "x": 15.25, "y": 5.5},
- {"matrix": [5, 16], "x": 16.25, "y": 5.5},
-
- {"matrix": [5, 17], "x": 17.5, "y": 5.25},
- {"matrix": [5, 18], "x": 18.5, "y": 5.25},
- {"matrix": [5, 19], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
- {"matrix": [0, 8], "x": 7.5, "y": 0},
- {"matrix": [0, 9], "x": 8.5, "y": 0},
- {"matrix": [0, 10], "x": 9.5, "y": 0},
-
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [0, 15], "x": 15.25, "y": 0},
-
- {"matrix": [0, 16], "x": 16.5, "y": 0},
- {"matrix": [0, 17], "x": 17.5, "y": 0},
- {"matrix": [0, 18], "x": 18.5, "y": 0},
- {"matrix": [0, 19], "x": 19.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [1, 15], "x": 15.25, "y": 1.25},
-
- {"matrix": [1, 16], "x": 16.5, "y": 1.25},
- {"matrix": [1, 17], "x": 17.5, "y": 1.25},
- {"matrix": [1, 18], "x": 18.5, "y": 1.25},
- {"matrix": [1, 19], "x": 19.5, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [2, 15], "x": 15.25, "y": 2.25},
-
- {"matrix": [2, 16], "x": 16.5, "y": 2.25},
- {"matrix": [2, 17], "x": 17.5, "y": 2.25},
- {"matrix": [2, 18], "x": 18.5, "y": 2.25},
- {"matrix": [2, 19], "x": 19.5, "y": 2.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [3, 16], "x": 16.5, "y": 3.25},
- {"matrix": [3, 17], "x": 17.5, "y": 3.25},
- {"matrix": [3, 18], "x": 18.5, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"matrix": [4, 12], "x": 11.25, "y": 4.25},
- {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [4, 15], "x": 15.25, "y": 4.5},
-
- {"matrix": [4, 16], "x": 16.5, "y": 4.25},
- {"matrix": [4, 17], "x": 17.5, "y": 4.25},
- {"matrix": [4, 18], "x": 18.5, "y": 4.25},
-
- {"matrix": [4, 19], "x": 19.5, "y": 4.25, "h": 2},
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 7},
- {"matrix": [5, 12], "x": 11, "y": 5.25, "w": 1.5},
- {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
-
- {"matrix": [5, 14], "x": 14.25, "y": 5.5},
- {"matrix": [5, 15], "x": 15.25, "y": 5.5},
- {"matrix": [5, 16], "x": 16.25, "y": 5.5},
-
- {"matrix": [5, 17], "x": 17.5, "y": 5.25},
- {"matrix": [5, 18], "x": 18.5, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/duck/jetfire/keyboard.json b/keyboards/duck/jetfire/keyboard.json
new file mode 100644
index 00000000000..a97ff193a88
--- /dev/null
+++ b/keyboards/duck/jetfire/keyboard.json
@@ -0,0 +1,301 @@
+{
+ "keyboard_name": "Jetfire",
+ "manufacturer": "Duck",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444B",
+ "pid": "0x4A46",
+ "device_version": "0.0.1"
+ },
+ "backlight": {
+ "driver": "custom",
+ "levels": 1
+ },
+ "bootmagic": {
+ "matrix": [5, 10]
+ },
+ "rgblight": {
+ "led_count": 23,
+ "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": {
+ "pin": "D6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true,
+ "command": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 16], "x": 16.5, "y": 0},
+ {"matrix": [0, 17], "x": 17.5, "y": 0},
+ {"matrix": [0, 18], "x": 18.5, "y": 0},
+ {"matrix": [0, 19], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+ {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+ {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+ {"matrix": [1, 19], "x": 19.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+ {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+ {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+ {"matrix": [2, 19], "x": 19.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+ {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+ {"matrix": [3, 19], "x": 19.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 15.25, "y": 4.5},
+
+ {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+ {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+ {"matrix": [4, 18], "x": 18.5, "y": 4.25},
+ {"matrix": [4, 19], "x": 19.5, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 12.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+
+ {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+ {"matrix": [5, 18], "x": 18.5, "y": 5.25},
+ {"matrix": [5, 19], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
+ {"matrix": [0, 8], "x": 7.5, "y": 0},
+ {"matrix": [0, 9], "x": 8.5, "y": 0},
+ {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 16], "x": 16.5, "y": 0},
+ {"matrix": [0, 17], "x": 17.5, "y": 0},
+ {"matrix": [0, 18], "x": 18.5, "y": 0},
+ {"matrix": [0, 19], "x": 19.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+ {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+ {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+ {"matrix": [1, 19], "x": 19.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+ {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+ {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+ {"matrix": [2, 19], "x": 19.5, "y": 2.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 14], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+ {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 15.25, "y": 4.5},
+
+ {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+ {"matrix": [4, 17], "x": 17.5, "y": 4.25},
+ {"matrix": [4, 18], "x": 18.5, "y": 4.25},
+
+ {"matrix": [4, 19], "x": 19.5, "y": 4.25, "h": 2},
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 8], "x": 4, "y": 5.25, "w": 7},
+ {"matrix": [5, 12], "x": 11, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 16.25, "y": 5.5},
+
+ {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+ {"matrix": [5, 18], "x": 18.5, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/duck/jetfire/rules.mk b/keyboards/duck/jetfire/rules.mk
index 26898366237..8d6e39eef11 100644
--- a/keyboards/duck/jetfire/rules.mk
+++ b/keyboards/duck/jetfire/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json
deleted file mode 100644
index 06d0d59ed19..00000000000
--- a/keyboards/duck/lightsaver/info.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
- "keyboard_name": "Lightsaver V3",
- "manufacturer": "Duck",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444B",
- "pid": "0x4C53",
- "device_version": "0.0.3"
- },
- "backlight": {
- "driver": "custom",
- "levels": 1
- },
- "bootmagic": {
- "matrix": [5, 10]
- },
- "rgblight": {
- "led_count": 17,
- "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": {
- "pin": "D6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
- {"matrix": [0, 15], "x": 15, "y": 0},
- {"matrix": [0, 16], "x": 16, "y": 0},
- {"matrix": [0, 17], "x": 17, "y": 0},
- {"matrix": [0, 18], "x": 18, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 15], "x": 15, "y": 1},
- {"matrix": [1, 16], "x": 16, "y": 1},
- {"matrix": [1, 17], "x": 17, "y": 1},
- {"matrix": [1, 18], "x": 18, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 15], "x": 15, "y": 2},
- {"matrix": [2, 16], "x": 16, "y": 2},
- {"matrix": [2, 17], "x": 17, "y": 2},
- {"matrix": [2, 18], "x": 18, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
- {"matrix": [3, 15], "x": 15, "y": 3},
- {"matrix": [3, 16], "x": 16, "y": 3},
- {"matrix": [3, 17], "x": 17, "y": 3},
- {"matrix": [3, 18], "x": 18, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 12], "x": 11.25, "y": 4},
- {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 14], "x": 14, "y": 4},
- {"matrix": [4, 15], "x": 15, "y": 4},
- {"matrix": [4, 16], "x": 16, "y": 4},
- {"matrix": [4, 17], "x": 17, "y": 4},
- {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
- {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
- {"matrix": [5, 13], "x": 13, "y": 5},
- {"matrix": [5, 14], "x": 14, "y": 5},
- {"matrix": [5, 15], "x": 15, "y": 5},
- {"matrix": [5, 16], "x": 16, "y": 5},
- {"matrix": [5, 17], "x": 17, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/duck/lightsaver/keyboard.json b/keyboards/duck/lightsaver/keyboard.json
new file mode 100644
index 00000000000..d4e1cd1e351
--- /dev/null
+++ b/keyboards/duck/lightsaver/keyboard.json
@@ -0,0 +1,158 @@
+{
+ "keyboard_name": "Lightsaver V3",
+ "manufacturer": "Duck",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444B",
+ "pid": "0x4C53",
+ "device_version": "0.0.3"
+ },
+ "backlight": {
+ "driver": "custom",
+ "levels": 1
+ },
+ "bootmagic": {
+ "matrix": [5, 10]
+ },
+ "rgblight": {
+ "led_count": 17,
+ "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": {
+ "pin": "D6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+ {"matrix": [0, 16], "x": 16, "y": 0},
+ {"matrix": [0, 17], "x": 17, "y": 0},
+ {"matrix": [0, 18], "x": 18, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+ {"matrix": [1, 16], "x": 16, "y": 1},
+ {"matrix": [1, 17], "x": 17, "y": 1},
+ {"matrix": [1, 18], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+ {"matrix": [2, 16], "x": 16, "y": 2},
+ {"matrix": [2, 17], "x": 17, "y": 2},
+ {"matrix": [2, 18], "x": 18, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+ {"matrix": [3, 16], "x": 16, "y": 3},
+ {"matrix": [3, 17], "x": 17, "y": 3},
+ {"matrix": [3, 18], "x": 18, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 12], "x": 11.25, "y": 4},
+ {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+ {"matrix": [4, 16], "x": 16, "y": 4},
+ {"matrix": [4, 17], "x": 17, "y": 4},
+ {"matrix": [4, 18], "x": 18, "y": 4, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5},
+ {"matrix": [5, 16], "x": 16, "y": 5},
+ {"matrix": [5, 17], "x": 17, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/duck/lightsaver/rules.mk b/keyboards/duck/lightsaver/rules.mk
index 2014cb46117..8d6e39eef11 100644
--- a/keyboards/duck/lightsaver/rules.mk
+++ b/keyboards/duck/lightsaver/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json
deleted file mode 100644
index fbbae2723a8..00000000000
--- a/keyboards/duck/octagon/v1/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
- "keyboard_name": "Octagon V1",
- "manufacturer": "Duck",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444B",
- "pid": "0x4F31",
- "device_version": "0.0.1"
- },
- "backlight": {
- "driver": "custom",
- "levels": 1
- },
- "bootmagic": {
- "matrix": [5, 10]
- },
- "rgblight": {
- "led_count": 17,
- "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": {
- "pin": "D6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["75_ansi"],
- "layouts": {
- "LAYOUT_75_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
- {"matrix": [0, 15], "x": 15, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 15], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 15], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
- {"matrix": [3, 15], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"matrix": [4, 1], "x": 2.25, "y": 4},
- {"matrix": [4, 2], "x": 3.25, "y": 4},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [4, 4], "x": 5.25, "y": 4},
- {"matrix": [4, 5], "x": 6.25, "y": 4},
- {"matrix": [4, 6], "x": 7.25, "y": 4},
- {"matrix": [4, 7], "x": 8.25, "y": 4},
- {"matrix": [4, 8], "x": 9.25, "y": 4},
- {"matrix": [4, 9], "x": 10.25, "y": 4},
- {"matrix": [4, 10], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 15], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 8], "x": 10, "y": 5},
- {"matrix": [5, 9], "x": 11, "y": 5},
- {"matrix": [5, 10], "x": 12, "y": 5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 15], "x": 15, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/duck/octagon/v1/keyboard.json b/keyboards/duck/octagon/v1/keyboard.json
new file mode 100644
index 00000000000..47f3acdc4d8
--- /dev/null
+++ b/keyboards/duck/octagon/v1/keyboard.json
@@ -0,0 +1,143 @@
+{
+ "keyboard_name": "Octagon V1",
+ "manufacturer": "Duck",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444B",
+ "pid": "0x4F31",
+ "device_version": "0.0.1"
+ },
+ "backlight": {
+ "driver": "custom",
+ "levels": 1
+ },
+ "bootmagic": {
+ "matrix": [5, 10]
+ },
+ "rgblight": {
+ "led_count": 17,
+ "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": {
+ "pin": "D6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "community_layouts": ["75_ansi"],
+ "layouts": {
+ "LAYOUT_75_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4},
+ {"matrix": [4, 2], "x": 3.25, "y": 4},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 5.25, "y": 4},
+ {"matrix": [4, 5], "x": 6.25, "y": 4},
+ {"matrix": [4, 6], "x": 7.25, "y": 4},
+ {"matrix": [4, 7], "x": 8.25, "y": 4},
+ {"matrix": [4, 8], "x": 9.25, "y": 4},
+ {"matrix": [4, 9], "x": 10.25, "y": 4},
+ {"matrix": [4, 10], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 8], "x": 10, "y": 5},
+ {"matrix": [5, 9], "x": 11, "y": 5},
+ {"matrix": [5, 10], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/duck/octagon/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk
index 5d79f0af09d..8784813b335 100644
--- a/keyboards/duck/octagon/v1/rules.mk
+++ b/keyboards/duck/octagon/v1/rules.mk
@@ -1,15 +1,2 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json
deleted file mode 100644
index be552c7b57a..00000000000
--- a/keyboards/duck/octagon/v2/info.json
+++ /dev/null
@@ -1,326 +0,0 @@
-{
- "keyboard_name": "Octagon V2",
- "manufacturer": "Duck",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444B",
- "pid": "0x4F32",
- "device_version": "0.0.2"
- },
- "backlight": {
- "driver": "custom",
- "levels": 1
- },
- "bootmagic": {
- "matrix": [5, 10]
- },
- "rgblight": {
- "led_count": 17,
- "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": {
- "pin": "D6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_all"
- },
- "community_layouts": ["75_ansi", "75_iso"],
- "layouts": {
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
- {"matrix": [0, 16], "x": 15, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 15], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 15], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 12], "x": 12.75, "y": 3},
- {"matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25},
- {"matrix": [3, 15], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 12], "x": 11.25, "y": 4},
- {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 14], "x": 14, "y": 4},
- {"matrix": [4, 15], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5},
- {"matrix": [5, 11], "x": 11, "y": 5},
- {"matrix": [5, 12], "x": 12, "y": 5},
- {"matrix": [5, 13], "x": 13, "y": 5},
- {"matrix": [5, 14], "x": 14, "y": 5},
- {"matrix": [5, 15], "x": 15, "y": 5}
- ]
- },
- "LAYOUT_75_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
- {"matrix": [0, 16], "x": 15, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 15], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 15], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
- {"matrix": [3, 15], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 12], "x": 11.25, "y": 4},
- {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 14], "x": 14, "y": 4},
- {"matrix": [4, 15], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5},
- {"matrix": [5, 11], "x": 11, "y": 5},
- {"matrix": [5, 12], "x": 12, "y": 5},
- {"matrix": [5, 13], "x": 13, "y": 5},
- {"matrix": [5, 14], "x": 14, "y": 5},
- {"matrix": [5, 15], "x": 15, "y": 5}
- ]
- },
- "LAYOUT_75_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
- {"matrix": [0, 16], "x": 15, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 15], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 15], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 12], "x": 12.75, "y": 3},
- {"matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
- {"matrix": [3, 15], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 12], "x": 11.25, "y": 4},
- {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 14], "x": 14, "y": 4},
- {"matrix": [4, 15], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5},
- {"matrix": [5, 11], "x": 11, "y": 5},
- {"matrix": [5, 12], "x": 12, "y": 5},
- {"matrix": [5, 13], "x": 13, "y": 5},
- {"matrix": [5, 14], "x": 14, "y": 5},
- {"matrix": [5, 15], "x": 15, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/duck/octagon/v2/keyboard.json b/keyboards/duck/octagon/v2/keyboard.json
new file mode 100644
index 00000000000..4afbc42d47c
--- /dev/null
+++ b/keyboards/duck/octagon/v2/keyboard.json
@@ -0,0 +1,335 @@
+{
+ "keyboard_name": "Octagon V2",
+ "manufacturer": "Duck",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444B",
+ "pid": "0x4F32",
+ "device_version": "0.0.2"
+ },
+ "backlight": {
+ "driver": "custom",
+ "levels": 1
+ },
+ "bootmagic": {
+ "matrix": [5, 10]
+ },
+ "rgblight": {
+ "led_count": 17,
+ "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": {
+ "pin": "D6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_all"
+ },
+ "community_layouts": ["75_ansi", "75_iso"],
+ "layouts": {
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 16], "x": 15, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 12], "x": 11.25, "y": 4},
+ {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 16], "x": 15, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 12], "x": 11.25, "y": 4},
+ {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 16], "x": 15, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 12], "x": 11.25, "y": 4},
+ {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/duck/octagon/v2/rules.mk b/keyboards/duck/octagon/v2/rules.mk
index 5e50c2ff8e9..8d6e39eef11 100644
--- a/keyboards/duck/octagon/v2/rules.mk
+++ b/keyboards/duck/octagon/v2/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json
deleted file mode 100644
index 97885c09102..00000000000
--- a/keyboards/duck/orion/v3/info.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
- "keyboard_name": "Orion V3",
- "manufacturer": "Duck",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444B",
- "pid": "0x4F52",
- "device_version": "0.0.2"
- },
- "backlight": {
- "driver": "custom",
- "pins": ["B1", "B2", "B3", "E6"],
- "levels": 10
- },
- "bootmagic": {
- "matrix": [4, 10]
- },
- "rgblight": {
- "led_count": 18,
- "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": {
- "pin": "D6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["tkl_ansi"],
- "layouts": {
- "LAYOUT_tkl_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
- {"matrix": [0, 7], "x": 7.5, "y": 0},
- {"matrix": [0, 8], "x": 8.5, "y": 0},
- {"matrix": [0, 9], "x": 9.5, "y": 0},
-
- {"matrix": [0, 10], "x": 11, "y": 0},
- {"matrix": [0, 11], "x": 12, "y": 0},
- {"matrix": [0, 12], "x": 13, "y": 0},
- {"matrix": [0, 13], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"matrix": [1, 5], "x": 5, "y": 1.5},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
- {"matrix": [1, 7], "x": 7, "y": 1.5},
- {"matrix": [1, 8], "x": 8, "y": 1.5},
- {"matrix": [1, 9], "x": 9, "y": 1.5},
- {"matrix": [1, 10], "x": 10, "y": 1.5},
- {"matrix": [1, 11], "x": 11, "y": 1.5},
- {"matrix": [1, 12], "x": 12, "y": 1.5},
- {"matrix": [1, 17], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.5},
- {"matrix": [1, 15], "x": 16.25, "y": 1.5},
- {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.5},
- {"matrix": [2, 2], "x": 2.5, "y": 2.5},
- {"matrix": [2, 3], "x": 3.5, "y": 2.5},
- {"matrix": [2, 4], "x": 4.5, "y": 2.5},
- {"matrix": [2, 5], "x": 5.5, "y": 2.5},
- {"matrix": [2, 6], "x": 6.5, "y": 2.5},
- {"matrix": [2, 7], "x": 7.5, "y": 2.5},
- {"matrix": [2, 8], "x": 8.5, "y": 2.5},
- {"matrix": [2, 9], "x": 9.5, "y": 2.5},
- {"matrix": [2, 10], "x": 10.5, "y": 2.5},
- {"matrix": [2, 11], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.5},
- {"matrix": [2, 15], "x": 16.25, "y": 2.5},
- {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.5},
- {"matrix": [3, 2], "x": 2.75, "y": 3.5},
- {"matrix": [3, 3], "x": 3.75, "y": 3.5},
- {"matrix": [3, 4], "x": 4.75, "y": 3.5},
- {"matrix": [3, 5], "x": 5.75, "y": 3.5},
- {"matrix": [3, 6], "x": 6.75, "y": 3.5},
- {"matrix": [3, 7], "x": 7.75, "y": 3.5},
- {"matrix": [3, 8], "x": 8.75, "y": 3.5},
- {"matrix": [3, 9], "x": 9.75, "y": 3.5},
- {"matrix": [3, 10], "x": 10.75, "y": 3.5},
- {"matrix": [3, 11], "x": 11.75, "y": 3.5},
- {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [4, 1], "x": 2.25, "y": 4.5},
- {"matrix": [4, 2], "x": 3.25, "y": 4.5},
- {"matrix": [4, 3], "x": 4.25, "y": 4.5},
- {"matrix": [4, 4], "x": 5.25, "y": 4.5},
- {"matrix": [4, 5], "x": 6.25, "y": 4.5},
- {"matrix": [4, 6], "x": 7.25, "y": 4.5},
- {"matrix": [4, 7], "x": 8.25, "y": 4.5},
- {"matrix": [4, 8], "x": 9.25, "y": 4.5},
- {"matrix": [4, 9], "x": 10.25, "y": 4.5},
- {"matrix": [4, 10], "x": 11.25, "y": 4.5},
- {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"matrix": [5, 15], "x": 16.25, "y": 5.5},
- {"matrix": [5, 16], "x": 17.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/duck/orion/v3/keyboard.json b/keyboards/duck/orion/v3/keyboard.json
new file mode 100644
index 00000000000..280cd8b07f8
--- /dev/null
+++ b/keyboards/duck/orion/v3/keyboard.json
@@ -0,0 +1,155 @@
+{
+ "keyboard_name": "Orion V3",
+ "manufacturer": "Duck",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444B",
+ "pid": "0x4F52",
+ "device_version": "0.0.2"
+ },
+ "backlight": {
+ "driver": "custom",
+ "pins": ["B1", "B2", "B3", "E6"],
+ "levels": 10
+ },
+ "bootmagic": {
+ "matrix": [4, 10]
+ },
+ "rgblight": {
+ "led_count": 18,
+ "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": {
+ "pin": "D6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
+ "community_layouts": ["tkl_ansi"],
+ "layouts": {
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "y": 0},
+ {"matrix": [0, 12], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 17], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/duck/orion/v3/rules.mk b/keyboards/duck/orion/v3/rules.mk
index 49bc32f39b8..8d6e39eef11 100644
--- a/keyboards/duck/orion/v3/rules.mk
+++ b/keyboards/duck/orion/v3/rules.mk
@@ -1,16 +1,3 @@
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json
deleted file mode 100644
index cee675229d9..00000000000
--- a/keyboards/duck/tcv3/info.json
+++ /dev/null
@@ -1,281 +0,0 @@
-{
- "keyboard_name": "TC-V3",
- "manufacturer": "Duck",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444B",
- "pid": "0x5443",
- "device_version": "0.0.1"
- },
- "bootmagic": {
- "matrix": [5, 10]
- },
- "rgblight": {
- "led_count": 17,
- "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": {
- "pin": "D6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
-
- {"matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"matrix": [0, 9], "x": 8.75, "y": 0},
- {"matrix": [0, 10], "x": 9.75, "y": 0},
- {"matrix": [0, 11], "x": 10.75, "y": 0},
- {"matrix": [0, 12], "x": 11.75, "y": 0},
-
- {"matrix": [0, 13], "x": 13.25, "y": 0},
- {"matrix": [0, 14], "x": 14.25, "y": 0},
- {"matrix": [0, 15], "x": 15.25, "y": 0},
- {"matrix": [0, 16], "x": 16.25, "y": 0},
-
- {"matrix": [0, 19], "x": 17.5, "y": 0},
- {"matrix": [0, 18], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"matrix": [1, 15], "x": 15.25, "y": 1.25},
- {"matrix": [1, 16], "x": 16.25, "y": 1.25},
-
- {"matrix": [1, 17], "x": 17.5, "y": 1.25},
- {"matrix": [1, 18], "x": 18.5, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25},
- {"matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"matrix": [2, 17], "x": 17.5, "y": 2.25},
- {"matrix": [2, 18], "x": 18.5, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25},
- {"matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"matrix": [3, 3], "x": 4, "y": 3.25},
- {"matrix": [3, 4], "x": 5, "y": 3.25},
- {"matrix": [3, 5], "x": 6, "y": 3.25},
- {"matrix": [3, 6], "x": 7, "y": 3.25},
- {"matrix": [3, 7], "x": 8, "y": 3.25},
- {"matrix": [3, 8], "x": 9, "y": 3.25},
- {"matrix": [3, 9], "x": 10, "y": 3.25},
- {"matrix": [3, 10], "x": 11, "y": 3.25},
- {"matrix": [3, 11], "x": 12, "y": 3.25},
- {"matrix": [3, 12], "x": 13, "y": 3.25},
- {"matrix": [3, 13], "x": 14, "y": 3.25},
- {"matrix": [3, 14], "x": 15, "y": 3.25},
- {"matrix": [3, 16], "x": 16, "y": 3.25, "w": 1.25},
-
- {"matrix": [3, 17], "x": 17.5, "y": 3.25},
- {"matrix": [3, 18], "x": 18.5, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25},
- {"matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
- {"matrix": [4, 3], "x": 3.5, "y": 4.25},
- {"matrix": [4, 4], "x": 4.5, "y": 4.25},
- {"matrix": [4, 5], "x": 5.5, "y": 4.25},
- {"matrix": [4, 6], "x": 6.5, "y": 4.25},
- {"matrix": [4, 7], "x": 7.5, "y": 4.25},
- {"matrix": [4, 8], "x": 8.5, "y": 4.25},
- {"matrix": [4, 9], "x": 9.5, "y": 4.25},
- {"matrix": [4, 10], "x": 10.5, "y": 4.25},
- {"matrix": [4, 11], "x": 11.5, "y": 4.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4.25},
- {"matrix": [4, 14], "x": 13.5, "y": 4.25},
- {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 1.75},
- {"matrix": [4, 16], "x": 16.25, "y": 4.25},
-
- {"matrix": [4, 17], "x": 17.5, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25},
- {"matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"matrix": [5, 3], "x": 3.75, "y": 5.25},
- {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
- {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
- {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
- {"matrix": [5, 14], "x": 13.75, "y": 5.25},
- {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
-
- {"matrix": [5, 16], "x": 16.5, "y": 5.5},
- {"matrix": [5, 17], "x": 17.5, "y": 5.5},
- {"matrix": [5, 18], "x": 18.5, "y": 5.5}
- ]
- },
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
-
- {"matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"matrix": [0, 9], "x": 8.75, "y": 0},
- {"matrix": [0, 10], "x": 9.75, "y": 0},
- {"matrix": [0, 11], "x": 10.75, "y": 0},
- {"matrix": [0, 12], "x": 11.75, "y": 0},
-
- {"matrix": [0, 13], "x": 13.25, "y": 0},
- {"matrix": [0, 14], "x": 14.25, "y": 0},
- {"matrix": [0, 15], "x": 15.25, "y": 0},
- {"matrix": [0, 16], "x": 16.25, "y": 0},
-
- {"matrix": [0, 19], "x": 17.5, "y": 0},
- {"matrix": [0, 18], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"matrix": [1, 16], "x": 15.25, "y": 1.25, "w": 2},
-
- {"matrix": [1, 17], "x": 17.5, "y": 1.25},
- {"matrix": [1, 18], "x": 18.5, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25},
- {"matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"matrix": [2, 17], "x": 17.5, "y": 2.25},
- {"matrix": [2, 18], "x": 18.5, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25},
- {"matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"matrix": [3, 3], "x": 4, "y": 3.25},
- {"matrix": [3, 4], "x": 5, "y": 3.25},
- {"matrix": [3, 5], "x": 6, "y": 3.25},
- {"matrix": [3, 6], "x": 7, "y": 3.25},
- {"matrix": [3, 7], "x": 8, "y": 3.25},
- {"matrix": [3, 8], "x": 9, "y": 3.25},
- {"matrix": [3, 9], "x": 10, "y": 3.25},
- {"matrix": [3, 10], "x": 11, "y": 3.25},
- {"matrix": [3, 11], "x": 12, "y": 3.25},
- {"matrix": [3, 12], "x": 13, "y": 3.25},
- {"matrix": [3, 13], "x": 14, "y": 3.25},
- {"matrix": [3, 16], "x": 15, "y": 3.25, "w": 2.25},
-
- {"matrix": [3, 17], "x": 17.5, "y": 3.25},
- {"matrix": [3, 18], "x": 18.5, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25},
- {"matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
- {"matrix": [4, 4], "x": 4.5, "y": 4.25},
- {"matrix": [4, 5], "x": 5.5, "y": 4.25},
- {"matrix": [4, 6], "x": 6.5, "y": 4.25},
- {"matrix": [4, 7], "x": 7.5, "y": 4.25},
- {"matrix": [4, 8], "x": 8.5, "y": 4.25},
- {"matrix": [4, 9], "x": 9.5, "y": 4.25},
- {"matrix": [4, 10], "x": 10.5, "y": 4.25},
- {"matrix": [4, 11], "x": 11.5, "y": 4.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4.25},
- {"matrix": [4, 14], "x": 13.5, "y": 4.25},
- {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 2.75},
- {"matrix": [4, 17], "x": 17.5, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25},
- {"matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"matrix": [5, 3], "x": 3.75, "y": 5.25},
- {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
- {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
- {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
- {"matrix": [5, 14], "x": 13.75, "y": 5.25},
- {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
-
- {"matrix": [5, 16], "x": 16.5, "y": 5.5},
- {"matrix": [5, 17], "x": 17.5, "y": 5.5},
- {"matrix": [5, 18], "x": 18.5, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/duck/tcv3/keyboard.json b/keyboards/duck/tcv3/keyboard.json
new file mode 100644
index 00000000000..c03142b4db2
--- /dev/null
+++ b/keyboards/duck/tcv3/keyboard.json
@@ -0,0 +1,289 @@
+{
+ "keyboard_name": "TC-V3",
+ "manufacturer": "Duck",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444B",
+ "pid": "0x5443",
+ "device_version": "0.0.1"
+ },
+ "bootmagic": {
+ "matrix": [5, 10]
+ },
+ "rgblight": {
+ "led_count": 17,
+ "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": {
+ "pin": "D6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": false,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 9], "x": 8.75, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+ {"matrix": [0, 19], "x": 17.5, "y": 0},
+ {"matrix": [0, 18], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+
+ {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 3], "x": 4, "y": 3.25},
+ {"matrix": [3, 4], "x": 5, "y": 3.25},
+ {"matrix": [3, 5], "x": 6, "y": 3.25},
+ {"matrix": [3, 6], "x": 7, "y": 3.25},
+ {"matrix": [3, 7], "x": 8, "y": 3.25},
+ {"matrix": [3, 8], "x": 9, "y": 3.25},
+ {"matrix": [3, 9], "x": 10, "y": 3.25},
+ {"matrix": [3, 10], "x": 11, "y": 3.25},
+ {"matrix": [3, 11], "x": 12, "y": 3.25},
+ {"matrix": [3, 12], "x": 13, "y": 3.25},
+ {"matrix": [3, 13], "x": 14, "y": 3.25},
+ {"matrix": [3, 14], "x": 15, "y": 3.25},
+ {"matrix": [3, 16], "x": 16, "y": 3.25, "w": 1.25},
+
+ {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+ {"matrix": [4, 14], "x": 13.5, "y": 4.25},
+ {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+ {"matrix": [4, 17], "x": 17.5, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.25},
+ {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
+ {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 14], "x": 13.75, "y": 5.25},
+ {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 16], "x": 16.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 18.5, "y": 5.5}
+ ]
+ },
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 9], "x": 8.75, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
+ {"matrix": [0, 16], "x": 16.25, "y": 0},
+
+ {"matrix": [0, 19], "x": 17.5, "y": 0},
+ {"matrix": [0, 18], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 15.25, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+ {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"matrix": [2, 16], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 17], "x": 17.5, "y": 2.25},
+ {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 3], "x": 4, "y": 3.25},
+ {"matrix": [3, 4], "x": 5, "y": 3.25},
+ {"matrix": [3, 5], "x": 6, "y": 3.25},
+ {"matrix": [3, 6], "x": 7, "y": 3.25},
+ {"matrix": [3, 7], "x": 8, "y": 3.25},
+ {"matrix": [3, 8], "x": 9, "y": 3.25},
+ {"matrix": [3, 9], "x": 10, "y": 3.25},
+ {"matrix": [3, 10], "x": 11, "y": 3.25},
+ {"matrix": [3, 11], "x": 12, "y": 3.25},
+ {"matrix": [3, 12], "x": 13, "y": 3.25},
+ {"matrix": [3, 13], "x": 14, "y": 3.25},
+ {"matrix": [3, 16], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+ {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.5, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.5, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.5, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.5, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4.25},
+ {"matrix": [4, 14], "x": 13.5, "y": 4.25},
+ {"matrix": [4, 15], "x": 14.5, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 17], "x": 17.5, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 3], "x": 3.75, "y": 5.25},
+ {"matrix": [5, 4], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 10], "x": 6.25, "y": 5.25, "w": 6},
+ {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 14], "x": 13.75, "y": 5.25},
+ {"matrix": [5, 15], "x": 14.75, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 16], "x": 16.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 18.5, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/duck/tcv3/rules.mk b/keyboards/duck/tcv3/rules.mk
index b13684d8fd9..8d6e39eef11 100644
--- a/keyboards/duck/tcv3/rules.mk
+++ b/keyboards/duck/tcv3/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes
-
CUSTOM_MATRIX = yes
SRC += indicator_leds.c \
matrix.c duck_led/duck_led.c
diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json
deleted file mode 100644
index 4eb7c4941ed..00000000000
--- a/keyboards/ducky/one2mini/1861st/info.json
+++ /dev/null
@@ -1,233 +0,0 @@
-{
- "keyboard_name": "One 2 Mini",
- "manufacturer": "Ducky",
- "usb": {
- "vid": "0x0416",
- "pid": "0x0123",
- "device_version": "0.0.1",
- "force_nkro": true
- },
- "matrix_pins": {
- "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"],
- "rows": ["D11", "B4", "B5", "B6", "B7"]
- },
- "diode_direction": "COL2ROW",
- "dip_switch": {
- "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ]
- },
- "layout_aliases": {
- "LAYOUT_iso": "LAYOUT_60_iso"
- },
- "layouts": {
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/ducky/one2mini/1861st/keyboard.json b/keyboards/ducky/one2mini/1861st/keyboard.json
new file mode 100644
index 00000000000..a39945d68c2
--- /dev/null
+++ b/keyboards/ducky/one2mini/1861st/keyboard.json
@@ -0,0 +1,240 @@
+{
+ "keyboard_name": "One 2 Mini",
+ "manufacturer": "Ducky",
+ "usb": {
+ "vid": "0x0416",
+ "pid": "0x0123",
+ "device_version": "0.0.1",
+ "force_nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"],
+ "rows": ["D11", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "dip_switch": {
+ "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ]
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "dip_switch": true
+ },
+ "layout_aliases": {
+ "LAYOUT_iso": "LAYOUT_60_iso"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ducky/one2mini/1861st/rules.mk b/keyboards/ducky/one2mini/1861st/rules.mk
index b7db490c11e..5eb1c44f8a1 100644
--- a/keyboards/ducky/one2mini/1861st/rules.mk
+++ b/keyboards/ducky/one2mini/1861st/rules.mk
@@ -15,18 +15,3 @@ BOARD = NUC123SD4AN0
MCU = cortex-m0
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 6
-
-# 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
-DIP_SWITCH_ENABLE = yes
-
diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json
deleted file mode 100644
index 3774be1bc06..00000000000
--- a/keyboards/ducky/one2sf/1967st/info.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
- "keyboard_name": "One 2 SF",
- "manufacturer": "Ducky",
- "maintainer": "f7urry",
- "usb": {
- "vid": "0x445B",
- "pid": "0x07AF",
- "device_version": "0.0.1",
- "force_nkro": true
- },
- "matrix_pins": {
- "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"],
- "rows": ["D11", "B4", "B5", "B6", "B7"]
- },
- "diode_direction": "COL2ROW",
- "dip_switch": {
- "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ]
- },
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
- {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
- {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
- ]
- },
- "LAYOUT_ansi": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
- {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
- {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
- ]
- },
- "LAYOUT_iso": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
- {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
- {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/ducky/one2sf/1967st/keyboard.json b/keyboards/ducky/one2sf/1967st/keyboard.json
new file mode 100644
index 00000000000..3bb58fd48f3
--- /dev/null
+++ b/keyboards/ducky/one2sf/1967st/keyboard.json
@@ -0,0 +1,265 @@
+{
+ "keyboard_name": "One 2 SF",
+ "manufacturer": "Ducky",
+ "maintainer": "f7urry",
+ "usb": {
+ "vid": "0x445B",
+ "pid": "0x07AF",
+ "device_version": "0.0.1",
+ "force_nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"],
+ "rows": ["D11", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "dip_switch": {
+ "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ]
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "dip_switch": true
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
+ {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
+ {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
+ {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ducky/one2sf/1967st/rules.mk b/keyboards/ducky/one2sf/1967st/rules.mk
index b7db490c11e..5eb1c44f8a1 100644
--- a/keyboards/ducky/one2sf/1967st/rules.mk
+++ b/keyboards/ducky/one2sf/1967st/rules.mk
@@ -15,18 +15,3 @@ BOARD = NUC123SD4AN0
MCU = cortex-m0
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 6
-
-# 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
-DIP_SWITCH_ENABLE = yes
-
diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/info.json
deleted file mode 100644
index faf59b7ecc9..00000000000
--- a/keyboards/dumbo/info.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "keyboard_name": "Dumbo",
- "manufacturer": "trip_trap",
- "url": "",
- "maintainer": "adamnaldal",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x25E3",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "B2", "B3", "B1", "F7", "F6"],
- "rows": ["D4", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "F4", "pin_b": "F5"},
- {"pin_a": "C6", "pin_b": "B5"}
- ]
- },
- "split": {
- "soft_serial_pin": "D2",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "F5", "pin_b": "F4"},
- {"pin_a": "B5", "pin_b": "C6"}
- ]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_split_3x6_4": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 1.25},
- {"matrix": [0, 1], "x": 1, "y": 1},
- {"matrix": [0, 2], "x": 2, "y": 0.25},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.5},
- {"matrix": [0, 5], "x": 5, "y": 0.75},
-
- {"matrix": [4, 5], "x": 9.5, "y": 0.75},
- {"matrix": [4, 4], "x": 10.5, "y": 0.5},
- {"matrix": [4, 3], "x": 11.5, "y": 0},
- {"matrix": [4, 2], "x": 12.5, "y": 0.25},
- {"matrix": [4, 1], "x": 13.5, "y": 1},
- {"matrix": [4, 0], "x": 14.5, "y": 1.25},
-
- {"matrix": [1, 0], "x": 0, "y": 2.25},
- {"matrix": [1, 1], "x": 1, "y": 2},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"matrix": [1, 5], "x": 5, "y": 1.75},
-
- {"matrix": [5, 5], "x": 9.5, "y": 1.75},
- {"matrix": [5, 4], "x": 10.5, "y": 1.5},
- {"matrix": [5, 3], "x": 11.5, "y": 1},
- {"matrix": [5, 2], "x": 12.5, "y": 1.25},
- {"matrix": [5, 1], "x": 13.5, "y": 2},
- {"matrix": [5, 0], "x": 14.5, "y": 2.25},
-
- {"matrix": [2, 0], "x": 0, "y": 3.25},
- {"matrix": [2, 1], "x": 1, "y": 3},
- {"matrix": [2, 2], "x": 2, "y": 2.25},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.5},
- {"matrix": [2, 5], "x": 5, "y": 2.75},
-
- {"matrix": [6, 5], "x": 9.5, "y": 2.75},
- {"matrix": [6, 4], "x": 10.5, "y": 2.5},
- {"matrix": [6, 3], "x": 11.5, "y": 2},
- {"matrix": [6, 2], "x": 12.5, "y": 2.25},
- {"matrix": [6, 1], "x": 13.5, "y": 3},
- {"matrix": [6, 0], "x": 14.5, "y": 3.25},
-
- {"matrix": [3, 2], "x": 3.25, "y": 3.75},
- {"matrix": [3, 3], "x": 4.25, "y": 3.75, "h": 1.5},
- {"matrix": [3, 4], "x": 5.25, "y": 3.75, "h": 1.5},
- {"matrix": [3, 5], "x": 6.25, "y": 4.25},
-
- {"matrix": [7, 5], "x": 8.25, "y": 4.25},
- {"matrix": [7, 4], "x": 9.25, "y": 3.75, "h": 1.5},
- {"matrix": [7, 3], "x": 10.25, "y": 3.75, "h": 1.5},
- {"matrix": [7, 2], "x": 11.25, "y": 3.75}
- ]
- }
- }
-}
diff --git a/keyboards/dumbo/keyboard.json b/keyboards/dumbo/keyboard.json
new file mode 100644
index 00000000000..84993a6b6d9
--- /dev/null
+++ b/keyboards/dumbo/keyboard.json
@@ -0,0 +1,101 @@
+{
+ "keyboard_name": "Dumbo",
+ "manufacturer": "trip_trap",
+ "url": "",
+ "maintainer": "adamnaldal",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x25E3",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6"],
+ "rows": ["D4", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F4", "pin_b": "F5"},
+ {"pin_a": "C6", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "F5", "pin_b": "F4"},
+ {"pin_a": "B5", "pin_b": "C6"}
+ ]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true
+ },
+ "build": {
+ "lto": true
+ },
+ "layouts": {
+ "LAYOUT_split_3x6_4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 1.25},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+ {"matrix": [0, 5], "x": 5, "y": 0.75},
+
+ {"matrix": [4, 5], "x": 9.5, "y": 0.75},
+ {"matrix": [4, 4], "x": 10.5, "y": 0.5},
+ {"matrix": [4, 3], "x": 11.5, "y": 0},
+ {"matrix": [4, 2], "x": 12.5, "y": 0.25},
+ {"matrix": [4, 1], "x": 13.5, "y": 1},
+ {"matrix": [4, 0], "x": 14.5, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.75},
+
+ {"matrix": [5, 5], "x": 9.5, "y": 1.75},
+ {"matrix": [5, 4], "x": 10.5, "y": 1.5},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 2], "x": 12.5, "y": 1.25},
+ {"matrix": [5, 1], "x": 13.5, "y": 2},
+ {"matrix": [5, 0], "x": 14.5, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+ {"matrix": [2, 5], "x": 5, "y": 2.75},
+
+ {"matrix": [6, 5], "x": 9.5, "y": 2.75},
+ {"matrix": [6, 4], "x": 10.5, "y": 2.5},
+ {"matrix": [6, 3], "x": 11.5, "y": 2},
+ {"matrix": [6, 2], "x": 12.5, "y": 2.25},
+ {"matrix": [6, 1], "x": 13.5, "y": 3},
+ {"matrix": [6, 0], "x": 14.5, "y": 3.25},
+
+ {"matrix": [3, 2], "x": 3.25, "y": 3.75},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.75, "h": 1.5},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.75, "h": 1.5},
+ {"matrix": [3, 5], "x": 6.25, "y": 4.25},
+
+ {"matrix": [7, 5], "x": 8.25, "y": 4.25},
+ {"matrix": [7, 4], "x": 9.25, "y": 3.75, "h": 1.5},
+ {"matrix": [7, 3], "x": 10.25, "y": 3.75, "h": 1.5},
+ {"matrix": [7, 2], "x": 11.25, "y": 3.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dumbo/rules.mk b/keyboards/dumbo/rules.mk
deleted file mode 100644
index 6364de07d9b..00000000000
--- a/keyboards/dumbo/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
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json
deleted file mode 100644
index 84594e01afe..00000000000
--- a/keyboards/dumbpad/v0x/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.7"
- },
- "matrix_pins": {
- "cols": ["C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "D0", "pin_b": "D4"}
- ]
- },
- "bootmagic": {
- "matrix": [3, 0]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"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": [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": [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": [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}
- ]
- }
- }
-}
diff --git a/keyboards/dumbpad/v0x/keyboard.json b/keyboards/dumbpad/v0x/keyboard.json
new file mode 100644
index 00000000000..f0cecd80638
--- /dev/null
+++ b/keyboards/dumbpad/v0x/keyboard.json
@@ -0,0 +1,54 @@
+{
+ "usb": {
+ "device_version": "0.0.7"
+ },
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D0", "pin_b": "D4"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [3, 0]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "encoder": true,
+ "key_lock": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"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": [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": [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": [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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dumbpad/v0x/rules.mk b/keyboards/dumbpad/v0x/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v0x/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 = yes # 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
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json
deleted file mode 100644
index a841d9d6425..00000000000
--- a/keyboards/dumbpad/v0x_dualencoder/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.6"
- },
- "matrix_pins": {
- "cols": ["D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "C6", "pin_b": "D4"},
- {"pin_a": "D0", "pin_b": "D1"}
- ]
- },
- "bootmagic": {
- "matrix": [3, 0]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [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": [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": [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}
- ]
- }
- }
-}
diff --git a/keyboards/dumbpad/v0x_dualencoder/keyboard.json b/keyboards/dumbpad/v0x_dualencoder/keyboard.json
new file mode 100644
index 00000000000..71b501cedd5
--- /dev/null
+++ b/keyboards/dumbpad/v0x_dualencoder/keyboard.json
@@ -0,0 +1,54 @@
+{
+ "usb": {
+ "device_version": "0.0.6"
+ },
+ "matrix_pins": {
+ "cols": ["D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "C6", "pin_b": "D4"},
+ {"pin_a": "D0", "pin_b": "D1"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [3, 0]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "encoder": true,
+ "key_lock": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [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": [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": [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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dumbpad/v0x_dualencoder/rules.mk b/keyboards/dumbpad/v0x_dualencoder/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v0x_dualencoder/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 = yes # 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
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json
deleted file mode 100644
index d0530abd7d1..00000000000
--- a/keyboards/dumbpad/v0x_right/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.7"
- },
- "matrix_pins": {
- "cols": ["B5", "B4", "E6", "D7", "C6"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "D4", "pin_b": "D0"}
- ]
- },
- "bootmagic": {
- "matrix": [3, 4]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [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": [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": [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}
- ]
- }
- }
-}
diff --git a/keyboards/dumbpad/v0x_right/keyboard.json b/keyboards/dumbpad/v0x_right/keyboard.json
new file mode 100644
index 00000000000..883f2f785d7
--- /dev/null
+++ b/keyboards/dumbpad/v0x_right/keyboard.json
@@ -0,0 +1,54 @@
+{
+ "usb": {
+ "device_version": "0.0.7"
+ },
+ "matrix_pins": {
+ "cols": ["B5", "B4", "E6", "D7", "C6"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D4", "pin_b": "D0"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [3, 4]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "encoder": true,
+ "key_lock": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [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": [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": [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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dumbpad/v0x_right/rules.mk b/keyboards/dumbpad/v0x_right/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v0x_right/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 = yes # 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
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json
deleted file mode 100644
index f790bb80ecd..00000000000
--- a/keyboards/dumbpad/v1x/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "usb": {
- "device_version": "0.1.0"
- },
- "matrix_pins": {
- "cols": ["C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B2", "pin_b": "D4"}
- ]
- },
- "bootmagic": {
- "matrix": [3, 0]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"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": [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": [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": [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}
- ]
- }
- }
-}
diff --git a/keyboards/dumbpad/v1x/keyboard.json b/keyboards/dumbpad/v1x/keyboard.json
new file mode 100644
index 00000000000..9ab78e1a9f1
--- /dev/null
+++ b/keyboards/dumbpad/v1x/keyboard.json
@@ -0,0 +1,54 @@
+{
+ "usb": {
+ "device_version": "0.1.0"
+ },
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "D4"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [3, 0]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "encoder": true,
+ "key_lock": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"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": [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": [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": [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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dumbpad/v1x/rules.mk b/keyboards/dumbpad/v1x/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v1x/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 = yes # 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
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json
deleted file mode 100644
index ad16fa4417a..00000000000
--- a/keyboards/dumbpad/v1x_dualencoder/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "usb": {
- "device_version": "0.1.0"
- },
- "matrix_pins": {
- "cols": ["C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B2", "pin_b": "D4"},
- {"pin_a": "D0", "pin_b": "D1"}
- ]
- },
- "bootmagic": {
- "matrix": [3, 0]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"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": [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": [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": [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}
- ]
- }
- }
-}
diff --git a/keyboards/dumbpad/v1x_dualencoder/keyboard.json b/keyboards/dumbpad/v1x_dualencoder/keyboard.json
new file mode 100644
index 00000000000..f3aeafe6252
--- /dev/null
+++ b/keyboards/dumbpad/v1x_dualencoder/keyboard.json
@@ -0,0 +1,55 @@
+{
+ "usb": {
+ "device_version": "0.1.0"
+ },
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "D4"},
+ {"pin_a": "D0", "pin_b": "D1"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [3, 0]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "encoder": true,
+ "key_lock": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"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": [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": [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": [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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dumbpad/v1x_dualencoder/rules.mk b/keyboards/dumbpad/v1x_dualencoder/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v1x_dualencoder/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 = yes # 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
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/info.json
deleted file mode 100644
index b4dd15c76b7..00000000000
--- a/keyboards/dumbpad/v1x_oled/info.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["C6", "B1", "B3", "B2", "B6"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "B5"},
- {"pin_a": "E6", "pin_b": "D7"}
- ]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"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": [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": [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": [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}
- ]
- }
- }
-}
diff --git a/keyboards/dumbpad/v1x_oled/keyboard.json b/keyboards/dumbpad/v1x_oled/keyboard.json
new file mode 100644
index 00000000000..3a437699b86
--- /dev/null
+++ b/keyboards/dumbpad/v1x_oled/keyboard.json
@@ -0,0 +1,52 @@
+{
+ "usb": {
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["C6", "B1", "B3", "B2", "B6"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B5"},
+ {"pin_a": "E6", "pin_b": "D7"}
+ ]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "encoder": true,
+ "oled": true,
+ "wpm": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"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": [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": [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": [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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dumbpad/v1x_oled/rules.mk b/keyboards/dumbpad/v1x_oled/rules.mk
deleted file mode 100644
index 53db407bc36..00000000000
--- a/keyboards/dumbpad/v1x_oled/rules.mk
+++ /dev/null
@@ -1,16 +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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json
deleted file mode 100644
index 55b898b701a..00000000000
--- a/keyboards/dumbpad/v1x_right/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "usb": {
- "device_version": "0.1.0"
- },
- "matrix_pins": {
- "cols": ["B5", "B4", "E6", "D7", "C6"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "D4", "pin_b": "B2"}
- ]
- },
- "bootmagic": {
- "matrix": [3, 4]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [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": [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": [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}
- ]
- }
- }
-}
diff --git a/keyboards/dumbpad/v1x_right/keyboard.json b/keyboards/dumbpad/v1x_right/keyboard.json
new file mode 100644
index 00000000000..583d60bc5d2
--- /dev/null
+++ b/keyboards/dumbpad/v1x_right/keyboard.json
@@ -0,0 +1,54 @@
+{
+ "usb": {
+ "device_version": "0.1.0"
+ },
+ "matrix_pins": {
+ "cols": ["B5", "B4", "E6", "D7", "C6"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D4", "pin_b": "B2"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [3, 4]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "encoder": true,
+ "key_lock": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [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": [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": [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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dumbpad/v1x_right/rules.mk b/keyboards/dumbpad/v1x_right/rules.mk
deleted file mode 100644
index 7816aab001a..00000000000
--- a/keyboards/dumbpad/v1x_right/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 = yes # 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
-
-ENCODER_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
deleted file mode 100644
index 4dc17272a95..00000000000
--- a/keyboards/dumbpad/v3x/info.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "keyboard_name": "dumbpad/v3x",
- "url": "https://www.github.com/imchipwood/dumbpad",
- "maintainer": "imchipwood",
- "usb": {
- "device_version": "0.1.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_spiral_val": true,
- "cycle_left_right": true,
- "cycle_pinwheel": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "driver": "ws2812",
- "timeout": 300000,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B2", "pin_b": "D4"}
- ]
- },
- "bootmagic": {
- "matrix": [3, 0]
- },
- "ws2812": {
- "pin": "D1"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"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": [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": [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": [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}
- ]
- }
- }
-}
diff --git a/keyboards/dumbpad/v3x/keyboard.json b/keyboards/dumbpad/v3x/keyboard.json
new file mode 100644
index 00000000000..7ea29cd9ad3
--- /dev/null
+++ b/keyboards/dumbpad/v3x/keyboard.json
@@ -0,0 +1,93 @@
+{
+ "keyboard_name": "dumbpad/v3x",
+ "url": "https://www.github.com/imchipwood/dumbpad",
+ "maintainer": "imchipwood",
+ "usb": {
+ "device_version": "0.1.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_spiral_val": true,
+ "cycle_left_right": true,
+ "cycle_pinwheel": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "driver": "ws2812",
+ "timeout": 300000,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "D4"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [3, 0]
+ },
+ "ws2812": {
+ "pin": "D1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "rgb_matrix": true,
+ "encoder": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"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": [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": [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": [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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dumbpad/v3x/rules.mk b/keyboards/dumbpad/v3x/rules.mk
deleted file mode 100644
index 11f04a3adec..00000000000
--- a/keyboards/dumbpad/v3x/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-ENCODER_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json
index b8d38e2d9f9..d036bc06308 100644
--- a/keyboards/durgod/dgk6x/info.json
+++ b/keyboards/durgod/dgk6x/info.json
@@ -54,5 +54,15 @@
},
"processor": "STM32F072", // F070
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
"board": "DURGOD_STM32_F070"
}
diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk
index 36a93aa827b..597f5bbcf9e 100644
--- a/keyboards/durgod/dgk6x/rules.mk
+++ b/keyboards/durgod/dgk6x/rules.mk
@@ -1,20 +1,4 @@
# Do not put the microcontroller into power saving mode
NO_SUSPEND_POWER_DOWN = yes
-# 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
-LTO_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
DEFAULT_FOLDER=durgod/dgk6x/hades_ansi
diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json
deleted file mode 100644
index 6047c40fc05..00000000000
--- a/keyboards/durgod/k310/base/info.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"],
- "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"]
- },
- "diode_direction": "ROW2COL",
- "indicators": {
- "caps_lock": "C9",
- "num_lock": "C8",
- "scroll_lock": "A8",
- "on_state": 0
- },
- "processor": "STM32F072", // F070
- "bootloader": "stm32-dfu",
- "board": "DURGOD_STM32_F070"
-}
diff --git a/keyboards/durgod/k310/base/keyboard.json b/keyboards/durgod/k310/base/keyboard.json
new file mode 100644
index 00000000000..94dae4d8097
--- /dev/null
+++ b/keyboards/durgod/k310/base/keyboard.json
@@ -0,0 +1,25 @@
+{
+ "matrix_pins": {
+ "cols": ["C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C10", "C11", "C12"],
+ "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7"]
+ },
+ "diode_direction": "ROW2COL",
+ "indicators": {
+ "caps_lock": "C9",
+ "num_lock": "C8",
+ "scroll_lock": "A8",
+ "on_state": 0
+ },
+ "processor": "STM32F072", // F070
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "board": "DURGOD_STM32_F070"
+}
diff --git a/keyboards/durgod/k310/base/rules.mk b/keyboards/durgod/k310/base/rules.mk
index 454cf102ec2..0ab54aaaf71 100644
--- a/keyboards/durgod/k310/base/rules.mk
+++ b/keyboards/durgod/k310/base/rules.mk
@@ -1,16 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/info.json
deleted file mode 100644
index 8a9801c4f30..00000000000
--- a/keyboards/dztech/dz60rgb/v1/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- "usb": {
- "pid": "0x1120",
- "device_version": "1.0.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "solid_splash": true
- },
- "default": {
- "animation": "cycle_all"
- },
- "driver": "is31fl3733",
- "led_process_limit": 4,
- "led_flush_limit": 26,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
- "rows": ["B1", "B10", "B11", "B14", "B12"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
- "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb/v1/keyboard.json b/keyboards/dztech/dz60rgb/v1/keyboard.json
new file mode 100644
index 00000000000..fa82578c766
--- /dev/null
+++ b/keyboards/dztech/dz60rgb/v1/keyboard.json
@@ -0,0 +1,73 @@
+{
+ "usb": {
+ "pid": "0x1120",
+ "device_version": "1.0.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "solid_splash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3733",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
+ "rows": ["B1", "B10", "B11", "B14", "B12"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "board": "QMK_PROTON_C",
+ "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk
deleted file mode 100644
index ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb/v1/rules.mk
+++ /dev/null
@@ -1,13 +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 # Use RGB matrix
diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/info.json
deleted file mode 100644
index c3e1837dbd3..00000000000
--- a/keyboards/dztech/dz60rgb/v2/info.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "usb": {
- "pid": "0x1121",
- "device_version": "2.0.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "solid_reactive_simple": true,
- "solid_reactive": true
- },
- "driver": "is31fl3733",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
- "rows": ["F5", "F4", "F1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb/v2/keyboard.json b/keyboards/dztech/dz60rgb/v2/keyboard.json
new file mode 100644
index 00000000000..710f86e04c5
--- /dev/null
+++ b/keyboards/dztech/dz60rgb/v2/keyboard.json
@@ -0,0 +1,55 @@
+{
+ "usb": {
+ "pid": "0x1121",
+ "device_version": "2.0.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+ "rows": ["F5", "F4", "F1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk
deleted file mode 100644
index ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb/v2/rules.mk
+++ /dev/null
@@ -1,13 +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 # Use RGB matrix
diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json
deleted file mode 100644
index 1d97037c311..00000000000
--- a/keyboards/dztech/dz60rgb/v2_1/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "usb": {
- "pid": "0x1121",
- "device_version": "2.1.0"
- },
- "rgb_matrix": {
- "animations":{
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "solid_reactive_simple": true,
- "solid_reactive": true
- },
- "driver": "is31fl3733",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
- "rows": ["F5", "F4", "F1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "lufa-ms",
- "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb/v2_1/keyboard.json b/keyboards/dztech/dz60rgb/v2_1/keyboard.json
new file mode 100644
index 00000000000..7678e9985c9
--- /dev/null
+++ b/keyboards/dztech/dz60rgb/v2_1/keyboard.json
@@ -0,0 +1,59 @@
+{
+ "usb": {
+ "pid": "0x1121",
+ "device_version": "2.1.0"
+ },
+ "rgb_matrix": {
+ "animations":{
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+ "rows": ["F5", "F4", "F1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "lufa-ms",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "space_cadet": false,
+ "grave_esc": false
+ },
+ "build": {
+ "lto": true
+ },
+ "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb/v2_1/rules.mk b/keyboards/dztech/dz60rgb/v2_1/rules.mk
index 5c51de83766..13252d81696 100644
--- a/keyboards/dztech/dz60rgb/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk
@@ -1,19 +1 @@
BOOTLOADER_SIZE = 6144
-
-# 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 # Use RGB matrix
-LTO_ENABLE = yes
-
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/info.json
deleted file mode 100644
index d09c967d008..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v1/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- "usb": {
- "pid": "0x1220",
- "device_version": "1.0.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "solid_splash": true
- },
- "default": {
- "animation": "cycle_all"
- },
- "driver": "is31fl3733",
- "led_process_limit": 4,
- "led_flush_limit": 26,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
- "rows": ["B1", "B10", "B11", "B14", "B12"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
- "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json b/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json
new file mode 100644
index 00000000000..de0229c1512
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json
@@ -0,0 +1,73 @@
+{
+ "usb": {
+ "pid": "0x1220",
+ "device_version": "1.0.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "solid_splash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3733",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
+ "rows": ["B1", "B10", "B11", "B14", "B12"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "board": "QMK_PROTON_C",
+ "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
deleted file mode 100644
index ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
+++ /dev/null
@@ -1,13 +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 # Use RGB matrix
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/info.json
deleted file mode 100644
index 5769daefef2..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v2/info.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "usb": {
- "pid": "0x1221",
- "device_version": "2.0.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_splash": true
- },
- "driver": "is31fl3733",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
- "rows": ["F5", "F4", "F1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json b/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json
new file mode 100644
index 00000000000..9a4a11ffdc6
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json
@@ -0,0 +1,60 @@
+{
+ "usb": {
+ "pid": "0x1221",
+ "device_version": "2.0.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_splash": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+ "rows": ["F5", "F4", "F1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
+ "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
deleted file mode 100644
index f478792adbc..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v2/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 # Use RGB matrix
-
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
deleted file mode 100644
index 649ea2e2611..00000000000
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "usb": {
- "pid": "0x1221",
- "device_version": "2.1.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true
- },
- "driver": "is31fl3733",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
- "rows": ["F5", "F4", "F1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "lufa-ms",
- "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json b/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json
new file mode 100644
index 00000000000..9d3b1efeac1
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json
@@ -0,0 +1,57 @@
+{
+ "usb": {
+ "pid": "0x1221",
+ "device_version": "2.1.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+ "rows": ["F5", "F4", "F1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "lufa-ms",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
+ "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
index a89963c2d40..13252d81696 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk
@@ -1,16 +1 @@
BOOTLOADER_SIZE = 6144
-
-# 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 # Use RGB matrix
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/info.json
deleted file mode 100644
index 320d412aaef..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v1/info.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- "usb": {
- "pid": "0x1320",
- "device_version": "1.0.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "solid_splash": true
- },
- "default": {
- "animation": "cycle_all"
- },
- "driver": "is31fl3733",
- "led_process_limit": 4,
- "led_flush_limit": 26,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
- "rows": ["B1", "B10", "B11", "B14", "B12"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
- "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json b/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json
new file mode 100644
index 00000000000..c0b78aa8a9f
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json
@@ -0,0 +1,73 @@
+{
+ "usb": {
+ "pid": "0x1320",
+ "device_version": "1.0.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "solid_splash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3733",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14"],
+ "rows": ["B1", "B10", "B11", "B14", "B12"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "board": "QMK_PROTON_C",
+ "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
deleted file mode 100644
index ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
+++ /dev/null
@@ -1,13 +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 # Use RGB matrix
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/info.json
deleted file mode 100644
index f7d6acff0c7..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v2/info.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "usb": {
- "pid": "0x1321",
- "device_version": "2.0.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "typing_heatmap": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_splash": true
- },
- "driver": "is31fl3733",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
- "rows": ["F5", "F4", "F1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json b/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json
new file mode 100644
index 00000000000..fd095b548a5
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json
@@ -0,0 +1,53 @@
+{
+ "usb": {
+ "pid": "0x1321",
+ "device_version": "2.0.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_splash": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+ "rows": ["F5", "F4", "F1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
deleted file mode 100644
index ea646d3d939..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
+++ /dev/null
@@ -1,13 +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 # Use RGB matrix
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
deleted file mode 100644
index 5a3cc636024..00000000000
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "usb": {
- "pid": "0x1321",
- "device_version": "2.1.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_splash": true
- },
- "driver": "is31fl3733",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
- "rows": ["F5", "F4", "F1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "lufa-ms",
- "debounce": 3
-}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json b/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json
new file mode 100644
index 00000000000..968488e5449
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json
@@ -0,0 +1,57 @@
+{
+ "usb": {
+ "pid": "0x1321",
+ "device_version": "2.1.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_splash": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+ "rows": ["F5", "F4", "F1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "lufa-ms",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
+ "debounce": 3
+}
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
index a89963c2d40..13252d81696 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk
@@ -1,16 +1 @@
BOOTLOADER_SIZE = 6144
-
-# 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 # Use RGB matrix
-LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json
deleted file mode 100644
index b568170e14d..00000000000
--- a/keyboards/dztech/dz64rgb/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
- "keyboard_name": "DZ64RGB",
- "manufacturer": "DZTECH",
- "url": "",
- "maintainer": "moyi4681",
- "usb": {
- "vid": "0x445A",
- "pid": "0x1013",
- "device_version": "0.0.2"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true
- },
- "default": {
- "animation": "cycle_all"
- },
- "driver": "is31fl3733",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
- "rows": ["F5", "F4", "F1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "lufa-ms",
- "layouts": {
- "LAYOUT_64_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
- {"matrix": [3, 1], "x": 2, "y": 3},
- {"matrix": [3, 2], "x": 3, "y": 3},
- {"matrix": [3, 3], "x": 4, "y": 3},
- {"matrix": [3, 4], "x": 5, "y": 3},
- {"matrix": [3, 5], "x": 6, "y": 3},
- {"matrix": [3, 6], "x": 7, "y": 3},
- {"matrix": [3, 7], "x": 8, "y": 3},
- {"matrix": [3, 8], "x": 9, "y": 3},
- {"matrix": [3, 9], "x": 10, "y": 3},
- {"matrix": [3, 10], "x": 11, "y": 3},
- {"matrix": [3, 11], "x": 12, "y": 3},
- {"matrix": [3, 12], "x": 13, "y": 3},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 8], "x": 10, "y": 4},
- {"matrix": [4, 9], "x": 11, "y": 4},
- {"matrix": [4, 10], "x": 12, "y": 4},
- {"matrix": [4, 11], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/dztech/dz64rgb/keyboard.json b/keyboards/dztech/dz64rgb/keyboard.json
new file mode 100644
index 00000000000..ea22af59db9
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/keyboard.json
@@ -0,0 +1,138 @@
+{
+ "keyboard_name": "DZ64RGB",
+ "manufacturer": "DZTECH",
+ "url": "",
+ "maintainer": "moyi4681",
+ "usb": {
+ "vid": "0x445A",
+ "pid": "0x1013",
+ "device_version": "0.0.2"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3733",
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F0", "B0", "B1", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B7"],
+ "rows": ["F5", "F4", "F1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "lufa-ms",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
+ "community_layouts": ["64_ansi"],
+ "layouts": {
+ "LAYOUT_64_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3},
+ {"matrix": [3, 5], "x": 6, "y": 3},
+ {"matrix": [3, 6], "x": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10, "y": 4},
+ {"matrix": [4, 9], "x": 11, "y": 4},
+ {"matrix": [4, 10], "x": 12, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dztech/dz64rgb/rules.mk b/keyboards/dztech/dz64rgb/rules.mk
deleted file mode 100644
index a20c8b449f7..00000000000
--- a/keyboards/dztech/dz64rgb/rules.mk
+++ /dev/null
@@ -1,15 +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
-LTO_ENABLE = yes
-LAYOUT= 64_ansi
\ No newline at end of file
diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json
deleted file mode 100644
index ea7390ee9ee..00000000000
--- a/keyboards/dztech/dz65rgb/v3/info.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
- "usb": {
- "pid": "0x1424",
- "device_version": "3.0.0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "default": {
- "animation": "cycle_all"
- },
- "driver": "is31fl3741",
- "led_process_limit": 4,
- "led_flush_limit": 26,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
- "rows": ["F0", "F1", "F4", "E6", "C6"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "lufa-ms",
- "layouts": {
- "LAYOUT_65_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/dztech/dz65rgb/v3/keyboard.json b/keyboards/dztech/dz65rgb/v3/keyboard.json
new file mode 100644
index 00000000000..8fef8b34683
--- /dev/null
+++ b/keyboards/dztech/dz65rgb/v3/keyboard.json
@@ -0,0 +1,155 @@
+{
+ "usb": {
+ "pid": "0x1424",
+ "device_version": "3.0.0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3741",
+ "led_process_limit": 4,
+ "led_flush_limit": 26,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+ "rows": ["F0", "F1", "F4", "E6", "C6"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "lufa-ms",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "build": {
+ "lto": true
+ },
+ "layouts": {
+ "LAYOUT_65_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/dztech/dz65rgb/v3/rules.mk b/keyboards/dztech/dz65rgb/v3/rules.mk
index bbe22adb0c5..13252d81696 100755
--- a/keyboards/dztech/dz65rgb/v3/rules.mk
+++ b/keyboards/dztech/dz65rgb/v3/rules.mk
@@ -1,16 +1 @@
BOOTLOADER_SIZE = 6144
-
-# 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/eco/info.json b/keyboards/eco/info.json
index 74c66fdcb91..6a1b2adda1b 100644
--- a/keyboards/eco/info.json
+++ b/keyboards/eco/info.json
@@ -3,16 +3,6 @@
"manufacturer": "Bishop Keyboards",
"url": "",
"maintainer": "qmk",
- "features": {
- "backlight": true,
- "bootmagic": false,
- "command": true,
- "console": false,
- "extrakey": true,
- "midi": true,
- "mousekey": false,
- "nkro": false
- },
"usb": {
"vid": "0x1337",
"pid": "0x6006"
diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/info.json
deleted file mode 100644
index f2a7842ce40..00000000000
--- a/keyboards/eco/rev1/info.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
- "rows": ["B1", "B6", "B2", "B3"]
- },
- "diode_direction": "COL2ROW",
- "layouts": {
- "LAYOUT": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "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": [2, 12], "x": 12, "y": 2},
- {"matrix": [2, 13], "x": 13, "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},
- {"matrix": [3, 12], "x": 12, "y": 3},
- {"matrix": [3, 13], "x": 13, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/eco/rev1/keyboard.json b/keyboards/eco/rev1/keyboard.json
new file mode 100644
index 00000000000..1b3cb5f8dfb
--- /dev/null
+++ b/keyboards/eco/rev1/keyboard.json
@@ -0,0 +1,85 @@
+{
+ "usb": {
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
+ "rows": ["B1", "B6", "B2", "B3"]
+ },
+ "diode_direction": "COL2ROW",
+ "features": {
+ "backlight": false,
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "midi": true,
+ "mousekey": false,
+ "nkro": false
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "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": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "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},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/eco/rev1/rules.mk b/keyboards/eco/rev1/rules.mk
deleted file mode 100644
index f845616741c..00000000000
--- a/keyboards/eco/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/info.json
deleted file mode 100644
index 8148e78f859..00000000000
--- a/keyboards/eco/rev2/info.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["D1", "D0", "D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D2", "D3"],
- "rows": ["D7", "B5", "B4", "E6"]
- },
- "diode_direction": "COL2ROW",
- "layouts": {
- "LAYOUT": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "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": [2, 12], "x": 12, "y": 2},
- {"matrix": [2, 13], "x": 13, "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},
- {"matrix": [3, 12], "x": 12, "y": 3},
- {"matrix": [3, 13], "x": 13, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/eco/rev2/keyboard.json b/keyboards/eco/rev2/keyboard.json
new file mode 100644
index 00000000000..8effdd85e5b
--- /dev/null
+++ b/keyboards/eco/rev2/keyboard.json
@@ -0,0 +1,85 @@
+{
+ "usb": {
+ "device_version": "0.0.2"
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D2", "D3"],
+ "rows": ["D7", "B5", "B4", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "features": {
+ "backlight": false,
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "midi": true,
+ "mousekey": false,
+ "nkro": false
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "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": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "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},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/eco/rev2/rules.mk b/keyboards/eco/rev2/rules.mk
deleted file mode 100644
index f845616741c..00000000000
--- a/keyboards/eco/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
deleted file mode 100644
index 89b008296bc..00000000000
--- a/keyboards/edi/hardlight/mk1/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Enable Audio Subsystem with two voices
- */
-// #define AUDIO_PIN C6
diff --git a/keyboards/edi/hardlight/mk1/keyboard.json b/keyboards/edi/hardlight/mk1/keyboard.json
index 7f33c262278..3cb07cb2f18 100644
--- a/keyboards/edi/hardlight/mk1/keyboard.json
+++ b/keyboards/edi/hardlight/mk1/keyboard.json
@@ -16,6 +16,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"],
"rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index 52636c6484e..bd604db6846 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
/* PWM RGB Underglow Defines */
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
deleted file mode 100644
index 2be212702ac..00000000000
--- a/keyboards/edi/hardlight/mk2/info.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
- "keyboard_name": "Hard Light Mk 2",
- "manufacturer": "Everywhere Defense Industries",
- "usb": {
- "vid": "0xF7E0",
- "pid": "0x2408",
- "device_version": "0.0.7"
- },
- "rgblight": {
- "led_count": 32,
- "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": {
- "pin": "A10",
- "driver": "pwm"
- },
- "matrix_pins": {
- "cols": ["B2", "B6", "B5", "F1", "F0", "C15", "C14", "C13"],
- "rows": ["B10", "B11", "A14", "A15", "A3", "A0", "A2", "A1"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "community_layouts": ["ortho_4x16"],
- "layouts": {
- "LAYOUT_ortho_4x16": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [1, 0], "x": 1, "y": 0},
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [1, 1], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0},
- {"matrix": [1, 2], "x": 5, "y": 0},
- {"matrix": [0, 3], "x": 6, "y": 0},
- {"matrix": [1, 3], "x": 7, "y": 0},
- {"matrix": [0, 4], "x": 8, "y": 0},
- {"matrix": [1, 4], "x": 9, "y": 0},
- {"matrix": [0, 5], "x": 10, "y": 0},
- {"matrix": [1, 5], "x": 11, "y": 0},
- {"matrix": [0, 6], "x": 12, "y": 0},
- {"matrix": [1, 6], "x": 13, "y": 0},
- {"matrix": [0, 7], "x": 14, "y": 0},
- {"matrix": [1, 7], "x": 15, "y": 0},
-
- {"matrix": [2, 0], "x": 0, "y": 1},
- {"matrix": [3, 0], "x": 1, "y": 1},
- {"matrix": [2, 1], "x": 2, "y": 1},
- {"matrix": [3, 1], "x": 3, "y": 1},
- {"matrix": [2, 2], "x": 4, "y": 1},
- {"matrix": [3, 2], "x": 5, "y": 1},
- {"matrix": [2, 3], "x": 6, "y": 1},
- {"matrix": [3, 3], "x": 7, "y": 1},
- {"matrix": [2, 4], "x": 8, "y": 1},
- {"matrix": [3, 4], "x": 9, "y": 1},
- {"matrix": [2, 5], "x": 10, "y": 1},
- {"matrix": [3, 5], "x": 11, "y": 1},
- {"matrix": [2, 6], "x": 12, "y": 1},
- {"matrix": [3, 6], "x": 13, "y": 1},
- {"matrix": [2, 7], "x": 14, "y": 1},
- {"matrix": [3, 7], "x": 15, "y": 1},
-
- {"matrix": [4, 0], "x": 0, "y": 2},
- {"matrix": [5, 0], "x": 1, "y": 2},
- {"matrix": [4, 1], "x": 2, "y": 2},
- {"matrix": [5, 1], "x": 3, "y": 2},
- {"matrix": [4, 2], "x": 4, "y": 2},
- {"matrix": [5, 2], "x": 5, "y": 2},
- {"matrix": [4, 3], "x": 6, "y": 2},
- {"matrix": [5, 3], "x": 7, "y": 2},
- {"matrix": [4, 4], "x": 8, "y": 2},
- {"matrix": [5, 4], "x": 9, "y": 2},
- {"matrix": [4, 5], "x": 10, "y": 2},
- {"matrix": [5, 5], "x": 11, "y": 2},
- {"matrix": [4, 6], "x": 12, "y": 2},
- {"matrix": [5, 6], "x": 13, "y": 2},
- {"matrix": [4, 7], "x": 14, "y": 2},
- {"matrix": [5, 7], "x": 15, "y": 2},
-
- {"matrix": [6, 0], "x": 0, "y": 3},
- {"matrix": [7, 0], "x": 1, "y": 3},
- {"matrix": [6, 1], "x": 2, "y": 3},
- {"matrix": [7, 1], "x": 3, "y": 3},
- {"matrix": [6, 2], "x": 4, "y": 3},
- {"matrix": [7, 2], "x": 5, "y": 3},
- {"matrix": [6, 3], "x": 6, "y": 3},
- {"matrix": [7, 3], "x": 7, "y": 3},
- {"matrix": [6, 4], "x": 8, "y": 3},
- {"matrix": [7, 4], "x": 9, "y": 3},
- {"matrix": [6, 5], "x": 10, "y": 3},
- {"matrix": [7, 5], "x": 11, "y": 3},
- {"matrix": [6, 6], "x": 12, "y": 3},
- {"matrix": [7, 6], "x": 13, "y": 3},
- {"matrix": [6, 7], "x": 14, "y": 3},
- {"matrix": [7, 7], "x": 15, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/edi/hardlight/mk2/keyboard.json b/keyboards/edi/hardlight/mk2/keyboard.json
new file mode 100644
index 00000000000..a1f47aabf5a
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/keyboard.json
@@ -0,0 +1,126 @@
+{
+ "keyboard_name": "Hard Light Mk 2",
+ "manufacturer": "Everywhere Defense Industries",
+ "usb": {
+ "vid": "0xF7E0",
+ "pid": "0x2408",
+ "device_version": "0.0.7"
+ },
+ "rgblight": {
+ "led_count": 32,
+ "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": {
+ "pin": "A10",
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B6", "B5", "F1", "F0", "C15", "C14", "C13"],
+ "rows": ["B10", "B11", "A14", "A15", "A3", "A0", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true,
+ "velocikey": true,
+ "key_lock": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "community_layouts": ["ortho_4x16"],
+ "layouts": {
+ "LAYOUT_ortho_4x16": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [2, 7], "x": 14, "y": 1},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [4, 3], "x": 6, "y": 2},
+ {"matrix": [5, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [4, 5], "x": 10, "y": 2},
+ {"matrix": [5, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [5, 6], "x": 13, "y": 2},
+ {"matrix": [4, 7], "x": 14, "y": 2},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [6, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+ {"matrix": [6, 6], "x": 12, "y": 3},
+ {"matrix": [7, 6], "x": 13, "y": 3},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk
index b7b67ba5b2b..0ab54aaaf71 100644
--- a/keyboards/edi/hardlight/mk2/rules.mk
+++ b/keyboards/edi/hardlight/mk2/rules.mk
@@ -1,18 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
-VELOCIKEY_ENABLE = yes
-KEY_LOCK_ENABLE = yes
-
diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json
deleted file mode 100644
index 745710f92f3..00000000000
--- a/keyboards/edinburgh41/info.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "manufacturer": "L. Mistry",
- "keyboard_name": "edinburgh41",
- "maintainer": "schwarzer-geiger",
- "bootloader": "atmel-dfu",
- "processor": "atmega32u4",
- "url": "https://github.com/schwarzer-geiger/Edinburgh41",
- "usb": {
- "device_version": "1.0.0",
- "pid": "0x0000",
- "vid": "0xFEED"
- },
- "rgblight": {
- "led_count": 10
- },
- "ws2812": {
- "pin": "D0"
- },
- "matrix_pins": {
- "cols": ["D1", "D4", "C6", "D7", "E6", "B4"],
- "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.54},
- {"matrix": [0, 1], "x": 1, "y": 0.36},
- {"matrix": [0, 2], "x": 2, "y": 0.18},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.18},
- {"matrix": [0, 5], "x": 5, "y": 0.36},
-
- {"matrix": [3, 0], "x": 7, "y": 0.36},
- {"matrix": [3, 1], "x": 8, "y": 0.18},
- {"matrix": [3, 2], "x": 9, "y": 0},
- {"matrix": [3, 3], "x": 10, "y": 0.18},
- {"matrix": [3, 4], "x": 11, "y": 0.36},
- {"matrix": [3, 5], "x": 12, "y": 0.54},
-
- {"matrix": [1, 0], "x": 0, "y": 1.54},
- {"matrix": [1, 1], "x": 1, "y": 1.36},
- {"matrix": [1, 2], "x": 2, "y": 1.18},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.18},
- {"matrix": [1, 5], "x": 5, "y": 1.36},
-
- {"matrix": [4, 0], "x": 7, "y": 1.36},
- {"matrix": [4, 1], "x": 8, "y": 1.18},
- {"matrix": [4, 2], "x": 9, "y": 1},
- {"matrix": [4, 3], "x": 10, "y": 1.18},
- {"matrix": [4, 4], "x": 11, "y": 1.36},
- {"matrix": [4, 5], "x": 12, "y": 1.54},
-
- {"matrix": [2, 0], "x": 0, "y": 2.54},
- {"matrix": [2, 1], "x": 1, "y": 2.36},
- {"matrix": [2, 2], "x": 2, "y": 2.18},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.18},
- {"matrix": [2, 5], "x": 5, "y": 2.36},
-
- {"matrix": [5, 0], "x": 7, "y": 2.36},
- {"matrix": [5, 1], "x": 8, "y": 2.18},
- {"matrix": [5, 2], "x": 9, "y": 2},
- {"matrix": [5, 3], "x": 10, "y": 2.18},
- {"matrix": [5, 4], "x": 11, "y": 2.36},
- {"matrix": [5, 5], "x": 12, "y": 2.54},
-
- {"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25},
- {"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25},
- {"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25},
- {"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25},
- {"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/edinburgh41/keyboard.json b/keyboards/edinburgh41/keyboard.json
new file mode 100644
index 00000000000..374f10b2b77
--- /dev/null
+++ b/keyboards/edinburgh41/keyboard.json
@@ -0,0 +1,85 @@
+{
+ "manufacturer": "L. Mistry",
+ "keyboard_name": "edinburgh41",
+ "maintainer": "schwarzer-geiger",
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "pointing_device": true
+ },
+ "url": "https://github.com/schwarzer-geiger/Edinburgh41",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0000",
+ "vid": "0xFEED"
+ },
+ "rgblight": {
+ "led_count": 10
+ },
+ "ws2812": {
+ "pin": "D0"
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D4", "C6", "D7", "E6", "B4"],
+ "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.54},
+ {"matrix": [0, 1], "x": 1, "y": 0.36},
+ {"matrix": [0, 2], "x": 2, "y": 0.18},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.18},
+ {"matrix": [0, 5], "x": 5, "y": 0.36},
+
+ {"matrix": [3, 0], "x": 7, "y": 0.36},
+ {"matrix": [3, 1], "x": 8, "y": 0.18},
+ {"matrix": [3, 2], "x": 9, "y": 0},
+ {"matrix": [3, 3], "x": 10, "y": 0.18},
+ {"matrix": [3, 4], "x": 11, "y": 0.36},
+ {"matrix": [3, 5], "x": 12, "y": 0.54},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.54},
+ {"matrix": [1, 1], "x": 1, "y": 1.36},
+ {"matrix": [1, 2], "x": 2, "y": 1.18},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.18},
+ {"matrix": [1, 5], "x": 5, "y": 1.36},
+
+ {"matrix": [4, 0], "x": 7, "y": 1.36},
+ {"matrix": [4, 1], "x": 8, "y": 1.18},
+ {"matrix": [4, 2], "x": 9, "y": 1},
+ {"matrix": [4, 3], "x": 10, "y": 1.18},
+ {"matrix": [4, 4], "x": 11, "y": 1.36},
+ {"matrix": [4, 5], "x": 12, "y": 1.54},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.54},
+ {"matrix": [2, 1], "x": 1, "y": 2.36},
+ {"matrix": [2, 2], "x": 2, "y": 2.18},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.18},
+ {"matrix": [2, 5], "x": 5, "y": 2.36},
+
+ {"matrix": [5, 0], "x": 7, "y": 2.36},
+ {"matrix": [5, 1], "x": 8, "y": 2.18},
+ {"matrix": [5, 2], "x": 9, "y": 2},
+ {"matrix": [5, 3], "x": 10, "y": 2.18},
+ {"matrix": [5, 4], "x": 11, "y": 2.36},
+ {"matrix": [5, 5], "x": 12, "y": 2.54},
+
+ {"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25},
+ {"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25},
+ {"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25},
+ {"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25},
+ {"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/edinburgh41/rules.mk b/keyboards/edinburgh41/rules.mk
index bf33c793b6b..c76a8bf8a18 100644
--- a/keyboards/edinburgh41/rules.mk
+++ b/keyboards/edinburgh41/rules.mk
@@ -1,15 +1 @@
-# 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
-
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = analog_joystick
diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
deleted file mode 100644
index 46a265902c4..00000000000
--- a/keyboards/efreet/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Amber Holly
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json
deleted file mode 100644
index b7749ed3419..00000000000
--- a/keyboards/efreet/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
- "keyboard_name": "Efreet",
- "manufacturer": "Soran",
- "url": "",
- "maintainer": "amberstarlight",
- "usb": {
- "vid": "0x534F",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B3", "B4", "B5", "B6", "B7", "C7"],
- "rows": ["B0", "D6", "D5", "D4", "D3", "D2", "D1", "C2"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "driver": "timer",
- "pin": "D0",
- "breathing": true
- },
- "processor": "atmega32u2",
- "bootloader": "atmel-dfu",
- "community_layouts": ["ortho_4x12", "planck_mit"],
- "layouts": {
- "LAYOUT_planck_mit": {
- "layout": [
- {"matrix": [1, 0], "x": 0, "y": 0},
- {"matrix": [0, 0], "x": 1, "y": 0},
- {"matrix": [1, 1], "x": 2, "y": 0},
- {"matrix": [0, 1], "x": 3, "y": 0},
- {"matrix": [1, 2], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
- {"matrix": [1, 3], "x": 6, "y": 0},
- {"matrix": [0, 3], "x": 7, "y": 0},
- {"matrix": [1, 4], "x": 8, "y": 0},
- {"matrix": [0, 4], "x": 9, "y": 0},
- {"matrix": [1, 5], "x": 10, "y": 0},
- {"matrix": [0, 5], "x": 11, "y": 0},
-
- {"matrix": [3, 0], "x": 0, "y": 1},
- {"matrix": [2, 0], "x": 1, "y": 1},
- {"matrix": [3, 1], "x": 2, "y": 1},
- {"matrix": [2, 1], "x": 3, "y": 1},
- {"matrix": [3, 2], "x": 4, "y": 1},
- {"matrix": [2, 2], "x": 5, "y": 1},
- {"matrix": [3, 3], "x": 6, "y": 1},
- {"matrix": [2, 3], "x": 7, "y": 1},
- {"matrix": [3, 4], "x": 8, "y": 1},
- {"matrix": [2, 4], "x": 9, "y": 1},
- {"matrix": [3, 5], "x": 10, "y": 1},
- {"matrix": [2, 5], "x": 11, "y": 1},
-
- {"matrix": [5, 0], "x": 0, "y": 2},
- {"matrix": [4, 0], "x": 1, "y": 2},
- {"matrix": [5, 1], "x": 2, "y": 2},
- {"matrix": [4, 1], "x": 3, "y": 2},
- {"matrix": [5, 2], "x": 4, "y": 2},
- {"matrix": [4, 2], "x": 5, "y": 2},
- {"matrix": [5, 3], "x": 6, "y": 2},
- {"matrix": [4, 3], "x": 7, "y": 2},
- {"matrix": [5, 4], "x": 8, "y": 2},
- {"matrix": [4, 4], "x": 9, "y": 2},
- {"matrix": [5, 5], "x": 10, "y": 2},
- {"matrix": [4, 5], "x": 11, "y": 2},
-
- {"matrix": [7, 0], "x": 0, "y": 3},
- {"matrix": [6, 0], "x": 1, "y": 3},
- {"matrix": [7, 1], "x": 2, "y": 3},
- {"matrix": [6, 1], "x": 3, "y": 3},
- {"matrix": [7, 2], "x": 4, "y": 3},
- {"matrix": [6, 2], "x": 5, "y": 3, "w": 2},
- {"matrix": [6, 3], "x": 7, "y": 3},
- {"matrix": [7, 4], "x": 8, "y": 3},
- {"matrix": [6, 4], "x": 9, "y": 3},
- {"matrix": [7, 5], "x": 10, "y": 3},
- {"matrix": [6, 5], "x": 11, "y": 3}
- ]
- },
- "LAYOUT_ortho_4x12": {
- "layout": [
- {"matrix": [1, 0], "x": 0, "y": 0},
- {"matrix": [0, 0], "x": 1, "y": 0},
- {"matrix": [1, 1], "x": 2, "y": 0},
- {"matrix": [0, 1], "x": 3, "y": 0},
- {"matrix": [1, 2], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
- {"matrix": [1, 3], "x": 6, "y": 0},
- {"matrix": [0, 3], "x": 7, "y": 0},
- {"matrix": [1, 4], "x": 8, "y": 0},
- {"matrix": [0, 4], "x": 9, "y": 0},
- {"matrix": [1, 5], "x": 10, "y": 0},
- {"matrix": [0, 5], "x": 11, "y": 0},
-
- {"matrix": [3, 0], "x": 0, "y": 1},
- {"matrix": [2, 0], "x": 1, "y": 1},
- {"matrix": [3, 1], "x": 2, "y": 1},
- {"matrix": [2, 1], "x": 3, "y": 1},
- {"matrix": [3, 2], "x": 4, "y": 1},
- {"matrix": [2, 2], "x": 5, "y": 1},
- {"matrix": [3, 3], "x": 6, "y": 1},
- {"matrix": [2, 3], "x": 7, "y": 1},
- {"matrix": [3, 4], "x": 8, "y": 1},
- {"matrix": [2, 4], "x": 9, "y": 1},
- {"matrix": [3, 5], "x": 10, "y": 1},
- {"matrix": [2, 5], "x": 11, "y": 1},
-
- {"matrix": [5, 0], "x": 0, "y": 2},
- {"matrix": [4, 0], "x": 1, "y": 2},
- {"matrix": [5, 1], "x": 2, "y": 2},
- {"matrix": [4, 1], "x": 3, "y": 2},
- {"matrix": [5, 2], "x": 4, "y": 2},
- {"matrix": [4, 2], "x": 5, "y": 2},
- {"matrix": [5, 3], "x": 6, "y": 2},
- {"matrix": [4, 3], "x": 7, "y": 2},
- {"matrix": [5, 4], "x": 8, "y": 2},
- {"matrix": [4, 4], "x": 9, "y": 2},
- {"matrix": [5, 5], "x": 10, "y": 2},
- {"matrix": [4, 5], "x": 11, "y": 2},
-
- {"matrix": [7, 0], "x": 0, "y": 3},
- {"matrix": [6, 0], "x": 1, "y": 3},
- {"matrix": [7, 1], "x": 2, "y": 3},
- {"matrix": [6, 1], "x": 3, "y": 3},
- {"matrix": [7, 2], "x": 4, "y": 3},
- {"matrix": [6, 2], "x": 5, "y": 3},
- {"matrix": [7, 3], "x": 6, "y": 3},
- {"matrix": [6, 3], "x": 7, "y": 3},
- {"matrix": [7, 4], "x": 8, "y": 3},
- {"matrix": [6, 4], "x": 9, "y": 3},
- {"matrix": [7, 5], "x": 10, "y": 3},
- {"matrix": [6, 5], "x": 11, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/efreet/keyboard.json b/keyboards/efreet/keyboard.json
new file mode 100644
index 00000000000..7dac78cc397
--- /dev/null
+++ b/keyboards/efreet/keyboard.json
@@ -0,0 +1,148 @@
+{
+ "keyboard_name": "Efreet",
+ "manufacturer": "Soran",
+ "url": "",
+ "maintainer": "amberstarlight",
+ "usb": {
+ "vid": "0x534F",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["B3", "B4", "B5", "B6", "B7", "C7"],
+ "rows": ["B0", "D6", "D5", "D4", "D3", "D2", "D1", "C2"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "driver": "timer",
+ "pin": "D0",
+ "breathing": true
+ },
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "backlight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "community_layouts": ["ortho_4x12", "planck_mit"],
+ "layouts": {
+ "LAYOUT_planck_mit": {
+ "layout": [
+ {"matrix": [1, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [1, 2], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [1, 4], "x": 8, "y": 0},
+ {"matrix": [0, 4], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [3, 0], "x": 0, "y": 1},
+ {"matrix": [2, 0], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [3, 2], "x": 4, "y": 1},
+ {"matrix": [2, 2], "x": 5, "y": 1},
+ {"matrix": [3, 3], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [3, 4], "x": 8, "y": 1},
+ {"matrix": [2, 4], "x": 9, "y": 1},
+ {"matrix": [3, 5], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+
+ {"matrix": [5, 0], "x": 0, "y": 2},
+ {"matrix": [4, 0], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [4, 1], "x": 3, "y": 2},
+ {"matrix": [5, 2], "x": 4, "y": 2},
+ {"matrix": [4, 2], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 4], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+
+ {"matrix": [7, 0], "x": 0, "y": 3},
+ {"matrix": [6, 0], "x": 1, "y": 3},
+ {"matrix": [7, 1], "x": 2, "y": 3},
+ {"matrix": [6, 1], "x": 3, "y": 3},
+ {"matrix": [7, 2], "x": 4, "y": 3},
+ {"matrix": [6, 2], "x": 5, "y": 3, "w": 2},
+ {"matrix": [6, 3], "x": 7, "y": 3},
+ {"matrix": [7, 4], "x": 8, "y": 3},
+ {"matrix": [6, 4], "x": 9, "y": 3},
+ {"matrix": [7, 5], "x": 10, "y": 3},
+ {"matrix": [6, 5], "x": 11, "y": 3}
+ ]
+ },
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ {"matrix": [1, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [1, 2], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [1, 4], "x": 8, "y": 0},
+ {"matrix": [0, 4], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [3, 0], "x": 0, "y": 1},
+ {"matrix": [2, 0], "x": 1, "y": 1},
+ {"matrix": [3, 1], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [3, 2], "x": 4, "y": 1},
+ {"matrix": [2, 2], "x": 5, "y": 1},
+ {"matrix": [3, 3], "x": 6, "y": 1},
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [3, 4], "x": 8, "y": 1},
+ {"matrix": [2, 4], "x": 9, "y": 1},
+ {"matrix": [3, 5], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+
+ {"matrix": [5, 0], "x": 0, "y": 2},
+ {"matrix": [4, 0], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [4, 1], "x": 3, "y": 2},
+ {"matrix": [5, 2], "x": 4, "y": 2},
+ {"matrix": [4, 2], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 4], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+
+ {"matrix": [7, 0], "x": 0, "y": 3},
+ {"matrix": [6, 0], "x": 1, "y": 3},
+ {"matrix": [7, 1], "x": 2, "y": 3},
+ {"matrix": [6, 1], "x": 3, "y": 3},
+ {"matrix": [7, 2], "x": 4, "y": 3},
+ {"matrix": [6, 2], "x": 5, "y": 3},
+ {"matrix": [7, 3], "x": 6, "y": 3},
+ {"matrix": [6, 3], "x": 7, "y": 3},
+ {"matrix": [7, 4], "x": 8, "y": 3},
+ {"matrix": [6, 4], "x": 9, "y": 3},
+ {"matrix": [7, 5], "x": 10, "y": 3},
+ {"matrix": [6, 5], "x": 11, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/efreet/rules.mk b/keyboards/efreet/rules.mk
index f82a86f3e3a..09057bea54b 100644
--- a/keyboards/efreet/rules.mk
+++ b/keyboards/efreet/rules.mk
@@ -1,16 +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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/keyboard.json
similarity index 100%
rename from keyboards/elcantorhs/info.json
rename to keyboards/elcantorhs/keyboard.json
diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
deleted file mode 100644
index 1bc39ced986..00000000000
--- a/keyboards/elephant42/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
- "keyboard_name": "elephant42",
- "manufacturer": "illness072",
- "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/elephant42",
- "maintainer": "illness072",
- "usb": {
- "vid": "0x4649",
- "pid": "0x0721",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "driver": "ws2812",
- "sat_steps": 8,
- "val_steps": 8,
- "speed_steps": 8,
- "max_brightness": 170,
- "split_count": [27, 27]
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 54,
- "max_brightness": 170,
- "split_count": [27, 27],
- "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
- }
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
- "rows": ["D4", "C6", "D7", "E6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2",
- "transport": {
- "sync": {
- "matrix_state": true
- }
- }
- },
- "ws2812": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 1.6},
- {"matrix": [0, 1], "x": 1, "y": 1.1},
- {"matrix": [0, 2], "x": 2, "y": 0.3},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.6},
- {"matrix": [0, 5], "x": 5, "y": 0.8},
-
- {"matrix": [4, 5], "x": 10.5, "y": 0.8},
- {"matrix": [4, 4], "x": 11.5, "y": 0.6},
- {"matrix": [4, 3], "x": 12.5, "y": 0},
- {"matrix": [4, 2], "x": 13.5, "y": 0.3},
- {"matrix": [4, 1], "x": 14.5, "y": 1.1},
- {"matrix": [4, 0], "x": 15.5, "y": 1.6},
-
- {"matrix": [1, 0], "x": 0, "y": 2.6},
- {"matrix": [1, 1], "x": 1, "y": 2.1},
- {"matrix": [1, 2], "x": 2, "y": 1.3},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.6},
- {"matrix": [1, 5], "x": 5, "y": 1.8},
-
- {"matrix": [5, 5], "x": 10.5, "y": 1.8},
- {"matrix": [5, 4], "x": 11.5, "y": 1.6},
- {"matrix": [5, 3], "x": 12.5, "y": 1},
- {"matrix": [5, 2], "x": 13.5, "y": 1.3},
- {"matrix": [5, 1], "x": 14.5, "y": 2.1},
- {"matrix": [5, 0], "x": 15.5, "y": 2.6},
-
- {"matrix": [2, 1], "x": 1, "y": 3.1},
- {"matrix": [2, 2], "x": 2, "y": 2.3},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.6},
- {"matrix": [2, 5], "x": 5, "y": 2.8},
-
- {"matrix": [6, 5], "x": 10.5, "y": 2.8},
- {"matrix": [6, 4], "x": 11.5, "y": 2.6},
- {"matrix": [6, 3], "x": 12.5, "y": 2},
- {"matrix": [6, 2], "x": 13.5, "y": 2.3},
- {"matrix": [6, 1], "x": 14.5, "y": 3.1},
-
- {"matrix": [3, 2], "x": 3.5, "y": 4},
- {"matrix": [3, 3], "x": 4.5, "y": 4},
- {"matrix": [3, 4], "x": 5.5, "y": 4},
- {"matrix": [3, 5], "x": 6.5, "y": 4},
-
- {"matrix": [7, 5], "x": 9.25, "y": 4},
- {"matrix": [7, 4], "x": 10.25, "y": 4},
- {"matrix": [7, 3], "x": 11.25, "y": 4},
- {"matrix": [7, 2], "x": 12.25, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/elephant42/keyboard.json b/keyboards/elephant42/keyboard.json
new file mode 100644
index 00000000000..e71f1438130
--- /dev/null
+++ b/keyboards/elephant42/keyboard.json
@@ -0,0 +1,122 @@
+{
+ "keyboard_name": "elephant42",
+ "manufacturer": "illness072",
+ "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/elephant42",
+ "maintainer": "illness072",
+ "usb": {
+ "vid": "0x4649",
+ "pid": "0x0721",
+ "device_version": "0.0.1"
+ },
+ "rgb_matrix": {
+ "driver": "ws2812",
+ "sat_steps": 8,
+ "val_steps": 8,
+ "speed_steps": 8,
+ "max_brightness": 170,
+ "split_count": [27, 27]
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 54,
+ "max_brightness": 170,
+ "split_count": [27, 27],
+ "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
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "transport": {
+ "sync": {
+ "matrix_state": true
+ }
+ }
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "rgb_matrix": true,
+ "oled": true
+ },
+ "build": {
+ "lto": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 1.6},
+ {"matrix": [0, 1], "x": 1, "y": 1.1},
+ {"matrix": [0, 2], "x": 2, "y": 0.3},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.6},
+ {"matrix": [0, 5], "x": 5, "y": 0.8},
+
+ {"matrix": [4, 5], "x": 10.5, "y": 0.8},
+ {"matrix": [4, 4], "x": 11.5, "y": 0.6},
+ {"matrix": [4, 3], "x": 12.5, "y": 0},
+ {"matrix": [4, 2], "x": 13.5, "y": 0.3},
+ {"matrix": [4, 1], "x": 14.5, "y": 1.1},
+ {"matrix": [4, 0], "x": 15.5, "y": 1.6},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.6},
+ {"matrix": [1, 1], "x": 1, "y": 2.1},
+ {"matrix": [1, 2], "x": 2, "y": 1.3},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.6},
+ {"matrix": [1, 5], "x": 5, "y": 1.8},
+
+ {"matrix": [5, 5], "x": 10.5, "y": 1.8},
+ {"matrix": [5, 4], "x": 11.5, "y": 1.6},
+ {"matrix": [5, 3], "x": 12.5, "y": 1},
+ {"matrix": [5, 2], "x": 13.5, "y": 1.3},
+ {"matrix": [5, 1], "x": 14.5, "y": 2.1},
+ {"matrix": [5, 0], "x": 15.5, "y": 2.6},
+
+ {"matrix": [2, 1], "x": 1, "y": 3.1},
+ {"matrix": [2, 2], "x": 2, "y": 2.3},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.6},
+ {"matrix": [2, 5], "x": 5, "y": 2.8},
+
+ {"matrix": [6, 5], "x": 10.5, "y": 2.8},
+ {"matrix": [6, 4], "x": 11.5, "y": 2.6},
+ {"matrix": [6, 3], "x": 12.5, "y": 2},
+ {"matrix": [6, 2], "x": 13.5, "y": 2.3},
+ {"matrix": [6, 1], "x": 14.5, "y": 3.1},
+
+ {"matrix": [3, 2], "x": 3.5, "y": 4},
+ {"matrix": [3, 3], "x": 4.5, "y": 4},
+ {"matrix": [3, 4], "x": 5.5, "y": 4},
+ {"matrix": [3, 5], "x": 6.5, "y": 4},
+
+ {"matrix": [7, 5], "x": 9.25, "y": 4},
+ {"matrix": [7, 4], "x": 10.25, "y": 4},
+ {"matrix": [7, 3], "x": 11.25, "y": 4},
+ {"matrix": [7, 2], "x": 12.25, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/elephant42/rules.mk b/keyboards/elephant42/rules.mk
deleted file mode 100644
index db121c92e35..00000000000
--- a/keyboards/elephant42/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/emery65/info.json b/keyboards/emery65/info.json
deleted file mode 100644
index 74d06b52ad6..00000000000
--- a/keyboards/emery65/info.json
+++ /dev/null
@@ -1,337 +0,0 @@
-{
- "keyboard_name": "Emery65",
- "manufacturer": "Yiancar-Designs",
- "url": "https://yiancar-designs.com",
- "maintainer": "Yiancar-Designs",
- "usb": {
- "vid": "0x8968",
- "pid": "0x4536",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
- "rows": ["A2", "B9", "B8", "B5", "B4"]
- },
- "diode_direction": "COL2ROW",
- "indicators": {
- "caps_lock": "B6",
- "on_state": 0
- },
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
- },
- "community_layouts": [
- "65_ansi_blocker",
- "65_ansi_blocker_split_bs",
- "65_ansi_blocker_tsangan",
- "65_ansi_blocker_tsangan_split_bs"
- ],
- "layouts": {
- "LAYOUT_65_ansi_blocker": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Ctrl", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Ctrl", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/emery65/keyboard.json b/keyboards/emery65/keyboard.json
new file mode 100644
index 00000000000..c80bcf80425
--- /dev/null
+++ b/keyboards/emery65/keyboard.json
@@ -0,0 +1,343 @@
+{
+ "keyboard_name": "Emery65",
+ "manufacturer": "Yiancar-Designs",
+ "url": "https://yiancar-designs.com",
+ "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x4536",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14", "B15"],
+ "rows": ["A2", "B9", "B8", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "B6",
+ "on_state": 0
+ },
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
+ },
+ "community_layouts": [
+ "65_ansi_blocker",
+ "65_ansi_blocker_split_bs",
+ "65_ansi_blocker_tsangan",
+ "65_ansi_blocker_tsangan_split_bs"
+ ],
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Ctrl", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Ctrl", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/emery65/rules.mk b/keyboards/emery65/rules.mk
index 7c0709f41e6..0ab54aaaf71 100644
--- a/keyboards/emery65/rules.mk
+++ b/keyboards/emery65/rules.mk
@@ -1,15 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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
diff --git a/keyboards/era/linx3/n86/info.json b/keyboards/era/linx3/n86/keyboard.json
similarity index 100%
rename from keyboards/era/linx3/n86/info.json
rename to keyboards/era/linx3/n86/keyboard.json
diff --git a/keyboards/era/linx3/n86/rules.mk b/keyboards/era/linx3/n86/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/era/linx3/n86/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/era/linx3/n8x/info.json b/keyboards/era/linx3/n8x/keyboard.json
similarity index 100%
rename from keyboards/era/linx3/n8x/info.json
rename to keyboards/era/linx3/n8x/keyboard.json
diff --git a/keyboards/era/linx3/n8x/rules.mk b/keyboards/era/linx3/n8x/rules.mk
deleted file mode 100644
index 7ff128fa692..00000000000
--- a/keyboards/era/linx3/n8x/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/glow/info.json b/keyboards/ergodox_ez/glow/info.json
deleted file mode 100644
index dcbb1999ca9..00000000000
--- a/keyboards/ergodox_ez/glow/info.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "keyboard_name": "ErgoDox EZ Glow",
- "usb": {
- "pid": "0x4976"
- }
-}
diff --git a/keyboards/ergodox_ez/glow/keyboard.json b/keyboards/ergodox_ez/glow/keyboard.json
new file mode 100644
index 00000000000..43f0ee0b490
--- /dev/null
+++ b/keyboards/ergodox_ez/glow/keyboard.json
@@ -0,0 +1,13 @@
+{
+ "keyboard_name": "ErgoDox EZ Glow",
+ "usb": {
+ "pid": "0x4976"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ }
+}
diff --git a/keyboards/ergodox_ez/glow/rules.mk b/keyboards/ergodox_ez/glow/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/ergodox_ez/glow/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index 68f785f3cc0..187d9dd8e2e 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -3,20 +3,7 @@
# details), include the following define:
# OPT_DEFS += -DLEFT_LEDS
-# 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
CUSTOM_MATRIX = lite # Custom matrix file for the ErgoDox EZ
-NKRO_ENABLE = yes # Enable N-Key Rollover
-UNICODE_ENABLE = no # Unicode
-SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
-
-RGB_MATRIX_ENABLE = no # enable later
# project specific files
SRC += matrix.c
diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/info.json
deleted file mode 100644
index 181ac52e6ce..00000000000
--- a/keyboards/ergodox_ez/shine/info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "keyboard_name": "ErgoDox EZ Shine",
- "usb": {
- "pid": "0x4975"
- },
- "rgblight": {
- "driver": "custom"
- }
-}
diff --git a/keyboards/ergodox_ez/shine/keyboard.json b/keyboards/ergodox_ez/shine/keyboard.json
new file mode 100644
index 00000000000..bc0f218d7ec
--- /dev/null
+++ b/keyboards/ergodox_ez/shine/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "keyboard_name": "ErgoDox EZ Shine",
+ "usb": {
+ "pid": "0x4975"
+ },
+ "rgblight": {
+ "driver": "custom"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ }
+}
diff --git a/keyboards/ergodox_ez/shine/rules.mk b/keyboards/ergodox_ez/shine/rules.mk
index 4ab494d1aae..827f58bd6ae 100644
--- a/keyboards/ergodox_ez/shine/rules.mk
+++ b/keyboards/ergodox_ez/shine/rules.mk
@@ -1,3 +1,2 @@
-RGBLIGHT_ENABLE = yes
WS2812_DRIVER_REQUIRED = yes
SRC += rgblight_custom.c
diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/info.json
deleted file mode 100644
index 305adc9e125..00000000000
--- a/keyboards/ergodox_stm32/info.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
- "keyboard_name": "ErgoDox STM32",
- "manufacturer": "ErgoDox",
- "url": "github.com/codetector1374",
- "maintainer": "codetector1374",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x1308",
- "device_version": "1.0.1"
- },
-"layouts": {
- "LAYOUT_ergodox": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
- {"matrix": [1, 0], "x": 1.5, "y": 0.375},
- {"matrix": [2, 0], "x": 2.5, "y": 0.125},
- {"matrix": [3, 0], "x": 3.5, "y": 0},
- {"matrix": [4, 0], "x": 4.5, "y": 0.125},
- {"matrix": [5, 0], "x": 5.5, "y": 0.25},
- {"matrix": [6, 0], "x": 6.5, "y": 0.25},
-
- {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1.375},
- {"matrix": [2, 1], "x": 2.5, "y": 1.125},
- {"matrix": [3, 1], "x": 3.5, "y": 1},
- {"matrix": [4, 1], "x": 4.5, "y": 1.125},
- {"matrix": [5, 1], "x": 5.5, "y": 1.25},
- {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
-
- {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
- {"matrix": [1, 2], "x": 1.5, "y": 2.375},
- {"matrix": [2, 2], "x": 2.5, "y": 2.125},
- {"matrix": [3, 2], "x": 3.5, "y": 2},
- {"matrix": [4, 2], "x": 4.5, "y": 2.125},
- {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-
- {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
- {"matrix": [1, 3], "x": 1.5, "y": 3.375},
- {"matrix": [2, 3], "x": 2.5, "y": 3.125},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [4, 3], "x": 4.5, "y": 3.125},
- {"matrix": [5, 3], "x": 5.5, "y": 3.25},
- {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
- {"matrix": [0, 4], "x": 0.5, "y": 4.375},
- {"matrix": [1, 4], "x": 1.5, "y": 4.375},
- {"matrix": [2, 4], "x": 2.5, "y": 4.125},
- {"matrix": [3, 4], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
- {"matrix": [5, 5], "x": 6, "y": 5},
- {"matrix": [6, 5], "x": 7, "y": 5},
- {"matrix": [4, 5], "x": 7, "y": 6},
-
- {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
- {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
- {"matrix": [1, 5], "x": 7, "y": 7},
-
- {"matrix": [7, 0], "x": 9.5, "y": 0.25},
- {"matrix": [8, 0], "x": 10.5, "y": 0.25},
- {"matrix": [9, 0], "x": 11.5, "y": 0.125},
- {"matrix": [10, 0], "x": 12.5, "y": 0},
- {"matrix": [11, 0], "x": 13.5, "y": 0.125},
- {"matrix": [12, 0], "x": 14.5, "y": 0.375},
- {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
- {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
- {"matrix": [8, 1], "x": 10.5, "y": 1.25},
- {"matrix": [9, 1], "x": 11.5, "y": 1.125},
- {"matrix": [10, 1], "x": 12.5, "y": 1},
- {"matrix": [11, 1], "x": 13.5, "y": 1.125},
- {"matrix": [12, 1], "x": 14.5, "y": 1.375},
- {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
- {"matrix": [8, 2], "x": 10.5, "y": 2.25},
- {"matrix": [9, 2], "x": 11.5, "y": 2.125},
- {"matrix": [10, 2], "x": 12.5, "y": 2},
- {"matrix": [11, 2], "x": 13.5, "y": 2.125},
- {"matrix": [12, 2], "x": 14.5, "y": 2.375},
- {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-
- {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
- {"matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"matrix": [9, 3], "x": 11.5, "y": 3.125},
- {"matrix": [10, 3], "x": 12.5, "y": 3},
- {"matrix": [11, 3], "x": 13.5, "y": 3.125},
- {"matrix": [12, 3], "x": 14.5, "y": 3.375},
- {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
- {"matrix": [9, 4], "x": 11.5, "y": 4.125},
- {"matrix": [10, 4], "x": 12.5, "y": 4},
- {"matrix": [11, 4], "x": 13.5, "y": 4.125},
- {"matrix": [12, 4], "x": 14.5, "y": 4.375},
- {"matrix": [13, 4], "x": 15.5, "y": 4.375},
-
- {"matrix": [7, 5], "x": 9, "y": 5},
- {"matrix": [8, 5], "x": 10, "y": 5},
-
- {"matrix": [9, 5], "x": 9, "y": 6},
-
- {"matrix": [12, 5], "x": 9, "y": 7},
-
- {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
- {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
- ]
- },
- "LAYOUT_ergodox_pretty": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
- {"matrix": [1, 0], "x": 1.5, "y": 0.375},
- {"matrix": [2, 0], "x": 2.5, "y": 0.125},
- {"matrix": [3, 0], "x": 3.5, "y": 0},
- {"matrix": [4, 0], "x": 4.5, "y": 0.125},
- {"matrix": [5, 0], "x": 5.5, "y": 0.25},
- {"matrix": [6, 0], "x": 6.5, "y": 0.25},
-
- {"matrix": [7, 0], "x": 9.5, "y": 0.25},
- {"matrix": [8, 0], "x": 10.5, "y": 0.25},
- {"matrix": [9, 0], "x": 11.5, "y": 0.125},
- {"matrix": [10, 0], "x": 12.5, "y": 0},
- {"matrix": [11, 0], "x": 13.5, "y": 0.125},
- {"matrix": [12, 0], "x": 14.5, "y": 0.375},
- {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
-
- {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1.375},
- {"matrix": [2, 1], "x": 2.5, "y": 1.125},
- {"matrix": [3, 1], "x": 3.5, "y": 1},
- {"matrix": [4, 1], "x": 4.5, "y": 1.125},
- {"matrix": [5, 1], "x": 5.5, "y": 1.25},
- {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
-
- {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
- {"matrix": [8, 1], "x": 10.5, "y": 1.25},
- {"matrix": [9, 1], "x": 11.5, "y": 1.125},
- {"matrix": [10, 1], "x": 12.5, "y": 1},
- {"matrix": [11, 1], "x": 13.5, "y": 1.125},
- {"matrix": [12, 1], "x": 14.5, "y": 1.375},
- {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
-
- {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
- {"matrix": [1, 2], "x": 1.5, "y": 2.375},
- {"matrix": [2, 2], "x": 2.5, "y": 2.125},
- {"matrix": [3, 2], "x": 3.5, "y": 2},
- {"matrix": [4, 2], "x": 4.5, "y": 2.125},
- {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-
- {"matrix": [8, 2], "x": 10.5, "y": 2.25},
- {"matrix": [9, 2], "x": 11.5, "y": 2.125},
- {"matrix": [10, 2], "x": 12.5, "y": 2},
- {"matrix": [11, 2], "x": 13.5, "y": 2.125},
- {"matrix": [12, 2], "x": 14.5, "y": 2.375},
- {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
-
- {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
- {"matrix": [1, 3], "x": 1.5, "y": 3.375},
- {"matrix": [2, 3], "x": 2.5, "y": 3.125},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [4, 3], "x": 4.5, "y": 3.125},
- {"matrix": [5, 3], "x": 5.5, "y": 3.25},
- {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
-
- {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
- {"matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"matrix": [9, 3], "x": 11.5, "y": 3.125},
- {"matrix": [10, 3], "x": 12.5, "y": 3},
- {"matrix": [11, 3], "x": 13.5, "y": 3.125},
- {"matrix": [12, 3], "x": 14.5, "y": 3.375},
- {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
-
- {"matrix": [0, 4], "x": 0.5, "y": 4.375},
- {"matrix": [1, 4], "x": 1.5, "y": 4.375},
- {"matrix": [2, 4], "x": 2.5, "y": 4.125},
- {"matrix": [3, 4], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4.125},
-
- {"matrix": [9, 4], "x": 11.5, "y": 4.125},
- {"matrix": [10, 4], "x": 12.5, "y": 4},
- {"matrix": [11, 4], "x": 13.5, "y": 4.125},
- {"matrix": [12, 4], "x": 14.5, "y": 4.375},
- {"matrix": [13, 4], "x": 15.5, "y": 4.375},
-
- {"matrix": [5, 5], "x": 6, "y": 5},
- {"matrix": [6, 5], "x": 7, "y": 5},
-
- {"matrix": [7, 5], "x": 9, "y": 5},
- {"matrix": [8, 5], "x": 10, "y": 5},
-
- {"matrix": [4, 5], "x": 7, "y": 6},
-
- {"matrix": [9, 5], "x": 9, "y": 6},
-
- {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
- {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
-
- {"matrix": [1, 5], "x": 7, "y": 7},
-
- {"matrix": [12, 5], "x": 9, "y": 7},
-
- {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
- {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/ergodox_stm32/keyboard.json b/keyboards/ergodox_stm32/keyboard.json
new file mode 100644
index 00000000000..9315a3971f5
--- /dev/null
+++ b/keyboards/ergodox_stm32/keyboard.json
@@ -0,0 +1,213 @@
+{
+ "keyboard_name": "ErgoDox STM32",
+ "manufacturer": "ErgoDox",
+ "url": "github.com/codetector1374",
+ "maintainer": "codetector1374",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1308",
+ "device_version": "1.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "unicode": true
+ },
+ "processor": "STM32F103",
+ "bootloader": "custom",
+ "layouts": {
+ "LAYOUT_ergodox": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+ {"matrix": [3, 0], "x": 3.5, "y": 0},
+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [3, 2], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+ {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+ {"matrix": [3, 4], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+ {"matrix": [5, 5], "x": 6, "y": 5},
+ {"matrix": [6, 5], "x": 7, "y": 5},
+ {"matrix": [4, 5], "x": 7, "y": 6},
+
+ {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+ {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+ {"matrix": [1, 5], "x": 7, "y": 7},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+ {"matrix": [10, 0], "x": 12.5, "y": 0},
+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+ {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+ {"matrix": [10, 1], "x": 12.5, "y": 1},
+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+ {"matrix": [10, 2], "x": 12.5, "y": 2},
+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+ {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+ {"matrix": [10, 3], "x": 12.5, "y": 3},
+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+ {"matrix": [10, 4], "x": 12.5, "y": 4},
+ {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+ {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+ {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+ {"matrix": [7, 5], "x": 9, "y": 5},
+ {"matrix": [8, 5], "x": 10, "y": 5},
+
+ {"matrix": [9, 5], "x": 9, "y": 6},
+
+ {"matrix": [12, 5], "x": 9, "y": 7},
+
+ {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+ {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
+ ]
+ },
+ "LAYOUT_ergodox_pretty": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 0.375},
+ {"matrix": [2, 0], "x": 2.5, "y": 0.125},
+ {"matrix": [3, 0], "x": 3.5, "y": 0},
+ {"matrix": [4, 0], "x": 4.5, "y": 0.125},
+ {"matrix": [5, 0], "x": 5.5, "y": 0.25},
+ {"matrix": [6, 0], "x": 6.5, "y": 0.25},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 0.25},
+ {"matrix": [8, 0], "x": 10.5, "y": 0.25},
+ {"matrix": [9, 0], "x": 11.5, "y": 0.125},
+ {"matrix": [10, 0], "x": 12.5, "y": 0},
+ {"matrix": [11, 0], "x": 13.5, "y": 0.125},
+ {"matrix": [12, 0], "x": 14.5, "y": 0.375},
+ {"matrix": [13, 0], "x": 15.5, "y": 0.375, "w": 1.5},
+
+ {"matrix": [0, 1], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.375},
+ {"matrix": [2, 1], "x": 2.5, "y": 1.125},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1.125},
+ {"matrix": [5, 1], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 1], "x": 6.5, "y": 1.25, "h": 1.5},
+
+ {"matrix": [7, 1], "x": 9.5, "y": 1.25, "h": 1.5},
+ {"matrix": [8, 1], "x": 10.5, "y": 1.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 1.125},
+ {"matrix": [10, 1], "x": 12.5, "y": 1},
+ {"matrix": [11, 1], "x": 13.5, "y": 1.125},
+ {"matrix": [12, 1], "x": 14.5, "y": 1.375},
+ {"matrix": [13, 1], "x": 15.5, "y": 1.375, "w": 1.5},
+
+ {"matrix": [0, 2], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [3, 2], "x": 3.5, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.125},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+ {"matrix": [8, 2], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 2.125},
+ {"matrix": [10, 2], "x": 12.5, "y": 2},
+ {"matrix": [11, 2], "x": 13.5, "y": 2.125},
+ {"matrix": [12, 2], "x": 14.5, "y": 2.375},
+ {"matrix": [13, 2], "x": 15.5, "y": 2.375, "w": 1.5},
+
+ {"matrix": [0, 3], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 3.375},
+ {"matrix": [2, 3], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [4, 3], "x": 4.5, "y": 3.125},
+ {"matrix": [5, 3], "x": 5.5, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 2.75, "h": 1.5},
+
+ {"matrix": [7, 3], "x": 9.5, "y": 2.75, "h": 1.5},
+ {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 3.125},
+ {"matrix": [10, 3], "x": 12.5, "y": 3},
+ {"matrix": [11, 3], "x": 13.5, "y": 3.125},
+ {"matrix": [12, 3], "x": 14.5, "y": 3.375},
+ {"matrix": [13, 3], "x": 15.5, "y": 3.375, "w": 1.5},
+
+ {"matrix": [0, 4], "x": 0.5, "y": 4.375},
+ {"matrix": [1, 4], "x": 1.5, "y": 4.375},
+ {"matrix": [2, 4], "x": 2.5, "y": 4.125},
+ {"matrix": [3, 4], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+
+ {"matrix": [9, 4], "x": 11.5, "y": 4.125},
+ {"matrix": [10, 4], "x": 12.5, "y": 4},
+ {"matrix": [11, 4], "x": 13.5, "y": 4.125},
+ {"matrix": [12, 4], "x": 14.5, "y": 4.375},
+ {"matrix": [13, 4], "x": 15.5, "y": 4.375},
+
+ {"matrix": [5, 5], "x": 6, "y": 5},
+ {"matrix": [6, 5], "x": 7, "y": 5},
+
+ {"matrix": [7, 5], "x": 9, "y": 5},
+ {"matrix": [8, 5], "x": 10, "y": 5},
+
+ {"matrix": [4, 5], "x": 7, "y": 6},
+
+ {"matrix": [9, 5], "x": 9, "y": 6},
+
+ {"matrix": [3, 5], "x": 5, "y": 6, "h": 2},
+ {"matrix": [2, 5], "x": 6, "y": 6, "h": 2},
+
+ {"matrix": [1, 5], "x": 7, "y": 7},
+
+ {"matrix": [12, 5], "x": 9, "y": 7},
+
+ {"matrix": [11, 5], "x": 10, "y": 6, "h": 2},
+ {"matrix": [10, 5], "x": 11, "y": 6, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk
index 5481eef1a2e..a4e9df8c6a9 100644
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/ergodox_stm32/rules.mk
@@ -1,19 +1,8 @@
-# MCU name
-MCU = STM32F103
+# custom bootloader
MCU_LDSCRIPT = stm32f103_bootloader
BOARD = ST_NUCLEO64_F103RB
-# Bootloader selection
-BOOTLOADER = custom
-
-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
-CUSTOM_MATRIX = yes # Custom matrix file
-UNICODE_ENABLE = yes # Unicode
+CUSTOM_MATRIX = yes
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/ergoslab/rev1/keyboard.json b/keyboards/ergoslab/rev1/keyboard.json
index 51c522043b3..ef40c1d960d 100644
--- a/keyboards/ergoslab/rev1/keyboard.json
+++ b/keyboards/ergoslab/rev1/keyboard.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"rgblight": {
@@ -24,6 +25,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "rgblight": true
+ },
"layout_aliases": {
"LAYOUT_ergoslab": "LAYOUT"
},
diff --git a/keyboards/ergoslab/rules.mk b/keyboards/ergoslab/rules.mk
index 503f274a9f3..8eb40c77d5a 100644
--- a/keyboards/ergoslab/rules.mk
+++ b/keyboards/ergoslab/rules.mk
@@ -1,16 +1 @@
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = ergoslab/rev1
diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json
deleted file mode 100644
index 77aecec0ed1..00000000000
--- a/keyboards/ergotravel/rev1/info.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "keyboard_name": "ErgoTravel Keyboard",
- "manufacturer": "JPConstantineau.com",
- "url": "https://github.com/jpconstantineau/ErgoTravel",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x4A50",
- "pid": "0x4554",
- "device_version": "1.0.0"
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "bootloader": "caterina",
- "processor": "atmega32u4",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375},
- {"matrix": [0, 1], "x": 1, "y": 0.25},
- {"matrix": [0, 2], "x": 2, "y": 0.125},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.125},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
- {"matrix": [0, 6], "x": 6, "y": 0.5},
-
- {"matrix": [4, 6], "x": 9, "y": 0.5},
- {"matrix": [4, 5], "x": 10, "y": 0.25},
- {"matrix": [4, 4], "x": 11, "y": 0.125},
- {"matrix": [4, 3], "x": 12, "y": 0},
- {"matrix": [4, 2], "x": 13, "y": 0.125},
- {"matrix": [4, 1], "x": 14, "y": 0.25},
- {"matrix": [4, 0], "x": 15, "y": 0.375},
-
- {"matrix": [1, 0], "x": 0, "y": 1.375},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.125},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.125},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
-
- {"matrix": [5, 6], "x": 9, "y": 1.5},
- {"matrix": [5, 5], "x": 10, "y": 1.25},
- {"matrix": [5, 4], "x": 11, "y": 1.125},
- {"matrix": [5, 3], "x": 12, "y": 1},
- {"matrix": [5, 2], "x": 13, "y": 1.125},
- {"matrix": [5, 1], "x": 14, "y": 1.25},
- {"matrix": [5, 0], "x": 15, "y": 1.375},
-
- {"matrix": [2, 0], "x": 0, "y": 2.375},
- {"matrix": [2, 1], "x": 1, "y": 2.25},
- {"matrix": [2, 2], "x": 2, "y": 2.125},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.125},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 3},
-
- {"matrix": [6, 6], "x": 8.5, "y": 3},
- {"matrix": [6, 5], "x": 10, "y": 2.25},
- {"matrix": [6, 4], "x": 11, "y": 2.125},
- {"matrix": [6, 3], "x": 12, "y": 2},
- {"matrix": [6, 2], "x": 13, "y": 2.125},
- {"matrix": [6, 1], "x": 14, "y": 2.25},
- {"matrix": [6, 0], "x": 15, "y": 2.375},
-
- {"matrix": [3, 0], "x": 0, "y": 3.375},
- {"matrix": [3, 1], "x": 1, "y": 3.25},
- {"matrix": [3, 2], "x": 2, "y": 3.125},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 4},
- {"matrix": [3, 5], "x": 6.5, "y": 4},
-
- {"matrix": [7, 5], "x": 8.5, "y": 4},
- {"matrix": [7, 4], "x": 9.5, "y": 4},
- {"matrix": [7, 3], "x": 12, "y": 3},
- {"matrix": [7, 2], "x": 13, "y": 3.125},
- {"matrix": [7, 1], "x": 14, "y": 3.25},
- {"matrix": [7, 0], "x": 15, "y": 3.375}
- ]
- }
- }
-}
diff --git a/keyboards/ergotravel/rev1/keyboard.json b/keyboards/ergotravel/rev1/keyboard.json
new file mode 100644
index 00000000000..14c645d2f0c
--- /dev/null
+++ b/keyboards/ergotravel/rev1/keyboard.json
@@ -0,0 +1,102 @@
+{
+ "keyboard_name": "ErgoTravel Keyboard",
+ "manufacturer": "JPConstantineau.com",
+ "url": "https://github.com/jpconstantineau/ErgoTravel",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4A50",
+ "pid": "0x4554",
+ "device_version": "1.0.0"
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "bootloader": "caterina",
+ "processor": "atmega32u4",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "rgblight": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+ {"matrix": [4, 6], "x": 9, "y": 0.5},
+ {"matrix": [4, 5], "x": 10, "y": 0.25},
+ {"matrix": [4, 4], "x": 11, "y": 0.125},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0.125},
+ {"matrix": [4, 1], "x": 14, "y": 0.25},
+ {"matrix": [4, 0], "x": 15, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+ {"matrix": [5, 6], "x": 9, "y": 1.5},
+ {"matrix": [5, 5], "x": 10, "y": 1.25},
+ {"matrix": [5, 4], "x": 11, "y": 1.125},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1.125},
+ {"matrix": [5, 1], "x": 14, "y": 1.25},
+ {"matrix": [5, 0], "x": 15, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 3},
+
+ {"matrix": [6, 6], "x": 8.5, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 2.25},
+ {"matrix": [6, 4], "x": 11, "y": 2.125},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2.125},
+ {"matrix": [6, 1], "x": 14, "y": 2.25},
+ {"matrix": [6, 0], "x": 15, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 4},
+ {"matrix": [3, 5], "x": 6.5, "y": 4},
+
+ {"matrix": [7, 5], "x": 8.5, "y": 4},
+ {"matrix": [7, 4], "x": 9.5, "y": 4},
+ {"matrix": [7, 3], "x": 12, "y": 3},
+ {"matrix": [7, 2], "x": 13, "y": 3.125},
+ {"matrix": [7, 1], "x": 14, "y": 3.25},
+ {"matrix": [7, 0], "x": 15, "y": 3.375}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ergotravel/rev1/rules.mk b/keyboards/ergotravel/rev1/rules.mk
deleted file mode 100644
index 7b30c0beff2..00000000000
--- a/keyboards/ergotravel/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/ergotravel/rules.mk b/keyboards/ergotravel/rules.mk
index aab244a2179..3f30277bb56 100644
--- a/keyboards/ergotravel/rules.mk
+++ b/keyboards/ergotravel/rules.mk
@@ -1,16 +1 @@
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = ergotravel/rev1
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
deleted file mode 100644
index 055e8afe380..00000000000
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Eric Lau
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json
deleted file mode 100644
index 36a39c1abe2..00000000000
--- a/keyboards/ericrlau/numdiscipline/rev1/info.json
+++ /dev/null
@@ -1,401 +0,0 @@
-{
- "keyboard_name": "NumDiscipline",
- "manufacturer": "ELau",
- "url": "https://github.com/ericrlau/NumDiscipline",
- "maintainer": "ericrlau",
- "usb": {
- "vid": "0x454C",
- "pid": "0x0001",
- "device_version": "0.0.1",
- "max_power": 100
- },
- "matrix_pins": {
- "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7", "A5", "A6", "A7"],
- "rows": ["B2", "A1", "B1", "A0", "B0"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32a",
- "bootloader": "usbasploader",
- "layouts": {
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [2, 14], "x": 15.5, "y": 2},
- {"matrix": [2, 15], "x": 16.5, "y": 2},
- {"matrix": [2, 16], "x": 17.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
- {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
- {"matrix": [3, 14], "x": 15.5, "y": 3},
- {"matrix": [3, 15], "x": 16.5, "y": 3},
- {"matrix": [3, 16], "x": 17.5, "y": 3},
- {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
-
- {"matrix": [4, 12], "x": 13.25, "y": 4.25},
- {"matrix": [4, 13], "x": 14.25, "y": 4.25},
- {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4}
- ]
- },
- "LAYOUT_std_2_right_mods": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [2, 14], "x": 15.5, "y": 2},
- {"matrix": [2, 15], "x": 16.5, "y": 2},
- {"matrix": [2, 16], "x": 17.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
- {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
- {"matrix": [3, 14], "x": 15.5, "y": 3},
- {"matrix": [3, 15], "x": 16.5, "y": 3},
- {"matrix": [3, 16], "x": 17.5, "y": 3},
- {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-
- {"matrix": [4, 12], "x": 13.25, "y": 4.25},
- {"matrix": [4, 13], "x": 14.25, "y": 4.25},
- {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4}
- ]
- },
- "LAYOUT_wkl_2_right_mods": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [2, 14], "x": 15.5, "y": 2},
- {"matrix": [2, 15], "x": 16.5, "y": 2},
- {"matrix": [2, 16], "x": 17.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
- {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
- {"matrix": [3, 14], "x": 15.5, "y": 3},
- {"matrix": [3, 15], "x": 16.5, "y": 3},
- {"matrix": [3, 16], "x": 17.5, "y": 3},
- {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
-
- {"matrix": [4, 12], "x": 13.25, "y": 4.25},
- {"matrix": [4, 13], "x": 14.25, "y": 4.25},
- {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4}
- ]
- },
- "LAYOUT_wkl_3_right_mods": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [2, 14], "x": 15.5, "y": 2},
- {"matrix": [2, 15], "x": 16.5, "y": 2},
- {"matrix": [2, 16], "x": 17.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-
- {"matrix": [3, 13], "x": 14.25, "y": 3.25},
-
- {"matrix": [3, 14], "x": 15.5, "y": 3},
- {"matrix": [3, 15], "x": 16.5, "y": 3},
- {"matrix": [3, 16], "x": 17.5, "y": 3},
- {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
-
- {"matrix": [4, 12], "x": 13.25, "y": 4.25},
- {"matrix": [4, 13], "x": 14.25, "y": 4.25},
- {"matrix": [4, 14], "x": 15.25, "y": 4.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/ericrlau/numdiscipline/rev1/keyboard.json b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json
new file mode 100644
index 00000000000..5e9f3937324
--- /dev/null
+++ b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json
@@ -0,0 +1,412 @@
+{
+ "keyboard_name": "NumDiscipline",
+ "manufacturer": "ELau",
+ "url": "https://github.com/ericrlau/NumDiscipline",
+ "maintainer": "ericrlau",
+ "usb": {
+ "vid": "0x454C",
+ "pid": "0x0001",
+ "device_version": "0.0.1",
+ "max_power": 100
+ },
+ "matrix_pins": {
+ "cols": ["A2", "B3", "A3", "B4", "A4", "D5", "D6", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "D7", "A5", "A6", "A7"],
+ "rows": ["B2", "A1", "B1", "A0", "B0"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "y": 2},
+ {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+ {"matrix": [3, 15], "x": 16.5, "y": 3},
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+ {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+
+ {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4}
+ ]
+ },
+ "LAYOUT_std_2_right_mods": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "y": 2},
+ {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+ {"matrix": [3, 15], "x": 16.5, "y": 3},
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+ {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4}
+ ]
+ },
+ "LAYOUT_wkl_2_right_mods": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "y": 2},
+ {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+ {"matrix": [3, 15], "x": 16.5, "y": 3},
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+ {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4}
+ ]
+ },
+ "LAYOUT_wkl_3_right_mods": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "y": 2},
+ {"matrix": [2, 16], "x": 17.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 14.25, "y": 3.25},
+
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+ {"matrix": [3, 15], "x": 16.5, "y": 3},
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+ {"matrix": [3, 17], "x": 18.5, "y": 3, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+
+ {"matrix": [4, 12], "x": 13.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 14.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ericrlau/numdiscipline/rev1/rules.mk b/keyboards/ericrlau/numdiscipline/rev1/rules.mk
index 18550f0a64d..c2ee0bc86f9 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/rules.mk
+++ b/keyboards/ericrlau/numdiscipline/rev1/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 16000000
-
-# 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
diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
deleted file mode 100644
index 8c5720d0c48..00000000000
--- a/keyboards/evyd13/atom47/rev2/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
- "keyboard_name": "Atom47 rev2",
- "manufacturer": "Evyd13",
- "url": "",
- "maintainer": "evyd13",
- "usb": {
- "vid": "0x4705",
- "pid": "0x8E66",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D7", "D5", "F0", "F1", "F4", "F6", "F7", "D4", "C7", "C6", "D6", "B5", "B4"],
- "rows": ["B1", "B2", "B3", "B7"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B6",
- "levels": 4,
- "breathing": true
- },
- "rgblight": {
- "led_count": 1
- },
- "ws2812": {
- "pin": "D0"
- },
- "qmk_lufa_bootloader": {
- "esc_input": "B7",
- "esc_output": "D7",
- "led": "B6"
- },
- "indicators": {
- "caps_lock": "F5"
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_split_space"
- },
- "layouts": {
- "LAYOUT_split_space": {
- "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": [0, 12], "x": 12, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
- {"matrix": [1, 6], "x": 6.25, "y": 1},
- {"matrix": [1, 7], "x": 7.25, "y": 1},
- {"matrix": [1, 8], "x": 8.25, "y": 1},
- {"matrix": [1, 9], "x": 9.25, "y": 1},
- {"matrix": [1, 10], "x": 10.25, "y": 1},
- {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
- {"matrix": [2, 12], "x": 12, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.75},
- {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/evyd13/atom47/rev2/keyboard.json b/keyboards/evyd13/atom47/rev2/keyboard.json
new file mode 100644
index 00000000000..62927b70a36
--- /dev/null
+++ b/keyboards/evyd13/atom47/rev2/keyboard.json
@@ -0,0 +1,102 @@
+{
+ "keyboard_name": "Atom47 rev2",
+ "manufacturer": "Evyd13",
+ "url": "",
+ "maintainer": "evyd13",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0x8E66",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["D7", "D5", "F0", "F1", "F4", "F6", "F7", "D4", "C7", "C6", "D6", "B5", "B4"],
+ "rows": ["B1", "B2", "B3", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B6",
+ "levels": 4,
+ "breathing": true
+ },
+ "rgblight": {
+ "led_count": 1
+ },
+ "ws2812": {
+ "pin": "D0"
+ },
+ "qmk_lufa_bootloader": {
+ "esc_input": "B7",
+ "esc_output": "D7",
+ "led": "B6"
+ },
+ "indicators": {
+ "caps_lock": "F5"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "backlight": true
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_split_space"
+ },
+ "layouts": {
+ "LAYOUT_split_space": {
+ "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": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/evyd13/atom47/rev2/rules.mk b/keyboards/evyd13/atom47/rev2/rules.mk
deleted file mode 100644
index 104711e4206..00000000000
--- a/keyboards/evyd13/atom47/rev2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Build Options
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
deleted file mode 100644
index fc4046d3fc3..00000000000
--- a/keyboards/evyd13/atom47/rev3/info.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
- "keyboard_name": "Atom47 rev3",
- "manufacturer": "Evyd13",
- "url": "",
- "maintainer": "evyd13",
- "usb": {
- "vid": "0x4705",
- "pid": "0x0E6D",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B7", "F0", "F1", "F4", "F6", "D4", "D6", "D7", "B4", "B5", "C6", "C7", "F7"],
- "rows": ["B3", "B2", "B1", "B0"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B6",
- "levels": 5,
- "breathing": true
- },
- "rgblight": {
- "led_count": 6,
- "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": {
- "pin": "F5"
- },
- "qmk_lufa_bootloader": {
- "esc_input": "B0",
- "esc_output": "B7",
- "led": "E6"
- },
- "indicators": {
- "caps_lock": "E6",
- "on_state": 0
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_split_space"
- },
- "layouts": {
- "LAYOUT_split_space": {
- "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": [0, 12], "x": 12, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
- {"matrix": [1, 6], "x": 6.25, "y": 1},
- {"matrix": [1, 7], "x": 7.25, "y": 1},
- {"matrix": [1, 8], "x": 8.25, "y": 1},
- {"matrix": [1, 9], "x": 9.25, "y": 1},
- {"matrix": [1, 10], "x": 10.25, "y": 1},
- {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 1.75, "y": 2},
- {"matrix": [2, 3], "x": 2.75, "y": 2},
- {"matrix": [2, 4], "x": 3.75, "y": 2},
- {"matrix": [2, 5], "x": 4.75, "y": 2},
- {"matrix": [2, 6], "x": 5.75, "y": 2},
- {"matrix": [2, 7], "x": 6.75, "y": 2},
- {"matrix": [2, 8], "x": 7.75, "y": 2},
- {"matrix": [2, 9], "x": 8.75, "y": 2},
- {"matrix": [2, 10], "x": 9.75, "y": 2},
- {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
- {"matrix": [2, 12], "x": 12, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
- {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
- {"matrix": [3, 9], "x": 8.75, "y": 3},
- {"matrix": [3, 10], "x": 9.75, "y": 3},
- {"matrix": [3, 11], "x": 10.75, "y": 3},
- {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
- ]
- },
- "LAYOUT_full_space": {
- "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": [0, 12], "x": 12, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
- {"matrix": [1, 6], "x": 6.25, "y": 1},
- {"matrix": [1, 7], "x": 7.25, "y": 1},
- {"matrix": [1, 8], "x": 8.25, "y": 1},
- {"matrix": [1, 9], "x": 9.25, "y": 1},
- {"matrix": [1, 10], "x": 10.25, "y": 1},
- {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 1.75, "y": 2},
- {"matrix": [2, 3], "x": 2.75, "y": 2},
- {"matrix": [2, 4], "x": 3.75, "y": 2},
- {"matrix": [2, 5], "x": 4.75, "y": 2},
- {"matrix": [2, 6], "x": 5.75, "y": 2},
- {"matrix": [2, 7], "x": 6.75, "y": 2},
- {"matrix": [2, 8], "x": 7.75, "y": 2},
- {"matrix": [2, 9], "x": 8.75, "y": 2},
- {"matrix": [2, 10], "x": 9.75, "y": 2},
- {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
- {"matrix": [2, 12], "x": 12, "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, 7], "x": 3, "y": 3, "w": 6},
- {"matrix": [3, 9], "x": 9, "y": 3},
- {"matrix": [3, 10], "x": 10, "y": 3},
- {"matrix": [3, 11], "x": 11, "y": 3},
- {"matrix": [3, 12], "x": 12, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/evyd13/atom47/rev3/keyboard.json b/keyboards/evyd13/atom47/rev3/keyboard.json
new file mode 100644
index 00000000000..009c3ef5345
--- /dev/null
+++ b/keyboards/evyd13/atom47/rev3/keyboard.json
@@ -0,0 +1,167 @@
+{
+ "keyboard_name": "Atom47 rev3",
+ "manufacturer": "Evyd13",
+ "url": "",
+ "maintainer": "evyd13",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0x0E6D",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["B7", "F0", "F1", "F4", "F6", "D4", "D6", "D7", "B4", "B5", "C6", "C7", "F7"],
+ "rows": ["B3", "B2", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B6",
+ "levels": 5,
+ "breathing": true
+ },
+ "rgblight": {
+ "led_count": 6,
+ "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": {
+ "pin": "F5"
+ },
+ "qmk_lufa_bootloader": {
+ "esc_input": "B0",
+ "esc_output": "B7",
+ "led": "E6"
+ },
+ "indicators": {
+ "caps_lock": "E6",
+ "on_state": 0
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "backlight": true
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_split_space"
+ },
+ "layouts": {
+ "LAYOUT_split_space": {
+ "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": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 8.75, "y": 3},
+ {"matrix": [3, 10], "x": 9.75, "y": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 3},
+ {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_space": {
+ "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": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 12], "x": 12, "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, 7], "x": 3, "y": 3, "w": 6},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/evyd13/atom47/rev3/rules.mk b/keyboards/evyd13/atom47/rev3/rules.mk
deleted file mode 100644
index 54a2685bf63..00000000000
--- a/keyboards/evyd13/atom47/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BACKLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json
deleted file mode 100644
index b2b4bf9ef23..00000000000
--- a/keyboards/evyd13/atom47/rev4/info.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
- "keyboard_name": "Atom47 rev4",
- "manufacturer": "Evyd13",
- "url": "",
- "maintainer": "evyd13",
- "usb": {
- "vid": "0x4705",
- "pid": "0x8446",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["C4", "C7", "B7", "B6", "B5", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2"],
- "rows": ["D0", "C2", "C5", "C6"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B3", "pin_b": "B4"}
- ]
- },
- "qmk_lufa_bootloader": {
- "esc_input": "C6",
- "esc_output": "C4",
- "led": "D1"
- },
- "indicators": {
- "caps_lock": "D1",
- "on_state": 0
- },
- "processor": "atmega32u2",
- "bootloader": "qmk-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_split_space"
- },
- "layouts": {
- "LAYOUT_split_space": {
- "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": [0, 12], "x": 12, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
- {"matrix": [1, 6], "x": 6.25, "y": 1},
- {"matrix": [1, 7], "x": 7.25, "y": 1},
- {"matrix": [1, 8], "x": 8.25, "y": 1},
- {"matrix": [1, 9], "x": 9.25, "y": 1},
- {"matrix": [1, 10], "x": 10.25, "y": 1},
- {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 1.75, "y": 2},
- {"matrix": [2, 3], "x": 2.75, "y": 2},
- {"matrix": [2, 4], "x": 3.75, "y": 2},
- {"matrix": [2, 5], "x": 4.75, "y": 2},
- {"matrix": [2, 6], "x": 5.75, "y": 2},
- {"matrix": [2, 7], "x": 6.75, "y": 2},
- {"matrix": [2, 8], "x": 7.75, "y": 2},
- {"matrix": [2, 9], "x": 8.75, "y": 2},
- {"matrix": [2, 10], "x": 9.75, "y": 2},
- {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
- {"matrix": [2, 12], "x": 12, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
- {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
- {"matrix": [3, 9], "x": 8.75, "y": 3},
- {"matrix": [3, 10], "x": 9.75, "y": 3},
- {"matrix": [3, 11], "x": 10.75, "y": 3},
- {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
- ]
- },
- "LAYOUT_full_space": {
- "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": [0, 12], "x": 12, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
- {"matrix": [1, 6], "x": 6.25, "y": 1},
- {"matrix": [1, 7], "x": 7.25, "y": 1},
- {"matrix": [1, 8], "x": 8.25, "y": 1},
- {"matrix": [1, 9], "x": 9.25, "y": 1},
- {"matrix": [1, 10], "x": 10.25, "y": 1},
- {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 1.75, "y": 2},
- {"matrix": [2, 3], "x": 2.75, "y": 2},
- {"matrix": [2, 4], "x": 3.75, "y": 2},
- {"matrix": [2, 5], "x": 4.75, "y": 2},
- {"matrix": [2, 6], "x": 5.75, "y": 2},
- {"matrix": [2, 7], "x": 6.75, "y": 2},
- {"matrix": [2, 8], "x": 7.75, "y": 2},
- {"matrix": [2, 9], "x": 8.75, "y": 2},
- {"matrix": [2, 10], "x": 9.75, "y": 2},
- {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
- {"matrix": [2, 12], "x": 12, "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, 7], "x": 3, "y": 3, "w": 6},
- {"matrix": [3, 9], "x": 9, "y": 3},
- {"matrix": [3, 10], "x": 10, "y": 3},
- {"matrix": [3, 11], "x": 11, "y": 3},
- {"matrix": [3, 12], "x": 12, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/evyd13/atom47/rev4/keyboard.json b/keyboards/evyd13/atom47/rev4/keyboard.json
new file mode 100644
index 00000000000..cea416e1a68
--- /dev/null
+++ b/keyboards/evyd13/atom47/rev4/keyboard.json
@@ -0,0 +1,149 @@
+{
+ "keyboard_name": "Atom47 rev4",
+ "manufacturer": "Evyd13",
+ "url": "",
+ "maintainer": "evyd13",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0x8446",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["C4", "C7", "B7", "B6", "B5", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2"],
+ "rows": ["D0", "C2", "C5", "C6"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B3", "pin_b": "B4"}
+ ]
+ },
+ "qmk_lufa_bootloader": {
+ "esc_input": "C6",
+ "esc_output": "C4",
+ "led": "D1"
+ },
+ "indicators": {
+ "caps_lock": "D1",
+ "on_state": 0
+ },
+ "processor": "atmega32u2",
+ "bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "encoder": true
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_split_space"
+ },
+ "layouts": {
+ "LAYOUT_split_space": {
+ "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": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 8.75, "y": 3},
+ {"matrix": [3, 10], "x": 9.75, "y": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 3},
+ {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_space": {
+ "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": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 12], "x": 12, "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, 7], "x": 3, "y": 3, "w": 6},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/evyd13/atom47/rev4/rules.mk b/keyboards/evyd13/atom47/rev4/rules.mk
deleted file mode 100644
index 1eb7c8bd08b..00000000000
--- a/keyboards/evyd13/atom47/rev4/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-ENCODER_ENABLE = yes
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json
deleted file mode 100644
index e82a7797dee..00000000000
--- a/keyboards/evyd13/atom47/rev5/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
- "keyboard_name": "Atom47 rev5",
- "manufacturer": "Evyd13",
- "url": "",
- "maintainer": "evyd13",
- "usb": {
- "vid": "0x4705",
- "pid": "0x92EA",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true
- },
- "driver": "is31fl3733"
- },
- "matrix_pins": {
- "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D7", "B4", "B5", "B6", "C6", "C7"],
- "rows": ["B1", "B2", "B3", "D4"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_split_space"
- },
- "layouts": {
- "LAYOUT_split_space": {
- "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": [0, 12], "x": 12, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
- {"matrix": [1, 6], "x": 6.25, "y": 1},
- {"matrix": [1, 7], "x": 7.25, "y": 1},
- {"matrix": [1, 8], "x": 8.25, "y": 1},
- {"matrix": [1, 9], "x": 9.25, "y": 1},
- {"matrix": [1, 10], "x": 10.25, "y": 1},
- {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 1.75, "y": 2},
- {"matrix": [2, 3], "x": 2.75, "y": 2},
- {"matrix": [2, 4], "x": 3.75, "y": 2},
- {"matrix": [2, 5], "x": 4.75, "y": 2},
- {"matrix": [2, 6], "x": 5.75, "y": 2},
- {"matrix": [2, 7], "x": 6.75, "y": 2},
- {"matrix": [2, 8], "x": 7.75, "y": 2},
- {"matrix": [2, 9], "x": 8.75, "y": 2},
- {"matrix": [2, 10], "x": 9.75, "y": 2},
- {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
- {"matrix": [2, 12], "x": 12, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
- {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
- {"matrix": [3, 9], "x": 8.75, "y": 3},
- {"matrix": [3, 10], "x": 9.75, "y": 3},
- {"matrix": [3, 11], "x": 10.75, "y": 3},
- {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/evyd13/atom47/rev5/keyboard.json b/keyboards/evyd13/atom47/rev5/keyboard.json
new file mode 100644
index 00000000000..c002dcb18c0
--- /dev/null
+++ b/keyboards/evyd13/atom47/rev5/keyboard.json
@@ -0,0 +1,117 @@
+{
+ "keyboard_name": "Atom47 rev5",
+ "manufacturer": "Evyd13",
+ "url": "",
+ "maintainer": "evyd13",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0x92EA",
+ "device_version": "0.0.1"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true
+ },
+ "driver": "is31fl3733"
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "E6", "D7", "B4", "B5", "B6", "C6", "C7"],
+ "rows": ["B1", "B2", "B3", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_split_space"
+ },
+ "layouts": {
+ "LAYOUT_split_space": {
+ "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": [0, 12], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 8.75, "y": 3},
+ {"matrix": [3, 10], "x": 9.75, "y": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 3},
+ {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/evyd13/atom47/rev5/rules.mk b/keyboards/evyd13/atom47/rev5/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/evyd13/atom47/rev5/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/evyd13/atom47/rules.mk b/keyboards/evyd13/atom47/rules.mk
index ab8264de7c2..9d5b7530777 100644
--- a/keyboards/evyd13/atom47/rules.mk
+++ b/keyboards/evyd13/atom47/rules.mk
@@ -1,14 +1 @@
-# 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
-
DEFAULT_FOLDER = evyd13/atom47/rev4
diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h
deleted file mode 100644
index 230ff5e311e..00000000000
--- a/keyboards/evyd13/eon40/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json
deleted file mode 100644
index ce989e1d2a5..00000000000
--- a/keyboards/evyd13/eon40/info.json
+++ /dev/null
@@ -1,194 +0,0 @@
-{
- "keyboard_name": "Eon40",
- "manufacturer": "Evyd13",
- "url": "https://maartenwut.com/product/eon40/",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x4705",
- "pid": "0x0140",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F0", "F1", "F4", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
- "rows": ["B7", "D5", "F5", "F6"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "E6", "pin_b": "F7"},
- {"pin_a": "B0", "pin_b": "D0"},
- {"pin_a": "D1", "pin_b": "D2"}
- ]
- },
- "qmk_lufa_bootloader": {
- "esc_input": "B7",
- "esc_output": "F0"
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "community_layouts": ["ortho_4x12", "planck_mit"],
- "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_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_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, 7], "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/evyd13/eon40/keyboard.json b/keyboards/evyd13/eon40/keyboard.json
new file mode 100644
index 00000000000..e957b109ff2
--- /dev/null
+++ b/keyboards/evyd13/eon40/keyboard.json
@@ -0,0 +1,208 @@
+{
+ "keyboard_name": "Eon40",
+ "manufacturer": "Evyd13",
+ "url": "https://maartenwut.com/product/eon40/",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0x0140",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+ "rows": ["B7", "D5", "F5", "F6"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "E6", "pin_b": "F7"},
+ {"pin_a": "B0", "pin_b": "D0"},
+ {"pin_a": "D1", "pin_b": "D2"}
+ ]
+ },
+ "qmk_lufa_bootloader": {
+ "esc_input": "B7",
+ "esc_output": "F0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "encoder": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "community_layouts": ["ortho_4x12", "planck_mit"],
+ "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_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_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, 7], "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/evyd13/eon40/rules.mk b/keyboards/evyd13/eon40/rules.mk
index ece680a57a3..16051206467 100644
--- a/keyboards/evyd13/eon40/rules.mk
+++ b/keyboards/evyd13/eon40/rules.mk
@@ -1,17 +1,3 @@
-# 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 = 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
-ENCODER_ENABLE = yes
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
deleted file mode 100644
index f64827d05f1..00000000000
--- a/keyboards/evyd13/nt660/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Evy Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json
deleted file mode 100644
index c222aba7005..00000000000
--- a/keyboards/evyd13/nt660/info.json
+++ /dev/null
@@ -1,260 +0,0 @@
-{
- "keyboard_name": "nt660",
- "manufacturer": "Evyd13",
- "url": "",
- "maintainer": "evyd13",
- "usb": {
- "vid": "0x4705",
- "pid": "0x1F02",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "B0", "B1", "B2", "B3", "F0", "F1", "F4", "F5", "D4"],
- "rows": ["B7", "E6", "F6", "F7", "C7"]
- },
- "diode_direction": "COL2ROW",
- "qmk_lufa_bootloader": {
- "esc_input": "B7",
- "esc_output": "D6",
- "led": "D0"
- },
- "indicators": {
- "caps_lock": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "community_layouts": ["66_ansi", "66_iso"],
- "layouts": {
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
- {"matrix": [3, 13], "x": 14.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13.5, "y": 4},
- {"matrix": [4, 13], "x": 14.5, "y": 4},
- {"matrix": [4, 14], "x": 15.5, "y": 4}
- ]
- },
- "LAYOUT_66_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
- {"matrix": [3, 13], "x": 14.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13.5, "y": 4},
- {"matrix": [4, 13], "x": 14.5, "y": 4},
- {"matrix": [4, 14], "x": 15.5, "y": 4}
- ]
- },
- "LAYOUT_66_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"matrix": [1, 14], "x": 15.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
- {"matrix": [3, 13], "x": 14.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13.5, "y": 4},
- {"matrix": [4, 13], "x": 14.5, "y": 4},
- {"matrix": [4, 14], "x": 15.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/evyd13/nt660/keyboard.json b/keyboards/evyd13/nt660/keyboard.json
new file mode 100644
index 00000000000..142e9f2920d
--- /dev/null
+++ b/keyboards/evyd13/nt660/keyboard.json
@@ -0,0 +1,271 @@
+{
+ "keyboard_name": "nt660",
+ "manufacturer": "Evyd13",
+ "url": "",
+ "maintainer": "evyd13",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0x1F02",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "B0", "B1", "B2", "B3", "F0", "F1", "F4", "F5", "D4"],
+ "rows": ["B7", "E6", "F6", "F7", "C7"]
+ },
+ "diode_direction": "COL2ROW",
+ "qmk_lufa_bootloader": {
+ "esc_input": "B7",
+ "esc_output": "D6",
+ "led": "D0"
+ },
+ "indicators": {
+ "caps_lock": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "community_layouts": ["66_ansi", "66_iso"],
+ "layouts": {
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13.5, "y": 4},
+ {"matrix": [4, 13], "x": 14.5, "y": 4},
+ {"matrix": [4, 14], "x": 15.5, "y": 4}
+ ]
+ },
+ "LAYOUT_66_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13.5, "y": 4},
+ {"matrix": [4, 13], "x": 14.5, "y": 4},
+ {"matrix": [4, 14], "x": 15.5, "y": 4}
+ ]
+ },
+ "LAYOUT_66_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [1, 14], "x": 15.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 13], "x": 14.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13.5, "y": 4},
+ {"matrix": [4, 13], "x": 14.5, "y": 4},
+ {"matrix": [4, 14], "x": 15.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/evyd13/nt660/rules.mk b/keyboards/evyd13/nt660/rules.mk
index f8c29ddc982..16051206467 100644
--- a/keyboards/evyd13/nt660/rules.mk
+++ b/keyboards/evyd13/nt660/rules.mk
@@ -1,16 +1,3 @@
-# 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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h
deleted file mode 100644
index 230ff5e311e..00000000000
--- a/keyboards/evyd13/pockettype/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json
deleted file mode 100644
index eda670af118..00000000000
--- a/keyboards/evyd13/pockettype/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "keyboard_name": "PocketType",
- "manufacturer": "Evyd13",
- "url": "https://mechboards.co.uk/shop/kits/pockettype/",
- "maintainer": "evyd13",
- "usb": {
- "vid": "0x4705",
- "pid": "0xFA7D",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "B4", "E6", "C6", "D4", "D0", "D2"],
- "rows": ["D3", "D1", "D7", "B5"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["ortho_4x12"],
- "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}
- ]
- }
- }
-}
diff --git a/keyboards/evyd13/pockettype/keyboard.json b/keyboards/evyd13/pockettype/keyboard.json
new file mode 100644
index 00000000000..358e89020a6
--- /dev/null
+++ b/keyboards/evyd13/pockettype/keyboard.json
@@ -0,0 +1,87 @@
+{
+ "keyboard_name": "PocketType",
+ "manufacturer": "Evyd13",
+ "url": "https://mechboards.co.uk/shop/kits/pockettype/",
+ "maintainer": "evyd13",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0xFA7D",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6", "B4", "E6", "C6", "D4", "D0", "D2"],
+ "rows": ["D3", "D1", "D7", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "community_layouts": ["ortho_4x12"],
+ "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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/evyd13/pockettype/rules.mk b/keyboards/evyd13/pockettype/rules.mk
index f8c29ddc982..16051206467 100644
--- a/keyboards/evyd13/pockettype/rules.mk
+++ b/keyboards/evyd13/pockettype/rules.mk
@@ -1,16 +1,3 @@
-# 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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/keyboard.json
similarity index 100%
rename from keyboards/evyd13/wasdat/info.json
rename to keyboards/evyd13/wasdat/keyboard.json
diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json
deleted file mode 100644
index 9fb14283ae9..00000000000
--- a/keyboards/evyd13/wasdat_code/info.json
+++ /dev/null
@@ -1,503 +0,0 @@
-{
- "keyboard_name": "Wasdat Code",
- "manufacturer": "Evyd13",
- "url": "https://maartenwut.com/product/wasdat-code/",
- "maintainer": "evyd13",
- "usb": {
- "vid": "0x4705",
- "pid": "0xB00E",
- "device_version": "0.0.1"
- },
- "backlight": {
- "pin": "B7",
- "levels": 5,
- "breathing": true
- },
- "dynamic_keymap": {
- "layer_count": 3
- },
- "qmk_lufa_bootloader": {
- "esc_input": "F0",
- "esc_output": "E6",
- "led": "B1"
- },
- "indicators": {
- "caps_lock": "B1",
- "num_lock": "B3",
- "scroll_lock": "B2",
- "on_state": 0
- },
- "bootmagic": {
- "matrix": [2, 3]
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"],
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_fullsize_iso"
- },
- "layouts": {
- "LAYOUT_fullsize_ansi": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0},
-
- {"matrix": [6, 4], "x": 2, "y": 0},
- {"matrix": [6, 2], "x": 3, "y": 0},
- {"matrix": [2, 2], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
-
- {"matrix": [3, 1], "x": 6.5, "y": 0},
- {"matrix": [0, 12], "x": 7.5, "y": 0},
- {"matrix": [2, 15], "x": 8.5, "y": 0},
- {"matrix": [6, 15], "x": 9.5, "y": 0},
-
- {"matrix": [6, 11], "x": 11, "y": 0},
- {"matrix": [3, 11], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [5, 11], "x": 14, "y": 0},
-
- {"matrix": [3, 3], "x": 15.25, "y": 0},
- {"matrix": [4, 3], "x": 16.25, "y": 0},
- {"matrix": [4, 1], "x": 17.25, "y": 0},
-
- {"matrix": [6, 5], "x": 0, "y": 1.5},
- {"matrix": [3, 5], "x": 1, "y": 1.5},
- {"matrix": [3, 4], "x": 2, "y": 1.5},
- {"matrix": [3, 2], "x": 3, "y": 1.5},
- {"matrix": [3, 0], "x": 4, "y": 1.5},
- {"matrix": [6, 0], "x": 5, "y": 1.5},
- {"matrix": [6, 10], "x": 6, "y": 1.5},
- {"matrix": [3, 10], "x": 7, "y": 1.5},
- {"matrix": [3, 12], "x": 8, "y": 1.5},
- {"matrix": [3, 15], "x": 9, "y": 1.5},
- {"matrix": [3, 13], "x": 10, "y": 1.5},
- {"matrix": [6, 13], "x": 11, "y": 1.5},
- {"matrix": [6, 12], "x": 12, "y": 1.5},
- {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [6, 7], "x": 15.25, "y": 1.5},
- {"matrix": [6, 14], "x": 16.25, "y": 1.5},
- {"matrix": [6, 6], "x": 17.25, "y": 1.5},
-
- {"matrix": [7, 8], "x": 18.5, "y": 1.5},
- {"matrix": [7, 7], "x": 19.5, "y": 1.5},
- {"matrix": [7, 6], "x": 20.5, "y": 1.5},
- {"matrix": [5, 6], "x": 21.5, "y": 1.5},
-
- {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [4, 5], "x": 1.5, "y": 2.5},
- {"matrix": [4, 4], "x": 2.5, "y": 2.5},
- {"matrix": [4, 2], "x": 3.5, "y": 2.5},
- {"matrix": [4, 0], "x": 4.5, "y": 2.5},
- {"matrix": [2, 0], "x": 5.5, "y": 2.5},
- {"matrix": [2, 10], "x": 6.5, "y": 2.5},
- {"matrix": [4, 10], "x": 7.5, "y": 2.5},
- {"matrix": [4, 12], "x": 8.5, "y": 2.5},
- {"matrix": [4, 15], "x": 9.5, "y": 2.5},
- {"matrix": [4, 13], "x": 10.5, "y": 2.5},
- {"matrix": [2, 13], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [6, 8], "x": 15.25, "y": 2.5},
- {"matrix": [3, 14], "x": 16.25, "y": 2.5},
- {"matrix": [3, 6], "x": 17.25, "y": 2.5},
-
- {"matrix": [4, 8], "x": 18.5, "y": 2.5},
- {"matrix": [4, 7], "x": 19.5, "y": 2.5},
- {"matrix": [4, 6], "x": 20.5, "y": 2.5},
- {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
-
- {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [1, 5], "x": 1.75, "y": 3.5},
- {"matrix": [1, 4], "x": 2.75, "y": 3.5},
- {"matrix": [1, 2], "x": 3.75, "y": 3.5},
- {"matrix": [1, 0], "x": 4.75, "y": 3.5},
- {"matrix": [0, 0], "x": 5.75, "y": 3.5},
- {"matrix": [0, 10], "x": 6.75, "y": 3.5},
- {"matrix": [1, 10], "x": 7.75, "y": 3.5},
- {"matrix": [1, 12], "x": 8.75, "y": 3.5},
- {"matrix": [1, 15], "x": 9.75, "y": 3.5},
- {"matrix": [1, 13], "x": 10.75, "y": 3.5},
- {"matrix": [0, 13], "x": 11.75, "y": 3.5},
- {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [2, 8], "x": 18.5, "y": 3.5},
- {"matrix": [2, 7], "x": 19.5, "y": 3.5},
- {"matrix": [2, 6], "x": 20.5, "y": 3.5},
-
- {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [7, 5], "x": 2.25, "y": 4.5},
- {"matrix": [7, 4], "x": 3.25, "y": 4.5},
- {"matrix": [7, 2], "x": 4.25, "y": 4.5},
- {"matrix": [7, 0], "x": 5.25, "y": 4.5},
- {"matrix": [5, 0], "x": 6.25, "y": 4.5},
- {"matrix": [5, 10], "x": 7.25, "y": 4.5},
- {"matrix": [7, 10], "x": 8.25, "y": 4.5},
- {"matrix": [7, 12], "x": 9.25, "y": 4.5},
- {"matrix": [7, 15], "x": 10.25, "y": 4.5},
- {"matrix": [5, 13], "x": 11.25, "y": 4.5},
- {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [1, 8], "x": 18.5, "y": 4.5},
- {"matrix": [1, 7], "x": 19.5, "y": 4.5},
- {"matrix": [1, 6], "x": 20.5, "y": 4.5},
- {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
-
- {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"matrix": [5, 8], "x": 16.25, "y": 5.5},
- {"matrix": [5, 7], "x": 17.25, "y": 5.5},
-
- {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
- {"matrix": [0, 6], "x": 20.5, "y": 5.5}
- ]
- },
- "LAYOUT_fullsize_iso": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0},
-
- {"matrix": [6, 4], "x": 2, "y": 0},
- {"matrix": [6, 2], "x": 3, "y": 0},
- {"matrix": [2, 2], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
-
- {"matrix": [3, 1], "x": 6.5, "y": 0},
- {"matrix": [0, 12], "x": 7.5, "y": 0},
- {"matrix": [2, 15], "x": 8.5, "y": 0},
- {"matrix": [6, 15], "x": 9.5, "y": 0},
-
- {"matrix": [6, 11], "x": 11, "y": 0},
- {"matrix": [3, 11], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [5, 11], "x": 14, "y": 0},
-
- {"matrix": [3, 3], "x": 15.25, "y": 0},
- {"matrix": [4, 3], "x": 16.25, "y": 0},
- {"matrix": [4, 1], "x": 17.25, "y": 0},
-
- {"matrix": [6, 5], "x": 0, "y": 1.5},
- {"matrix": [3, 5], "x": 1, "y": 1.5},
- {"matrix": [3, 4], "x": 2, "y": 1.5},
- {"matrix": [3, 2], "x": 3, "y": 1.5},
- {"matrix": [3, 0], "x": 4, "y": 1.5},
- {"matrix": [6, 0], "x": 5, "y": 1.5},
- {"matrix": [6, 10], "x": 6, "y": 1.5},
- {"matrix": [3, 10], "x": 7, "y": 1.5},
- {"matrix": [3, 12], "x": 8, "y": 1.5},
- {"matrix": [3, 15], "x": 9, "y": 1.5},
- {"matrix": [3, 13], "x": 10, "y": 1.5},
- {"matrix": [6, 13], "x": 11, "y": 1.5},
- {"matrix": [6, 12], "x": 12, "y": 1.5},
- {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [6, 7], "x": 15.25, "y": 1.5},
- {"matrix": [6, 14], "x": 16.25, "y": 1.5},
- {"matrix": [6, 6], "x": 17.25, "y": 1.5},
-
- {"matrix": [7, 8], "x": 18.5, "y": 1.5},
- {"matrix": [7, 7], "x": 19.5, "y": 1.5},
- {"matrix": [7, 6], "x": 20.5, "y": 1.5},
- {"matrix": [5, 6], "x": 21.5, "y": 1.5},
-
- {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [4, 5], "x": 1.5, "y": 2.5},
- {"matrix": [4, 4], "x": 2.5, "y": 2.5},
- {"matrix": [4, 2], "x": 3.5, "y": 2.5},
- {"matrix": [4, 0], "x": 4.5, "y": 2.5},
- {"matrix": [2, 0], "x": 5.5, "y": 2.5},
- {"matrix": [2, 10], "x": 6.5, "y": 2.5},
- {"matrix": [4, 10], "x": 7.5, "y": 2.5},
- {"matrix": [4, 12], "x": 8.5, "y": 2.5},
- {"matrix": [4, 15], "x": 9.5, "y": 2.5},
- {"matrix": [4, 13], "x": 10.5, "y": 2.5},
- {"matrix": [2, 13], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-
- {"matrix": [6, 8], "x": 15.25, "y": 2.5},
- {"matrix": [3, 14], "x": 16.25, "y": 2.5},
- {"matrix": [3, 6], "x": 17.25, "y": 2.5},
-
- {"matrix": [4, 8], "x": 18.5, "y": 2.5},
- {"matrix": [4, 7], "x": 19.5, "y": 2.5},
- {"matrix": [4, 6], "x": 20.5, "y": 2.5},
- {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
-
- {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [1, 5], "x": 1.75, "y": 3.5},
- {"matrix": [1, 4], "x": 2.75, "y": 3.5},
- {"matrix": [1, 2], "x": 3.75, "y": 3.5},
- {"matrix": [1, 0], "x": 4.75, "y": 3.5},
- {"matrix": [0, 0], "x": 5.75, "y": 3.5},
- {"matrix": [0, 10], "x": 6.75, "y": 3.5},
- {"matrix": [1, 10], "x": 7.75, "y": 3.5},
- {"matrix": [1, 12], "x": 8.75, "y": 3.5},
- {"matrix": [1, 15], "x": 9.75, "y": 3.5},
- {"matrix": [1, 13], "x": 10.75, "y": 3.5},
- {"matrix": [0, 13], "x": 11.75, "y": 3.5},
- {"matrix": [1, 11], "x": 12.75, "y": 3.5},
- {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
- {"matrix": [2, 8], "x": 18.5, "y": 3.5},
- {"matrix": [2, 7], "x": 19.5, "y": 3.5},
- {"matrix": [2, 6], "x": 20.5, "y": 3.5},
-
- {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
- {"matrix": [0, 4], "x": 1.25, "y": 4.5},
- {"matrix": [7, 5], "x": 2.25, "y": 4.5},
- {"matrix": [7, 4], "x": 3.25, "y": 4.5},
- {"matrix": [7, 2], "x": 4.25, "y": 4.5},
- {"matrix": [7, 0], "x": 5.25, "y": 4.5},
- {"matrix": [5, 0], "x": 6.25, "y": 4.5},
- {"matrix": [5, 10], "x": 7.25, "y": 4.5},
- {"matrix": [7, 10], "x": 8.25, "y": 4.5},
- {"matrix": [7, 12], "x": 9.25, "y": 4.5},
- {"matrix": [7, 15], "x": 10.25, "y": 4.5},
- {"matrix": [5, 13], "x": 11.25, "y": 4.5},
- {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [1, 8], "x": 18.5, "y": 4.5},
- {"matrix": [1, 7], "x": 19.5, "y": 4.5},
- {"matrix": [1, 6], "x": 20.5, "y": 4.5},
- {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
-
- {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"matrix": [5, 8], "x": 16.25, "y": 5.5},
- {"matrix": [5, 7], "x": 17.25, "y": 5.5},
-
- {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
- {"matrix": [0, 6], "x": 20.5, "y": 5.5}
- ]
- },
- "LAYOUT_tkl_ansi": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0},
-
- {"matrix": [6, 4], "x": 2, "y": 0},
- {"matrix": [6, 2], "x": 3, "y": 0},
- {"matrix": [2, 2], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
-
- {"matrix": [3, 1], "x": 6.5, "y": 0},
- {"matrix": [0, 12], "x": 7.5, "y": 0},
- {"matrix": [2, 15], "x": 8.5, "y": 0},
- {"matrix": [6, 15], "x": 9.5, "y": 0},
-
- {"matrix": [6, 11], "x": 11, "y": 0},
- {"matrix": [3, 11], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [5, 11], "x": 14, "y": 0},
-
- {"matrix": [3, 3], "x": 15.25, "y": 0},
- {"matrix": [4, 3], "x": 16.25, "y": 0},
- {"matrix": [4, 1], "x": 17.25, "y": 0},
-
- {"matrix": [6, 5], "x": 0, "y": 1.5},
- {"matrix": [3, 5], "x": 1, "y": 1.5},
- {"matrix": [3, 4], "x": 2, "y": 1.5},
- {"matrix": [3, 2], "x": 3, "y": 1.5},
- {"matrix": [3, 0], "x": 4, "y": 1.5},
- {"matrix": [6, 0], "x": 5, "y": 1.5},
- {"matrix": [6, 10], "x": 6, "y": 1.5},
- {"matrix": [3, 10], "x": 7, "y": 1.5},
- {"matrix": [3, 12], "x": 8, "y": 1.5},
- {"matrix": [3, 15], "x": 9, "y": 1.5},
- {"matrix": [3, 13], "x": 10, "y": 1.5},
- {"matrix": [6, 13], "x": 11, "y": 1.5},
- {"matrix": [6, 12], "x": 12, "y": 1.5},
- {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [6, 7], "x": 15.25, "y": 1.5},
- {"matrix": [6, 14], "x": 16.25, "y": 1.5},
- {"matrix": [6, 6], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [4, 5], "x": 1.5, "y": 2.5},
- {"matrix": [4, 4], "x": 2.5, "y": 2.5},
- {"matrix": [4, 2], "x": 3.5, "y": 2.5},
- {"matrix": [4, 0], "x": 4.5, "y": 2.5},
- {"matrix": [2, 0], "x": 5.5, "y": 2.5},
- {"matrix": [2, 10], "x": 6.5, "y": 2.5},
- {"matrix": [4, 10], "x": 7.5, "y": 2.5},
- {"matrix": [4, 12], "x": 8.5, "y": 2.5},
- {"matrix": [4, 15], "x": 9.5, "y": 2.5},
- {"matrix": [4, 13], "x": 10.5, "y": 2.5},
- {"matrix": [2, 13], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [6, 8], "x": 15.25, "y": 2.5},
- {"matrix": [3, 14], "x": 16.25, "y": 2.5},
- {"matrix": [3, 6], "x": 17.25, "y": 2.5},
-
- {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [1, 5], "x": 1.75, "y": 3.5},
- {"matrix": [1, 4], "x": 2.75, "y": 3.5},
- {"matrix": [1, 2], "x": 3.75, "y": 3.5},
- {"matrix": [1, 0], "x": 4.75, "y": 3.5},
- {"matrix": [0, 0], "x": 5.75, "y": 3.5},
- {"matrix": [0, 10], "x": 6.75, "y": 3.5},
- {"matrix": [1, 10], "x": 7.75, "y": 3.5},
- {"matrix": [1, 12], "x": 8.75, "y": 3.5},
- {"matrix": [1, 15], "x": 9.75, "y": 3.5},
- {"matrix": [1, 13], "x": 10.75, "y": 3.5},
- {"matrix": [0, 13], "x": 11.75, "y": 3.5},
- {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [7, 5], "x": 2.25, "y": 4.5},
- {"matrix": [7, 4], "x": 3.25, "y": 4.5},
- {"matrix": [7, 2], "x": 4.25, "y": 4.5},
- {"matrix": [7, 0], "x": 5.25, "y": 4.5},
- {"matrix": [5, 0], "x": 6.25, "y": 4.5},
- {"matrix": [5, 10], "x": 7.25, "y": 4.5},
- {"matrix": [7, 10], "x": 8.25, "y": 4.5},
- {"matrix": [7, 12], "x": 9.25, "y": 4.5},
- {"matrix": [7, 15], "x": 10.25, "y": 4.5},
- {"matrix": [5, 13], "x": 11.25, "y": 4.5},
- {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"matrix": [5, 8], "x": 16.25, "y": 5.5},
- {"matrix": [5, 7], "x": 17.25, "y": 5.5}
- ]
- },
- "LAYOUT_tkl_iso": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0},
-
- {"matrix": [6, 4], "x": 2, "y": 0},
- {"matrix": [6, 2], "x": 3, "y": 0},
- {"matrix": [2, 2], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
-
- {"matrix": [3, 1], "x": 6.5, "y": 0},
- {"matrix": [0, 12], "x": 7.5, "y": 0},
- {"matrix": [2, 15], "x": 8.5, "y": 0},
- {"matrix": [6, 15], "x": 9.5, "y": 0},
-
- {"matrix": [6, 11], "x": 11, "y": 0},
- {"matrix": [3, 11], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [5, 11], "x": 14, "y": 0},
-
- {"matrix": [3, 3], "x": 15.25, "y": 0},
- {"matrix": [4, 3], "x": 16.25, "y": 0},
- {"matrix": [4, 1], "x": 17.25, "y": 0},
-
- {"matrix": [6, 5], "x": 0, "y": 1.5},
- {"matrix": [3, 5], "x": 1, "y": 1.5},
- {"matrix": [3, 4], "x": 2, "y": 1.5},
- {"matrix": [3, 2], "x": 3, "y": 1.5},
- {"matrix": [3, 0], "x": 4, "y": 1.5},
- {"matrix": [6, 0], "x": 5, "y": 1.5},
- {"matrix": [6, 10], "x": 6, "y": 1.5},
- {"matrix": [3, 10], "x": 7, "y": 1.5},
- {"matrix": [3, 12], "x": 8, "y": 1.5},
- {"matrix": [3, 15], "x": 9, "y": 1.5},
- {"matrix": [3, 13], "x": 10, "y": 1.5},
- {"matrix": [6, 13], "x": 11, "y": 1.5},
- {"matrix": [6, 12], "x": 12, "y": 1.5},
- {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [6, 7], "x": 15.25, "y": 1.5},
- {"matrix": [6, 14], "x": 16.25, "y": 1.5},
- {"matrix": [6, 6], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [4, 5], "x": 1.5, "y": 2.5},
- {"matrix": [4, 4], "x": 2.5, "y": 2.5},
- {"matrix": [4, 2], "x": 3.5, "y": 2.5},
- {"matrix": [4, 0], "x": 4.5, "y": 2.5},
- {"matrix": [2, 0], "x": 5.5, "y": 2.5},
- {"matrix": [2, 10], "x": 6.5, "y": 2.5},
- {"matrix": [4, 10], "x": 7.5, "y": 2.5},
- {"matrix": [4, 12], "x": 8.5, "y": 2.5},
- {"matrix": [4, 15], "x": 9.5, "y": 2.5},
- {"matrix": [4, 13], "x": 10.5, "y": 2.5},
- {"matrix": [2, 13], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
-
- {"matrix": [6, 8], "x": 15.25, "y": 2.5},
- {"matrix": [3, 14], "x": 16.25, "y": 2.5},
- {"matrix": [3, 6], "x": 17.25, "y": 2.5},
-
- {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [1, 5], "x": 1.75, "y": 3.5},
- {"matrix": [1, 4], "x": 2.75, "y": 3.5},
- {"matrix": [1, 2], "x": 3.75, "y": 3.5},
- {"matrix": [1, 0], "x": 4.75, "y": 3.5},
- {"matrix": [0, 0], "x": 5.75, "y": 3.5},
- {"matrix": [0, 10], "x": 6.75, "y": 3.5},
- {"matrix": [1, 10], "x": 7.75, "y": 3.5},
- {"matrix": [1, 12], "x": 8.75, "y": 3.5},
- {"matrix": [1, 15], "x": 9.75, "y": 3.5},
- {"matrix": [1, 13], "x": 10.75, "y": 3.5},
- {"matrix": [0, 13], "x": 11.75, "y": 3.5},
- {"matrix": [1, 11], "x": 12.75, "y": 3.5},
- {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
- {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
- {"matrix": [0, 4], "x": 1.25, "y": 4.5},
- {"matrix": [7, 5], "x": 2.25, "y": 4.5},
- {"matrix": [7, 4], "x": 3.25, "y": 4.5},
- {"matrix": [7, 2], "x": 4.25, "y": 4.5},
- {"matrix": [7, 0], "x": 5.25, "y": 4.5},
- {"matrix": [5, 0], "x": 6.25, "y": 4.5},
- {"matrix": [5, 10], "x": 7.25, "y": 4.5},
- {"matrix": [7, 10], "x": 8.25, "y": 4.5},
- {"matrix": [7, 12], "x": 9.25, "y": 4.5},
- {"matrix": [7, 15], "x": 10.25, "y": 4.5},
- {"matrix": [5, 13], "x": 11.25, "y": 4.5},
- {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"matrix": [5, 8], "x": 16.25, "y": 5.5},
- {"matrix": [5, 7], "x": 17.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/evyd13/wasdat_code/keyboard.json b/keyboards/evyd13/wasdat_code/keyboard.json
new file mode 100644
index 00000000000..8c1bb52b6bf
--- /dev/null
+++ b/keyboards/evyd13/wasdat_code/keyboard.json
@@ -0,0 +1,510 @@
+{
+ "keyboard_name": "Wasdat Code",
+ "manufacturer": "Evyd13",
+ "url": "https://maartenwut.com/product/wasdat-code/",
+ "maintainer": "evyd13",
+ "usb": {
+ "vid": "0x4705",
+ "pid": "0xB00E",
+ "device_version": "0.0.1"
+ },
+ "backlight": {
+ "pin": "B7",
+ "levels": 5,
+ "breathing": true
+ },
+ "dynamic_keymap": {
+ "layer_count": 3
+ },
+ "qmk_lufa_bootloader": {
+ "esc_input": "F0",
+ "esc_output": "E6",
+ "led": "B1"
+ },
+ "indicators": {
+ "caps_lock": "B1",
+ "num_lock": "B3",
+ "scroll_lock": "B2",
+ "on_state": 0
+ },
+ "bootmagic": {
+ "matrix": [2, 3]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "backlight": true
+ },
+ "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"],
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_fullsize_iso"
+ },
+ "layouts": {
+ "LAYOUT_fullsize_ansi": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0},
+
+ {"matrix": [6, 4], "x": 2, "y": 0},
+ {"matrix": [6, 2], "x": 3, "y": 0},
+ {"matrix": [2, 2], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+
+ {"matrix": [3, 1], "x": 6.5, "y": 0},
+ {"matrix": [0, 12], "x": 7.5, "y": 0},
+ {"matrix": [2, 15], "x": 8.5, "y": 0},
+ {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+ {"matrix": [6, 11], "x": 11, "y": 0},
+ {"matrix": [3, 11], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [5, 11], "x": 14, "y": 0},
+
+ {"matrix": [3, 3], "x": 15.25, "y": 0},
+ {"matrix": [4, 3], "x": 16.25, "y": 0},
+ {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+ {"matrix": [6, 5], "x": 0, "y": 1.5},
+ {"matrix": [3, 5], "x": 1, "y": 1.5},
+ {"matrix": [3, 4], "x": 2, "y": 1.5},
+ {"matrix": [3, 2], "x": 3, "y": 1.5},
+ {"matrix": [3, 0], "x": 4, "y": 1.5},
+ {"matrix": [6, 0], "x": 5, "y": 1.5},
+ {"matrix": [6, 10], "x": 6, "y": 1.5},
+ {"matrix": [3, 10], "x": 7, "y": 1.5},
+ {"matrix": [3, 12], "x": 8, "y": 1.5},
+ {"matrix": [3, 15], "x": 9, "y": 1.5},
+ {"matrix": [3, 13], "x": 10, "y": 1.5},
+ {"matrix": [6, 13], "x": 11, "y": 1.5},
+ {"matrix": [6, 12], "x": 12, "y": 1.5},
+ {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+ {"matrix": [7, 8], "x": 18.5, "y": 1.5},
+ {"matrix": [7, 7], "x": 19.5, "y": 1.5},
+ {"matrix": [7, 6], "x": 20.5, "y": 1.5},
+ {"matrix": [5, 6], "x": 21.5, "y": 1.5},
+
+ {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+ {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+ {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+ {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+ {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+ {"matrix": [4, 7], "x": 19.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 20.5, "y": 2.5},
+ {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+ {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+ {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+ {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+ {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+ {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+ {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+ {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+ {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+ {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+ {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+ {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [2, 8], "x": 18.5, "y": 3.5},
+ {"matrix": [2, 7], "x": 19.5, "y": 3.5},
+ {"matrix": [2, 6], "x": 20.5, "y": 3.5},
+
+ {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+ {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+ {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+ {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+ {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+ {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+ {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+ {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+ {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+ {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [1, 8], "x": 18.5, "y": 4.5},
+ {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+ {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+ {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 7], "x": 17.25, "y": 5.5},
+
+ {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [0, 6], "x": 20.5, "y": 5.5}
+ ]
+ },
+ "LAYOUT_fullsize_iso": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0},
+
+ {"matrix": [6, 4], "x": 2, "y": 0},
+ {"matrix": [6, 2], "x": 3, "y": 0},
+ {"matrix": [2, 2], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+
+ {"matrix": [3, 1], "x": 6.5, "y": 0},
+ {"matrix": [0, 12], "x": 7.5, "y": 0},
+ {"matrix": [2, 15], "x": 8.5, "y": 0},
+ {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+ {"matrix": [6, 11], "x": 11, "y": 0},
+ {"matrix": [3, 11], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [5, 11], "x": 14, "y": 0},
+
+ {"matrix": [3, 3], "x": 15.25, "y": 0},
+ {"matrix": [4, 3], "x": 16.25, "y": 0},
+ {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+ {"matrix": [6, 5], "x": 0, "y": 1.5},
+ {"matrix": [3, 5], "x": 1, "y": 1.5},
+ {"matrix": [3, 4], "x": 2, "y": 1.5},
+ {"matrix": [3, 2], "x": 3, "y": 1.5},
+ {"matrix": [3, 0], "x": 4, "y": 1.5},
+ {"matrix": [6, 0], "x": 5, "y": 1.5},
+ {"matrix": [6, 10], "x": 6, "y": 1.5},
+ {"matrix": [3, 10], "x": 7, "y": 1.5},
+ {"matrix": [3, 12], "x": 8, "y": 1.5},
+ {"matrix": [3, 15], "x": 9, "y": 1.5},
+ {"matrix": [3, 13], "x": 10, "y": 1.5},
+ {"matrix": [6, 13], "x": 11, "y": 1.5},
+ {"matrix": [6, 12], "x": 12, "y": 1.5},
+ {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+ {"matrix": [7, 8], "x": 18.5, "y": 1.5},
+ {"matrix": [7, 7], "x": 19.5, "y": 1.5},
+ {"matrix": [7, 6], "x": 20.5, "y": 1.5},
+ {"matrix": [5, 6], "x": 21.5, "y": 1.5},
+
+ {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+ {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+ {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+ {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+ {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+ {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+ {"matrix": [4, 7], "x": 19.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 20.5, "y": 2.5},
+ {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+ {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+ {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+ {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+ {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+ {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+ {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+ {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+ {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+ {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+ {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+ {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+ {"matrix": [1, 11], "x": 12.75, "y": 3.5},
+ {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 8], "x": 18.5, "y": 3.5},
+ {"matrix": [2, 7], "x": 19.5, "y": 3.5},
+ {"matrix": [2, 6], "x": 20.5, "y": 3.5},
+
+ {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+ {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+ {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+ {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+ {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+ {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+ {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+ {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+ {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+ {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+ {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [1, 8], "x": 18.5, "y": 4.5},
+ {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+ {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+ {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+ {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 7], "x": 17.25, "y": 5.5},
+
+ {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+ {"matrix": [0, 6], "x": 20.5, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0},
+
+ {"matrix": [6, 4], "x": 2, "y": 0},
+ {"matrix": [6, 2], "x": 3, "y": 0},
+ {"matrix": [2, 2], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+
+ {"matrix": [3, 1], "x": 6.5, "y": 0},
+ {"matrix": [0, 12], "x": 7.5, "y": 0},
+ {"matrix": [2, 15], "x": 8.5, "y": 0},
+ {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+ {"matrix": [6, 11], "x": 11, "y": 0},
+ {"matrix": [3, 11], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [5, 11], "x": 14, "y": 0},
+
+ {"matrix": [3, 3], "x": 15.25, "y": 0},
+ {"matrix": [4, 3], "x": 16.25, "y": 0},
+ {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+ {"matrix": [6, 5], "x": 0, "y": 1.5},
+ {"matrix": [3, 5], "x": 1, "y": 1.5},
+ {"matrix": [3, 4], "x": 2, "y": 1.5},
+ {"matrix": [3, 2], "x": 3, "y": 1.5},
+ {"matrix": [3, 0], "x": 4, "y": 1.5},
+ {"matrix": [6, 0], "x": 5, "y": 1.5},
+ {"matrix": [6, 10], "x": 6, "y": 1.5},
+ {"matrix": [3, 10], "x": 7, "y": 1.5},
+ {"matrix": [3, 12], "x": 8, "y": 1.5},
+ {"matrix": [3, 15], "x": 9, "y": 1.5},
+ {"matrix": [3, 13], "x": 10, "y": 1.5},
+ {"matrix": [6, 13], "x": 11, "y": 1.5},
+ {"matrix": [6, 12], "x": 12, "y": 1.5},
+ {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+ {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+ {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+ {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+ {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+ {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+ {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+ {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+ {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+ {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+ {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+ {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+ {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+ {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+ {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+ {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+ {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+ {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+ {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+ {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+ {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+ {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+ {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+ {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+ {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 7], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_iso": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0},
+
+ {"matrix": [6, 4], "x": 2, "y": 0},
+ {"matrix": [6, 2], "x": 3, "y": 0},
+ {"matrix": [2, 2], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+
+ {"matrix": [3, 1], "x": 6.5, "y": 0},
+ {"matrix": [0, 12], "x": 7.5, "y": 0},
+ {"matrix": [2, 15], "x": 8.5, "y": 0},
+ {"matrix": [6, 15], "x": 9.5, "y": 0},
+
+ {"matrix": [6, 11], "x": 11, "y": 0},
+ {"matrix": [3, 11], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [5, 11], "x": 14, "y": 0},
+
+ {"matrix": [3, 3], "x": 15.25, "y": 0},
+ {"matrix": [4, 3], "x": 16.25, "y": 0},
+ {"matrix": [4, 1], "x": 17.25, "y": 0},
+
+ {"matrix": [6, 5], "x": 0, "y": 1.5},
+ {"matrix": [3, 5], "x": 1, "y": 1.5},
+ {"matrix": [3, 4], "x": 2, "y": 1.5},
+ {"matrix": [3, 2], "x": 3, "y": 1.5},
+ {"matrix": [3, 0], "x": 4, "y": 1.5},
+ {"matrix": [6, 0], "x": 5, "y": 1.5},
+ {"matrix": [6, 10], "x": 6, "y": 1.5},
+ {"matrix": [3, 10], "x": 7, "y": 1.5},
+ {"matrix": [3, 12], "x": 8, "y": 1.5},
+ {"matrix": [3, 15], "x": 9, "y": 1.5},
+ {"matrix": [3, 13], "x": 10, "y": 1.5},
+ {"matrix": [6, 13], "x": 11, "y": 1.5},
+ {"matrix": [6, 12], "x": 12, "y": 1.5},
+ {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+ {"matrix": [6, 6], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+ {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+ {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+ {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+ {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+ {"matrix": [3, 6], "x": 17.25, "y": 2.5},
+
+ {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+ {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+ {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+ {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+ {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+ {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+ {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+ {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+ {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+ {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+ {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+ {"matrix": [1, 11], "x": 12.75, "y": 3.5},
+ {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+ {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+ {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+ {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+ {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+ {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+ {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+ {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+ {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+ {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+ {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 7], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/evyd13/wasdat_code/rules.mk b/keyboards/evyd13/wasdat_code/rules.mk
index 00967d18474..6beea3e392f 100644
--- a/keyboards/evyd13/wasdat_code/rules.mk
+++ b/keyboards/evyd13/wasdat_code/rules.mk
@@ -1,16 +1,3 @@
-# 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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = lite
VPATH += drivers/gpio
SRC += matrix.c sn74x138.c
diff --git a/keyboards/exclusive/e85/hotswap/keyboard.json b/keyboards/exclusive/e85/hotswap/keyboard.json
index 779a717ec55..c64509496aa 100644
--- a/keyboards/exclusive/e85/hotswap/keyboard.json
+++ b/keyboards/exclusive/e85/hotswap/keyboard.json
@@ -41,6 +41,17 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
"layouts": {
"LAYOUT_ansi_standard": {
"layout": [
diff --git a/keyboards/exclusive/e85/rules.mk b/keyboards/exclusive/e85/rules.mk
index 4251159d944..8eef46d0ab4 100644
--- a/keyboards/exclusive/e85/rules.mk
+++ b/keyboards/exclusive/e85/rules.mk
@@ -1,15 +1 @@
-# 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 = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
DEFAULT_FOLDER = exclusive/e85/hotswap
diff --git a/keyboards/exclusive/e85/soldered/keyboard.json b/keyboards/exclusive/e85/soldered/keyboard.json
index d34440389a6..5f7458e851b 100644
--- a/keyboards/exclusive/e85/soldered/keyboard.json
+++ b/keyboards/exclusive/e85/soldered/keyboard.json
@@ -41,6 +41,17 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/keyboard.json
similarity index 100%
rename from keyboards/ez_maker/directpins/teensy_32/info.json
rename to keyboards/ez_maker/directpins/teensy_32/keyboard.json
diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/keyboard.json
similarity index 100%
rename from keyboards/ez_maker/directpins/teensy_lc/info.json
rename to keyboards/ez_maker/directpins/teensy_lc/keyboard.json
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
index 9489463a4cd..fbeca239d9f 100644
--- a/keyboards/fallacy/info.json
+++ b/keyboards/fallacy/info.json
@@ -32,6 +32,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"community_layouts": ["alice", "alice_split_bs"],
"layout_aliases": {
"LAYOUT_all": "LAYOUT_alice_split_bs",
diff --git a/keyboards/fallacy/rules.mk b/keyboards/fallacy/rules.mk
index ee1a36c9108..4b016ac9ad5 100755
--- a/keyboards/fallacy/rules.mk
+++ b/keyboards/fallacy/rules.mk
@@ -1,16 +1,3 @@
-# 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 = yes # 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
-
# project specific files
SRC += indicators.c \
drivers/led/issi/is31fl3731-mono.c
diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json
index e65ed35dae7..6c573fef88b 100644
--- a/keyboards/fc660c/info.json
+++ b/keyboards/fc660c/info.json
@@ -17,6 +17,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
"debounce": 0,
"layouts": {
"LAYOUT": {
diff --git a/keyboards/fc660c/rules.mk b/keyboards/fc660c/rules.mk
index 03a674d668c..46c4fa1efe4 100644
--- a/keyboards/fc660c/rules.mk
+++ b/keyboards/fc660c/rules.mk
@@ -1,13 +1,3 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-
# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax
diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json
index 5060885c695..9944dd3899d 100644
--- a/keyboards/fc980c/info.json
+++ b/keyboards/fc980c/info.json
@@ -18,6 +18,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
"debounce": 0,
"layouts": {
"LAYOUT": {
diff --git a/keyboards/fc980c/rules.mk b/keyboards/fc980c/rules.mk
index 03a674d668c..46c4fa1efe4 100644
--- a/keyboards/fc980c/rules.mk
+++ b/keyboards/fc980c/rules.mk
@@ -1,13 +1,3 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-
# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax
diff --git a/keyboards/fearherbs1/blue_team_pad/info.json b/keyboards/fearherbs1/blue_team_pad/info.json
deleted file mode 100644
index 3a06f9c0660..00000000000
--- a/keyboards/fearherbs1/blue_team_pad/info.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
- "keyboard_name": "blue_team_pad",
- "maintainer": "fearherbs1",
- "manufacturer": "fearherbs1",
- "processor": "RP2040",
- "bootloader": "rp2040",
- "url": "https://github.com/fearherbs1/blue-team-pad",
- "usb": {
- "vid": "0x4648",
- "pid": "0x4254",
- "device_version": "1.1.0"
- },
- "features": {
- "encoder": true,
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "console": true,
- "command": false,
- "nkro": true
- },
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["GP24", "GP23", "GP21", "GP20", "GP3"],
- "rows": ["GP2", "GP11", "GP10", "GP9", "GP8"]
- },
- "encoder": {
- "rotary": [
- {"pin_a": "GP25", "pin_b": "GP28", "resolution": 2},
- {"pin_a": "GP1", "pin_b": "GP0", "resolution": 2}
- ]
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [1, 0], "x": 0, "y": 2},
- {"matrix": [1, 1], "x": 1, "y": 2},
- {"matrix": [1, 2], "x": 2, "y": 2},
- {"matrix": [1, 3], "x": 3, "y": 2},
- {"matrix": [1, 4], "x": 4, "y": 2},
- {"matrix": [2, 0], "x": 0, "y": 3},
- {"matrix": [2, 1], "x": 1, "y": 3},
- {"matrix": [2, 2], "x": 2, "y": 3},
- {"matrix": [2, 3], "x": 3, "y": 3},
- {"matrix": [2, 4], "x": 4, "y": 3},
- {"matrix": [3, 0], "x": 0, "y": 4},
- {"matrix": [3, 1], "x": 1, "y": 4},
- {"matrix": [3, 2], "x": 2, "y": 4},
- {"matrix": [3, 3], "x": 3, "y": 4},
- {"matrix": [3, 4], "x": 4, "y": 4},
- {"matrix": [4, 0], "x": 0, "y": 5},
- {"matrix": [4, 1], "x": 1, "y": 5},
- {"matrix": [4, 2], "x": 2, "y": 5},
- {"matrix": [4, 3], "x": 3, "y": 5},
- {"matrix": [4, 4], "x": 4, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/fearherbs1/blue_team_pad/keyboard.json b/keyboards/fearherbs1/blue_team_pad/keyboard.json
new file mode 100644
index 00000000000..b47b049b45e
--- /dev/null
+++ b/keyboards/fearherbs1/blue_team_pad/keyboard.json
@@ -0,0 +1,62 @@
+{
+ "keyboard_name": "blue_team_pad",
+ "maintainer": "fearherbs1",
+ "manufacturer": "fearherbs1",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "url": "https://github.com/fearherbs1/blue-team-pad",
+ "usb": {
+ "vid": "0x4648",
+ "pid": "0x4254",
+ "device_version": "1.1.0"
+ },
+ "features": {
+ "encoder": true,
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": false,
+ "nkro": true,
+ "oled": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["GP24", "GP23", "GP21", "GP20", "GP3"],
+ "rows": ["GP2", "GP11", "GP10", "GP9", "GP8"]
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "GP25", "pin_b": "GP28", "resolution": 2},
+ {"pin_a": "GP1", "pin_b": "GP0", "resolution": 2}
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3},
+ {"matrix": [2, 4], "x": 4, "y": 3},
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [4, 0], "x": 0, "y": 5},
+ {"matrix": [4, 1], "x": 1, "y": 5},
+ {"matrix": [4, 2], "x": 2, "y": 5},
+ {"matrix": [4, 3], "x": 3, "y": 5},
+ {"matrix": [4, 4], "x": 4, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/fearherbs1/blue_team_pad/rules.mk b/keyboards/fearherbs1/blue_team_pad/rules.mk
deleted file mode 100644
index dd68e9d3b09..00000000000
--- a/keyboards/fearherbs1/blue_team_pad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json
index 5a65369f61c..a7f7c08bec1 100644
--- a/keyboards/ferris/0_1/info.json
+++ b/keyboards/ferris/0_1/info.json
@@ -4,10 +4,20 @@
"usb": {
"vid": "0xC2AB",
"pid": "0x0000",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "no_startup_check": true
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "unicode": true
+ },
+ "build": {
+ "lto": true
+ },
"community_layouts": ["split_3x5_2"],
"layout_aliases": {
"LAYOUT": "LAYOUT_split_3x5_2"
diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk
index f971aa9a48b..c04c3c92ed3 100644
--- a/keyboards/ferris/0_1/rules.mk
+++ b/keyboards/ferris/0_1/rules.mk
@@ -1,19 +1,4 @@
-# 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
-UNICODE_ENABLE = yes
CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = yes
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json
index 06a826450b4..22ef500d6da 100644
--- a/keyboards/ferris/0_2/bling/info.json
+++ b/keyboards/ferris/0_2/bling/info.json
@@ -50,5 +50,8 @@
"solid_multisplash": true
},
"driver": "is31fl3731"
+ },
+ "features": {
+ "rgb_matrix": true
}
}
diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk
index aad92997d0f..e69de29bb2d 100644
--- a/keyboards/ferris/0_2/bling/rules.mk
+++ b/keyboards/ferris/0_2/bling/rules.mk
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json
index c6584ecf01a..d1108b51c49 100644
--- a/keyboards/ferris/0_2/info.json
+++ b/keyboards/ferris/0_2/info.json
@@ -2,10 +2,17 @@
"manufacturer": "Cuddly Keyboards Ltd.",
"usb": {
"vid": "0xC2AB",
- "device_version": "0.0.2"
+ "device_version": "0.0.2",
+ "no_startup_check": true
},
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "unicode": true
+ },
"community_layouts": ["split_3x5_2"],
"layout_aliases": {
"LAYOUT": "LAYOUT_split_3x5_2"
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
index 6f67e3dece3..11b9d33a699 100644
--- a/keyboards/ferris/0_2/rules.mk
+++ b/keyboards/ferris/0_2/rules.mk
@@ -1,19 +1,4 @@
-# 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
-UNICODE_ENABLE = yes
CUSTOM_MATRIX = lite
-NO_USB_STARTUP_CHECK = yes
-LTO_ENABLE = no
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index 8244960e45a..220cf28831f 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -33,6 +33,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT_75_all": {
"layout": [
diff --git a/keyboards/fjlabs/7vhotswap/rules.mk b/keyboards/fjlabs/7vhotswap/rules.mk
index 8bb5a64bff4..3437a35bdf1 100644
--- a/keyboards/fjlabs/7vhotswap/rules.mk
+++ b/keyboards/fjlabs/7vhotswap/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/info.json
index 041d8a1d2fe..19adad79325 100644
--- a/keyboards/fjlabs/ad65/info.json
+++ b/keyboards/fjlabs/ad65/info.json
@@ -18,6 +18,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"community_layouts": [
"65_ansi_blocker",
"65_ansi_blocker_split_bs",
diff --git a/keyboards/fjlabs/ad65/rules.mk b/keyboards/fjlabs/ad65/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/ad65/rules.mk
+++ b/keyboards/fjlabs/ad65/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json
index 77b5fbe9566..2407c3ec26b 100644
--- a/keyboards/fjlabs/avalon/info.json
+++ b/keyboards/fjlabs/avalon/info.json
@@ -41,6 +41,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/fjlabs/avalon/rules.mk b/keyboards/fjlabs/avalon/rules.mk
index dca4b0aabb4..3437a35bdf1 100644
--- a/keyboards/fjlabs/avalon/rules.mk
+++ b/keyboards/fjlabs/avalon/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json
index 5e0d9d5fb9b..5be09bfe0d0 100644
--- a/keyboards/fjlabs/bks65/info.json
+++ b/keyboards/fjlabs/bks65/info.json
@@ -36,6 +36,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_65_ansi": {
diff --git a/keyboards/fjlabs/bks65/rules.mk b/keyboards/fjlabs/bks65/rules.mk
index dca4b0aabb4..3437a35bdf1 100644
--- a/keyboards/fjlabs/bks65/rules.mk
+++ b/keyboards/fjlabs/bks65/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json
index dae926d08c9..609dc4cdbc0 100644
--- a/keyboards/fjlabs/bks65solder/info.json
+++ b/keyboards/fjlabs/bks65solder/info.json
@@ -33,6 +33,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/fjlabs/bks65solder/rules.mk b/keyboards/fjlabs/bks65solder/rules.mk
index dca4b0aabb4..3437a35bdf1 100644
--- a/keyboards/fjlabs/bks65solder/rules.mk
+++ b/keyboards/fjlabs/bks65solder/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/info.json
index 2f53b237d24..9deb09fef29 100644
--- a/keyboards/fjlabs/bolsa65/info.json
+++ b/keyboards/fjlabs/bolsa65/info.json
@@ -15,6 +15,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"community_layouts": ["65_ansi_blocker"],
"layouts": {
"LAYOUT_65_ansi_blocker": {
diff --git a/keyboards/fjlabs/bolsa65/rules.mk b/keyboards/fjlabs/bolsa65/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/bolsa65/rules.mk
+++ b/keyboards/fjlabs/bolsa65/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json
index cd2f6a7ac2f..e4f48acc8ec 100644
--- a/keyboards/fjlabs/kf87/info.json
+++ b/keyboards/fjlabs/kf87/info.json
@@ -38,6 +38,14 @@
},
"processor": "at90usb646",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT_tkl_all": {
"layout": [
diff --git a/keyboards/fjlabs/kf87/rules.mk b/keyboards/fjlabs/kf87/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/kf87/rules.mk
+++ b/keyboards/fjlabs/kf87/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json
index ed02d7d3b42..a16e2835cf2 100644
--- a/keyboards/fjlabs/kyuu/info.json
+++ b/keyboards/fjlabs/kyuu/info.json
@@ -37,6 +37,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT_65_ansi_blocker_badge": {
"layout": [
diff --git a/keyboards/fjlabs/kyuu/rules.mk b/keyboards/fjlabs/kyuu/rules.mk
index a140b3b2525..3437a35bdf1 100644
--- a/keyboards/fjlabs/kyuu/rules.mk
+++ b/keyboards/fjlabs/kyuu/rules.mk
@@ -1,14 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
\ No newline at end of file
diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/info.json
index e8616b291be..a9d997c67e0 100644
--- a/keyboards/fjlabs/ldk65/info.json
+++ b/keyboards/fjlabs/ldk65/info.json
@@ -18,6 +18,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_65_ansi": {
diff --git a/keyboards/fjlabs/ldk65/rules.mk b/keyboards/fjlabs/ldk65/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/ldk65/rules.mk
+++ b/keyboards/fjlabs/ldk65/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json
index db91dbb021c..0f5b1e13bca 100644
--- a/keyboards/fjlabs/midway60/info.json
+++ b/keyboards/fjlabs/midway60/info.json
@@ -18,6 +18,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"community_layouts": [
"60_ansi",
"60_ansi_split_bs_rshift",
diff --git a/keyboards/fjlabs/midway60/rules.mk b/keyboards/fjlabs/midway60/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/midway60/rules.mk
+++ b/keyboards/fjlabs/midway60/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json
index 8c42aa97b64..de26f98ebe6 100644
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ b/keyboards/fjlabs/mk61rgbansi/info.json
@@ -38,6 +38,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
diff --git a/keyboards/fjlabs/mk61rgbansi/rules.mk b/keyboards/fjlabs/mk61rgbansi/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/mk61rgbansi/rules.mk
+++ b/keyboards/fjlabs/mk61rgbansi/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/info.json
index 2d9e806101e..73f4f754c31 100644
--- a/keyboards/fjlabs/peaker/info.json
+++ b/keyboards/fjlabs/peaker/info.json
@@ -15,6 +15,13 @@
"diode_direction": "COL2ROW",
"processor": "at90usb646",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"layouts": {
"LAYOUT_tkl_all": {
"layout": [
diff --git a/keyboards/fjlabs/peaker/rules.mk b/keyboards/fjlabs/peaker/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/peaker/rules.mk
+++ b/keyboards/fjlabs/peaker/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/info.json
index 6757372bf9f..c4f3caf2879 100644
--- a/keyboards/fjlabs/polaris/info.json
+++ b/keyboards/fjlabs/polaris/info.json
@@ -18,6 +18,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"community_layouts": [
"60_ansi",
"60_ansi_split_bs_rshift",
diff --git a/keyboards/fjlabs/polaris/rules.mk b/keyboards/fjlabs/polaris/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/polaris/rules.mk
+++ b/keyboards/fjlabs/polaris/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json
index dd717bb68a8..b5940b9c527 100644
--- a/keyboards/fjlabs/ready100/info.json
+++ b/keyboards/fjlabs/ready100/info.json
@@ -34,6 +34,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"layout_aliases": {
"LAYOUT_64key": "LAYOUT_64_ansi"
},
diff --git a/keyboards/fjlabs/ready100/rules.mk b/keyboards/fjlabs/ready100/rules.mk
index dca4b0aabb4..3437a35bdf1 100644
--- a/keyboards/fjlabs/ready100/rules.mk
+++ b/keyboards/fjlabs/ready100/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/info.json
index f71ad6fca21..ef9cf0e872b 100644
--- a/keyboards/fjlabs/sinanju/info.json
+++ b/keyboards/fjlabs/sinanju/info.json
@@ -18,6 +18,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"layouts": {
"LAYOUT_60_ansi_wkl": {
"layout": [
diff --git a/keyboards/fjlabs/sinanju/rules.mk b/keyboards/fjlabs/sinanju/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/sinanju/rules.mk
+++ b/keyboards/fjlabs/sinanju/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json
index 9f34f4aa528..e825ae335e7 100644
--- a/keyboards/fjlabs/sinanjuwk/info.json
+++ b/keyboards/fjlabs/sinanjuwk/info.json
@@ -18,6 +18,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"layout_aliases": {
"LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
},
diff --git a/keyboards/fjlabs/sinanjuwk/rules.mk b/keyboards/fjlabs/sinanjuwk/rules.mk
index f117516ecce..3437a35bdf1 100644
--- a/keyboards/fjlabs/sinanjuwk/rules.mk
+++ b/keyboards/fjlabs/sinanjuwk/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json
index ecc495d59a9..12103d10586 100644
--- a/keyboards/fjlabs/solanis/info.json
+++ b/keyboards/fjlabs/solanis/info.json
@@ -34,6 +34,14 @@
},
"processor": "at90usb646",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"community_layouts": [
"tkl_ansi",
"tkl_ansi_split_bs_rshift",
diff --git a/keyboards/fjlabs/solanis/rules.mk b/keyboards/fjlabs/solanis/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/solanis/rules.mk
+++ b/keyboards/fjlabs/solanis/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json
index 822d9662d42..331bae459c0 100644
--- a/keyboards/fjlabs/swordfish/info.json
+++ b/keyboards/fjlabs/swordfish/info.json
@@ -33,6 +33,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT_2u_bs": {
"layout": [
diff --git a/keyboards/fjlabs/swordfish/rules.mk b/keyboards/fjlabs/swordfish/rules.mk
index 8bb5a64bff4..3437a35bdf1 100644
--- a/keyboards/fjlabs/swordfish/rules.mk
+++ b/keyboards/fjlabs/swordfish/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json
index f161284ae01..69ff0690a18 100644
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ b/keyboards/fjlabs/tf60ansi/info.json
@@ -38,6 +38,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
diff --git a/keyboards/fjlabs/tf60ansi/rules.mk b/keyboards/fjlabs/tf60ansi/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/tf60ansi/rules.mk
+++ b/keyboards/fjlabs/tf60ansi/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json
index e3051c0da7b..337a06843f1 100644
--- a/keyboards/fjlabs/tf60v2/info.json
+++ b/keyboards/fjlabs/tf60v2/info.json
@@ -38,6 +38,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"community_layouts": ["60_ansi_arrow"],
"layouts": {
"LAYOUT_60_ansi_arrow": {
diff --git a/keyboards/fjlabs/tf60v2/rules.mk b/keyboards/fjlabs/tf60v2/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/tf60v2/rules.mk
+++ b/keyboards/fjlabs/tf60v2/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json
index ab105ff4a9f..dd567c63b85 100644
--- a/keyboards/fjlabs/tf65rgbv2/info.json
+++ b/keyboards/fjlabs/tf65rgbv2/info.json
@@ -38,6 +38,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true
+ },
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_65_ansi": {
diff --git a/keyboards/fjlabs/tf65rgbv2/rules.mk b/keyboards/fjlabs/tf65rgbv2/rules.mk
index 52a18008f4a..3437a35bdf1 100644
--- a/keyboards/fjlabs/tf65rgbv2/rules.mk
+++ b/keyboards/fjlabs/tf65rgbv2/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/fluorite/info.json b/keyboards/fluorite/info.json
deleted file mode 100644
index bdc94b3eb94..00000000000
--- a/keyboards/fluorite/info.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
- "keyboard_name": "fluorite",
- "manufacturer": "ihotsuno",
- "url": "",
- "maintainer": "ihotsuno, qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 1], "x": 3.5, "y": 0},
- {"matrix": [0, 2], "x": 4.5, "y": 0},
- {"matrix": [0, 3], "x": 5.5, "y": 0},
- {"matrix": [0, 4], "x": 6.5, "y": 0},
- {"matrix": [0, 5], "x": 7.5, "y": 1},
- {"matrix": [0, 6], "x": 8.5, "y": 1},
- {"matrix": [0, 7], "x": 9.5, "y": 1},
- {"matrix": [0, 8], "x": 10.5, "y": 1},
- {"matrix": [8, 8], "x": 12.5, "y": 1},
- {"matrix": [8, 7], "x": 13.5, "y": 1},
- {"matrix": [8, 6], "x": 14.5, "y": 1},
- {"matrix": [8, 5], "x": 15.5, "y": 1},
- {"matrix": [8, 4], "x": 16.5, "y": 0},
- {"matrix": [8, 3], "x": 17.5, "y": 0},
- {"matrix": [8, 2], "x": 18.5, "y": 0},
- {"matrix": [8, 1], "x": 19.5, "y": 0},
- {"matrix": [1, 1], "x": 3.25, "y": 1},
- {"matrix": [1, 2], "x": 4.25, "y": 1},
- {"matrix": [1, 3], "x": 5.25, "y": 1},
- {"matrix": [1, 4], "x": 6.25, "y": 1},
- {"matrix": [1, 5], "x": 7.5, "y": 2},
- {"matrix": [1, 6], "x": 8.5, "y": 2},
- {"matrix": [1, 7], "x": 9.5, "y": 2},
- {"matrix": [1, 8], "x": 10.5, "y": 2},
- {"matrix": [9, 8], "x": 12.5, "y": 2},
- {"matrix": [9, 7], "x": 13.5, "y": 2},
- {"matrix": [9, 6], "x": 14.5, "y": 2},
- {"matrix": [9, 5], "x": 15.5, "y": 2},
- {"matrix": [9, 4], "x": 16.75, "y": 1},
- {"matrix": [9, 3], "x": 17.75, "y": 1},
- {"matrix": [9, 2], "x": 18.75, "y": 1},
- {"matrix": [9, 1], "x": 19.75, "y": 1},
- {"matrix": [2, 0], "x": 1.5, "y": 2},
- {"matrix": [2, 1], "x": 3, "y": 2},
- {"matrix": [2, 2], "x": 4, "y": 2},
- {"matrix": [2, 3], "x": 5, "y": 2},
- {"matrix": [2, 4], "x": 6, "y": 2},
- {"matrix": [2, 5], "x": 7.5, "y": 3},
- {"matrix": [2, 6], "x": 8.5, "y": 3},
- {"matrix": [2, 7], "x": 9.5, "y": 3},
- {"matrix": [2, 8], "x": 10.5, "y": 3},
- {"matrix": [10, 8], "x": 12.5, "y": 3},
- {"matrix": [10, 7], "x": 13.5, "y": 3},
- {"matrix": [10, 6], "x": 14.5, "y": 3},
- {"matrix": [10, 5], "x": 15.5, "y": 3},
- {"matrix": [10, 4], "x": 17, "y": 2},
- {"matrix": [10, 3], "x": 18, "y": 2},
- {"matrix": [10, 2], "x": 19, "y": 2},
- {"matrix": [10, 1], "x": 20, "y": 2},
- {"matrix": [10, 0], "x": 21.5, "y": 2},
- {"matrix": [3, 0], "x": 1.5, "y": 3},
- {"matrix": [3, 1], "x": 2.5, "y": 3},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 7.5, "y": 4},
- {"matrix": [3, 6], "x": 8.5, "y": 4},
- {"matrix": [3, 7], "x": 9.5, "y": 4},
- {"matrix": [3, 8], "x": 10.5, "y": 4},
- {"matrix": [11, 8], "x": 12.5, "y": 4},
- {"matrix": [11, 7], "x": 13.5, "y": 4},
- {"matrix": [11, 6], "x": 14.5, "y": 4},
- {"matrix": [11, 5], "x": 15.5, "y": 4},
- {"matrix": [11, 4], "x": 17.5, "y": 3},
- {"matrix": [11, 3], "x": 18.5, "y": 3},
- {"matrix": [11, 2], "x": 19.5, "y": 3},
- {"matrix": [11, 1], "x": 20.5, "y": 3},
- {"matrix": [11, 0], "x": 21.5, "y": 3},
- {"matrix": [4, 0], "x": 1.75, "y": 4},
- {"matrix": [4, 1], "x": 2.75, "y": 4},
- {"matrix": [4, 2], "x": 3.75, "y": 4},
- {"matrix": [4, 3], "x": 4.75, "y": 4},
- {"matrix": [4, 4], "x": 5.75, "y": 4},
- {"matrix": [4, 5], "x": 7.5, "y": 5},
- {"matrix": [4, 6], "x": 8.5, "y": 5},
- {"matrix": [4, 7], "x": 9.5, "y": 5},
- {"matrix": [4, 8], "x": 10.5, "y": 5},
- {"matrix": [12, 8], "x": 12.5, "y": 5},
- {"matrix": [12, 7], "x": 13.5, "y": 5},
- {"matrix": [12, 6], "x": 14.5, "y": 5},
- {"matrix": [12, 5], "x": 15.5, "y": 5},
- {"matrix": [12, 4], "x": 17.25, "y": 4},
- {"matrix": [12, 3], "x": 18.25, "y": 4},
- {"matrix": [12, 2], "x": 19.25, "y": 4},
- {"matrix": [12, 1], "x": 20.25, "y": 4},
- {"matrix": [12, 0], "x": 21.25, "y": 4},
- {"matrix": [5, 0], "x": 2, "y": 5},
- {"matrix": [5, 1], "x": 3, "y": 5},
- {"matrix": [5, 2], "x": 4, "y": 5},
- {"matrix": [5, 3], "x": 5, "y": 5},
- {"matrix": [5, 4], "x": 6, "y": 5},
- {"matrix": [5, 5], "x": 7.5, "y": 6},
- {"matrix": [5, 6], "x": 8.5, "y": 6},
- {"matrix": [5, 7], "x": 9.5, "y": 6},
- {"matrix": [5, 8], "x": 10.5, "y": 6},
- {"matrix": [13, 8], "x": 12.5, "y": 6},
- {"matrix": [13, 7], "x": 13.5, "y": 6},
- {"matrix": [13, 6], "x": 14.5, "y": 6},
- {"matrix": [13, 5], "x": 15.5, "y": 6},
- {"matrix": [13, 4], "x": 17, "y": 5},
- {"matrix": [13, 3], "x": 18, "y": 5},
- {"matrix": [13, 2], "x": 19, "y": 5},
- {"matrix": [13, 1], "x": 20, "y": 5},
- {"matrix": [13, 0], "x": 21, "y": 5},
- {"matrix": [6, 0], "x": 2.25, "y": 6},
- {"matrix": [6, 1], "x": 3.25, "y": 6},
- {"matrix": [6, 2], "x": 4.25, "y": 6},
- {"matrix": [6, 3], "x": 5.25, "y": 6},
- {"matrix": [6, 4], "x": 6.25, "y": 6},
- {"matrix": [6, 5], "x": 7.25, "y": 7, "w": 1.25},
- {"matrix": [6, 6], "x": 8.5, "y": 7},
- {"matrix": [6, 7], "x": 9.5, "y": 7},
- {"matrix": [6, 8], "x": 10.5, "y": 7},
- {"matrix": [14, 8], "x": 12.5, "y": 7},
- {"matrix": [14, 7], "x": 13.5, "y": 7},
- {"matrix": [14, 6], "x": 14.5, "y": 7},
- {"matrix": [14, 5], "x": 15.5, "y": 7, "w": 1.25},
- {"matrix": [14, 4], "x": 16.75, "y": 6},
- {"matrix": [14, 3], "x": 17.75, "y": 6},
- {"matrix": [14, 2], "x": 18.75, "y": 6},
- {"matrix": [14, 1], "x": 19.75, "y": 6},
- {"matrix": [14, 0], "x": 20.75, "y": 6},
- {"matrix": [7, 0], "x": 0.25, "y": 3},
- {"matrix": [7, 1], "x": 0.25, "y": 4, "w": 1.5},
- {"matrix": [7, 2], "x": 0.5, "y": 5, "w": 1.5},
- {"matrix": [7, 3], "x": 1, "y": 6},
- {"matrix": [7, 4], "x": 0, "y": 6},
- {"matrix": [7, 5], "x": 4.625, "y": 7, "w": 1.25},
- {"matrix": [7, 6], "x": 5.875, "y": 7},
- {"matrix": [7, 7], "x": 9.25, "y": 8, "w": 1.25},
- {"matrix": [7, 8], "x": 10.5, "y": 8},
- {"matrix": [15, 8], "x": 12.5, "y": 8},
- {"matrix": [15, 7], "x": 13.5, "y": 8, "w": 1.25},
- {"matrix": [15, 6], "x": 17.125, "y": 7},
- {"matrix": [15, 5], "x": 18.125, "y": 7, "w": 1.25},
- {"matrix": [15, 4], "x": 23, "y": 6},
- {"matrix": [15, 3], "x": 22, "y": 6},
- {"matrix": [15, 2], "x": 22, "y": 5, "w": 1.5},
- {"matrix": [15, 1], "x": 22.25, "y": 4, "w": 1.5},
- {"matrix": [15, 0], "x": 22.5, "y": 3, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/fluorite/keyboard.json b/keyboards/fluorite/keyboard.json
new file mode 100644
index 00000000000..ca23f773b0e
--- /dev/null
+++ b/keyboards/fluorite/keyboard.json
@@ -0,0 +1,173 @@
+{
+ "keyboard_name": "fluorite",
+ "manufacturer": "ihotsuno",
+ "url": "",
+ "maintainer": "ihotsuno, qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["D3", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+ {"matrix": [0, 3], "x": 5.5, "y": 0},
+ {"matrix": [0, 4], "x": 6.5, "y": 0},
+ {"matrix": [0, 5], "x": 7.5, "y": 1},
+ {"matrix": [0, 6], "x": 8.5, "y": 1},
+ {"matrix": [0, 7], "x": 9.5, "y": 1},
+ {"matrix": [0, 8], "x": 10.5, "y": 1},
+ {"matrix": [8, 8], "x": 12.5, "y": 1},
+ {"matrix": [8, 7], "x": 13.5, "y": 1},
+ {"matrix": [8, 6], "x": 14.5, "y": 1},
+ {"matrix": [8, 5], "x": 15.5, "y": 1},
+ {"matrix": [8, 4], "x": 16.5, "y": 0},
+ {"matrix": [8, 3], "x": 17.5, "y": 0},
+ {"matrix": [8, 2], "x": 18.5, "y": 0},
+ {"matrix": [8, 1], "x": 19.5, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 1},
+ {"matrix": [1, 2], "x": 4.25, "y": 1},
+ {"matrix": [1, 3], "x": 5.25, "y": 1},
+ {"matrix": [1, 4], "x": 6.25, "y": 1},
+ {"matrix": [1, 5], "x": 7.5, "y": 2},
+ {"matrix": [1, 6], "x": 8.5, "y": 2},
+ {"matrix": [1, 7], "x": 9.5, "y": 2},
+ {"matrix": [1, 8], "x": 10.5, "y": 2},
+ {"matrix": [9, 8], "x": 12.5, "y": 2},
+ {"matrix": [9, 7], "x": 13.5, "y": 2},
+ {"matrix": [9, 6], "x": 14.5, "y": 2},
+ {"matrix": [9, 5], "x": 15.5, "y": 2},
+ {"matrix": [9, 4], "x": 16.75, "y": 1},
+ {"matrix": [9, 3], "x": 17.75, "y": 1},
+ {"matrix": [9, 2], "x": 18.75, "y": 1},
+ {"matrix": [9, 1], "x": 19.75, "y": 1},
+ {"matrix": [2, 0], "x": 1.5, "y": 2},
+ {"matrix": [2, 1], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [2, 3], "x": 5, "y": 2},
+ {"matrix": [2, 4], "x": 6, "y": 2},
+ {"matrix": [2, 5], "x": 7.5, "y": 3},
+ {"matrix": [2, 6], "x": 8.5, "y": 3},
+ {"matrix": [2, 7], "x": 9.5, "y": 3},
+ {"matrix": [2, 8], "x": 10.5, "y": 3},
+ {"matrix": [10, 8], "x": 12.5, "y": 3},
+ {"matrix": [10, 7], "x": 13.5, "y": 3},
+ {"matrix": [10, 6], "x": 14.5, "y": 3},
+ {"matrix": [10, 5], "x": 15.5, "y": 3},
+ {"matrix": [10, 4], "x": 17, "y": 2},
+ {"matrix": [10, 3], "x": 18, "y": 2},
+ {"matrix": [10, 2], "x": 19, "y": 2},
+ {"matrix": [10, 1], "x": 20, "y": 2},
+ {"matrix": [10, 0], "x": 21.5, "y": 2},
+ {"matrix": [3, 0], "x": 1.5, "y": 3},
+ {"matrix": [3, 1], "x": 2.5, "y": 3},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 7.5, "y": 4},
+ {"matrix": [3, 6], "x": 8.5, "y": 4},
+ {"matrix": [3, 7], "x": 9.5, "y": 4},
+ {"matrix": [3, 8], "x": 10.5, "y": 4},
+ {"matrix": [11, 8], "x": 12.5, "y": 4},
+ {"matrix": [11, 7], "x": 13.5, "y": 4},
+ {"matrix": [11, 6], "x": 14.5, "y": 4},
+ {"matrix": [11, 5], "x": 15.5, "y": 4},
+ {"matrix": [11, 4], "x": 17.5, "y": 3},
+ {"matrix": [11, 3], "x": 18.5, "y": 3},
+ {"matrix": [11, 2], "x": 19.5, "y": 3},
+ {"matrix": [11, 1], "x": 20.5, "y": 3},
+ {"matrix": [11, 0], "x": 21.5, "y": 3},
+ {"matrix": [4, 0], "x": 1.75, "y": 4},
+ {"matrix": [4, 1], "x": 2.75, "y": 4},
+ {"matrix": [4, 2], "x": 3.75, "y": 4},
+ {"matrix": [4, 3], "x": 4.75, "y": 4},
+ {"matrix": [4, 4], "x": 5.75, "y": 4},
+ {"matrix": [4, 5], "x": 7.5, "y": 5},
+ {"matrix": [4, 6], "x": 8.5, "y": 5},
+ {"matrix": [4, 7], "x": 9.5, "y": 5},
+ {"matrix": [4, 8], "x": 10.5, "y": 5},
+ {"matrix": [12, 8], "x": 12.5, "y": 5},
+ {"matrix": [12, 7], "x": 13.5, "y": 5},
+ {"matrix": [12, 6], "x": 14.5, "y": 5},
+ {"matrix": [12, 5], "x": 15.5, "y": 5},
+ {"matrix": [12, 4], "x": 17.25, "y": 4},
+ {"matrix": [12, 3], "x": 18.25, "y": 4},
+ {"matrix": [12, 2], "x": 19.25, "y": 4},
+ {"matrix": [12, 1], "x": 20.25, "y": 4},
+ {"matrix": [12, 0], "x": 21.25, "y": 4},
+ {"matrix": [5, 0], "x": 2, "y": 5},
+ {"matrix": [5, 1], "x": 3, "y": 5},
+ {"matrix": [5, 2], "x": 4, "y": 5},
+ {"matrix": [5, 3], "x": 5, "y": 5},
+ {"matrix": [5, 4], "x": 6, "y": 5},
+ {"matrix": [5, 5], "x": 7.5, "y": 6},
+ {"matrix": [5, 6], "x": 8.5, "y": 6},
+ {"matrix": [5, 7], "x": 9.5, "y": 6},
+ {"matrix": [5, 8], "x": 10.5, "y": 6},
+ {"matrix": [13, 8], "x": 12.5, "y": 6},
+ {"matrix": [13, 7], "x": 13.5, "y": 6},
+ {"matrix": [13, 6], "x": 14.5, "y": 6},
+ {"matrix": [13, 5], "x": 15.5, "y": 6},
+ {"matrix": [13, 4], "x": 17, "y": 5},
+ {"matrix": [13, 3], "x": 18, "y": 5},
+ {"matrix": [13, 2], "x": 19, "y": 5},
+ {"matrix": [13, 1], "x": 20, "y": 5},
+ {"matrix": [13, 0], "x": 21, "y": 5},
+ {"matrix": [6, 0], "x": 2.25, "y": 6},
+ {"matrix": [6, 1], "x": 3.25, "y": 6},
+ {"matrix": [6, 2], "x": 4.25, "y": 6},
+ {"matrix": [6, 3], "x": 5.25, "y": 6},
+ {"matrix": [6, 4], "x": 6.25, "y": 6},
+ {"matrix": [6, 5], "x": 7.25, "y": 7, "w": 1.25},
+ {"matrix": [6, 6], "x": 8.5, "y": 7},
+ {"matrix": [6, 7], "x": 9.5, "y": 7},
+ {"matrix": [6, 8], "x": 10.5, "y": 7},
+ {"matrix": [14, 8], "x": 12.5, "y": 7},
+ {"matrix": [14, 7], "x": 13.5, "y": 7},
+ {"matrix": [14, 6], "x": 14.5, "y": 7},
+ {"matrix": [14, 5], "x": 15.5, "y": 7, "w": 1.25},
+ {"matrix": [14, 4], "x": 16.75, "y": 6},
+ {"matrix": [14, 3], "x": 17.75, "y": 6},
+ {"matrix": [14, 2], "x": 18.75, "y": 6},
+ {"matrix": [14, 1], "x": 19.75, "y": 6},
+ {"matrix": [14, 0], "x": 20.75, "y": 6},
+ {"matrix": [7, 0], "x": 0.25, "y": 3},
+ {"matrix": [7, 1], "x": 0.25, "y": 4, "w": 1.5},
+ {"matrix": [7, 2], "x": 0.5, "y": 5, "w": 1.5},
+ {"matrix": [7, 3], "x": 1, "y": 6},
+ {"matrix": [7, 4], "x": 0, "y": 6},
+ {"matrix": [7, 5], "x": 4.625, "y": 7, "w": 1.25},
+ {"matrix": [7, 6], "x": 5.875, "y": 7},
+ {"matrix": [7, 7], "x": 9.25, "y": 8, "w": 1.25},
+ {"matrix": [7, 8], "x": 10.5, "y": 8},
+ {"matrix": [15, 8], "x": 12.5, "y": 8},
+ {"matrix": [15, 7], "x": 13.5, "y": 8, "w": 1.25},
+ {"matrix": [15, 6], "x": 17.125, "y": 7},
+ {"matrix": [15, 5], "x": 18.125, "y": 7, "w": 1.25},
+ {"matrix": [15, 4], "x": 23, "y": 6},
+ {"matrix": [15, 3], "x": 22, "y": 6},
+ {"matrix": [15, 2], "x": 22, "y": 5, "w": 1.5},
+ {"matrix": [15, 1], "x": 22.25, "y": 4, "w": 1.5},
+ {"matrix": [15, 0], "x": 22.5, "y": 3, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/fluorite/rules.mk b/keyboards/fluorite/rules.mk
deleted file mode 100644
index 139055a96bd..00000000000
--- a/keyboards/fluorite/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json
deleted file mode 100644
index 6d2aadcb437..00000000000
--- a/keyboards/flxlb/zplit/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
- "keyboard_name": "zplit",
- "manufacturer": "fluxlab",
- "url": "https://github.com/cccywj/qmk_firmware",
- "maintainer": "flxlb",
- "usb": {
- "vid": "0x7076",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B2", "B3", "D6", "D7", "B4", "B5"],
- "rows": ["D4", "F5", "F4", "F1"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B0", "pin_b": "D2"}
- ]
- },
- "rgblight": {
- "led_count": 16,
- "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8],
- "split_count": [8, 8],
- "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": {
- "pin": "D3"
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [4, 5], "x": 7, "y": 0},
- {"matrix": [4, 4], "x": 8, "y": 0},
- {"matrix": [4, 3], "x": 9, "y": 0},
- {"matrix": [4, 2], "x": 10, "y": 0},
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [4, 0], "x": 12, "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": [5, 5], "x": 7, "y": 1},
- {"matrix": [5, 4], "x": 8, "y": 1},
- {"matrix": [5, 3], "x": 9, "y": 1},
- {"matrix": [5, 2], "x": 10, "y": 1},
- {"matrix": [5, 1], "x": 11, "y": 1},
- {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2},
- {"matrix": [6, 4], "x": 8, "y": 2},
- {"matrix": [6, 3], "x": 9, "y": 2},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 1], "x": 11, "y": 2},
- {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 3},
- {"matrix": [7, 4], "x": 8, "y": 3},
- {"matrix": [7, 3], "x": 9, "y": 3},
- {"matrix": [7, 2], "x": 10, "y": 3},
- {"matrix": [7, 1], "x": 11, "y": 3},
- {"matrix": [7, 0], "x": 12, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/flxlb/zplit/keyboard.json b/keyboards/flxlb/zplit/keyboard.json
new file mode 100644
index 00000000000..2d5c33f49f3
--- /dev/null
+++ b/keyboards/flxlb/zplit/keyboard.json
@@ -0,0 +1,114 @@
+{
+ "keyboard_name": "zplit",
+ "manufacturer": "fluxlab",
+ "url": "https://github.com/cccywj/qmk_firmware",
+ "maintainer": "flxlb",
+ "usb": {
+ "vid": "0x7076",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B3", "D6", "D7", "B4", "B5"],
+ "rows": ["D4", "F5", "F4", "F1"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B0", "pin_b": "D2"}
+ ]
+ },
+ "rgblight": {
+ "led_count": 16,
+ "led_map": [0, 1, 2, 3, 4, 5, 6, 7, 15, 14, 13, 12, 11, 10, 9, 8],
+ "split_count": [8, 8],
+ "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": {
+ "pin": "D3"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [4, 5], "x": 7, "y": 0},
+ {"matrix": [4, 4], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [4, 0], "x": 12, "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": [5, 5], "x": 7, "y": 1},
+ {"matrix": [5, 4], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1},
+ {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2},
+ {"matrix": [6, 4], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2},
+ {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 3},
+ {"matrix": [7, 4], "x": 8, "y": 3},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 0], "x": 12, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/flxlb/zplit/rules.mk b/keyboards/flxlb/zplit/rules.mk
deleted file mode 100644
index 7b181ca73e5..00000000000
--- a/keyboards/flxlb/zplit/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # 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
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/fortitude60/rev1/keyboard.json b/keyboards/fortitude60/rev1/keyboard.json
index 0ae02161cd5..f651c784247 100644
--- a/keyboards/fortitude60/rev1/keyboard.json
+++ b/keyboards/fortitude60/rev1/keyboard.json
@@ -24,10 +24,16 @@
"pin": "B5"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/fortitude60/rules.mk b/keyboards/fortitude60/rules.mk
index 9302b674251..ef158b8cf08 100644
--- a/keyboards/fortitude60/rules.mk
+++ b/keyboards/fortitude60/rules.mk
@@ -1,16 +1 @@
-# 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
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = fortitude60/rev1
diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json
index 0d2ce4aecac..4086ff969fe 100644
--- a/keyboards/fractal/info.json
+++ b/keyboards/fractal/info.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"community_layouts": ["ortho_5x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
diff --git a/keyboards/fractal/rules.mk b/keyboards/fractal/rules.mk
index ee623488daa..16051206467 100755
--- a/keyboards/fractal/rules.mk
+++ b/keyboards/fractal/rules.mk
@@ -1,15 +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
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json
index 2e99c5806b2..8a4aed19484 100644
--- a/keyboards/frobiac/blackbowl/info.json
+++ b/keyboards/frobiac/blackbowl/info.json
@@ -13,7 +13,9 @@
"dynamic_macro": true,
"extrakey": true,
"mousekey": true,
- "nkro": false
+ "nkro": false,
+ "ps2": true,
+ "ps2_mouse": true
},
"build": {
"lto": true
diff --git a/keyboards/frobiac/blackbowl/rules.mk b/keyboards/frobiac/blackbowl/rules.mk
index 4e81c7280cd..3b95c118432 100644
--- a/keyboards/frobiac/blackbowl/rules.mk
+++ b/keyboards/frobiac/blackbowl/rules.mk
@@ -4,6 +4,4 @@ CUSTOM_MATRIX = lite
I2C_DRIVER_REQUIRED = yes
SRC += matrix.c
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
PS2_DRIVER = usart
diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/info.json
deleted file mode 100644
index 4864e12fbcf..00000000000
--- a/keyboards/frooastboard/walnut/info.json
+++ /dev/null
@@ -1,301 +0,0 @@
-{
- "keyboard_name": "Frooastboard Walnut",
- "manufacturer": "Frooastside",
- "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/walnut",
- "maintainer": "Frooastside",
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": false,
- "mousekey": false,
- "nkro": true
- },
- "rgb_matrix": {
- "animations": {
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true
- },
- "default": {
- "animation": "rainbow_moving_chevron",
- "speed": 191
- },
- "driver": "is31fl3737",
- "max_brightness": 191,
- "sleep": true
- },
- "build": {
- "lto": true
- },
- "matrix_pins": {
- "cols": ["B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"],
- "rows": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "F1", "F0"]
- },
- "usb": {
- "vid": "0x4642",
- "pid": "0x776E",
- "device_version": "1.0.0"
- },
- "community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_iso"],
- "layout_aliases": {
- "LAYOUT_ansi": "LAYOUT_tkl_nofrow_ansi",
- "LAYOUT_iso": "LAYOUT_tkl_nofrow_iso"
- },
- "layouts": {
- "LAYOUT_tkl_nofrow_ansi": {
- "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": [1, 0], "x": 8, "y": 0},
- {"matrix": [1, 1], "x": 9, "y": 0},
- {"matrix": [1, 2], "x": 10, "y": 0},
- {"matrix": [1, 3], "x": 11, "y": 0},
- {"matrix": [1, 4], "x": 12, "y": 0},
- {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
- {"matrix": [5, 5], "x": 15.5, "y": 0},
- {"matrix": [5, 6], "x": 16.5, "y": 0},
- {"matrix": [5, 7], "x": 17.5, "y": 0},
- {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 1},
- {"matrix": [2, 2], "x": 2.5, "y": 1},
- {"matrix": [2, 3], "x": 3.5, "y": 1},
- {"matrix": [2, 4], "x": 4.5, "y": 1},
- {"matrix": [2, 5], "x": 5.5, "y": 1},
- {"matrix": [2, 6], "x": 6.5, "y": 1},
- {"matrix": [2, 7], "x": 7.5, "y": 1},
- {"matrix": [3, 0], "x": 8.5, "y": 1},
- {"matrix": [3, 1], "x": 9.5, "y": 1},
- {"matrix": [3, 2], "x": 10.5, "y": 1},
- {"matrix": [3, 3], "x": 11.5, "y": 1},
- {"matrix": [3, 4], "x": 12.5, "y": 1},
- {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [7, 5], "x": 15.5, "y": 1},
- {"matrix": [7, 6], "x": 16.5, "y": 1},
- {"matrix": [7, 7], "x": 17.5, "y": 1},
- {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [4, 1], "x": 1.75, "y": 2},
- {"matrix": [4, 2], "x": 2.75, "y": 2},
- {"matrix": [4, 3], "x": 3.75, "y": 2},
- {"matrix": [4, 4], "x": 4.75, "y": 2},
- {"matrix": [4, 5], "x": 5.75, "y": 2},
- {"matrix": [4, 6], "x": 6.75, "y": 2},
- {"matrix": [4, 7], "x": 7.75, "y": 2},
- {"matrix": [5, 0], "x": 8.75, "y": 2},
- {"matrix": [5, 1], "x": 9.75, "y": 2},
- {"matrix": [5, 2], "x": 10.75, "y": 2},
- {"matrix": [5, 3], "x": 11.75, "y": 2},
- {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [6, 2], "x": 2.25, "y": 3},
- {"matrix": [6, 3], "x": 3.25, "y": 3},
- {"matrix": [6, 4], "x": 4.25, "y": 3},
- {"matrix": [6, 5], "x": 5.25, "y": 3},
- {"matrix": [6, 6], "x": 6.25, "y": 3},
- {"matrix": [6, 7], "x": 7.25, "y": 3},
- {"matrix": [7, 0], "x": 8.25, "y": 3},
- {"matrix": [7, 1], "x": 9.25, "y": 3},
- {"matrix": [7, 2], "x": 10.25, "y": 3},
- {"matrix": [7, 3], "x": 11.25, "y": 3},
- {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
- {"matrix": [3, 6], "x": 16.5, "y": 3},
- {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
- {"matrix": [1, 6], "x": 15.5, "y": 4},
- {"matrix": [3, 7], "x": 16.5, "y": 4},
- {"matrix": [1, 7], "x": 17.5, "y": 4}
- ]
- },
- "LAYOUT_tkl_nofrow_iso": {
- "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": [1, 0], "x": 8, "y": 0},
- {"matrix": [1, 1], "x": 9, "y": 0},
- {"matrix": [1, 2], "x": 10, "y": 0},
- {"matrix": [1, 3], "x": 11, "y": 0},
- {"matrix": [1, 4], "x": 12, "y": 0},
- {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
- {"matrix": [5, 5], "x": 15.5, "y": 0},
- {"matrix": [5, 6], "x": 16.5, "y": 0},
- {"matrix": [5, 7], "x": 17.5, "y": 0},
- {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 1},
- {"matrix": [2, 2], "x": 2.5, "y": 1},
- {"matrix": [2, 3], "x": 3.5, "y": 1},
- {"matrix": [2, 4], "x": 4.5, "y": 1},
- {"matrix": [2, 5], "x": 5.5, "y": 1},
- {"matrix": [2, 6], "x": 6.5, "y": 1},
- {"matrix": [2, 7], "x": 7.5, "y": 1},
- {"matrix": [3, 0], "x": 8.5, "y": 1},
- {"matrix": [3, 1], "x": 9.5, "y": 1},
- {"matrix": [3, 2], "x": 10.5, "y": 1},
- {"matrix": [3, 3], "x": 11.5, "y": 1},
- {"matrix": [3, 4], "x": 12.5, "y": 1},
- {"matrix": [7, 5], "x": 15.5, "y": 1},
- {"matrix": [7, 6], "x": 16.5, "y": 1},
- {"matrix": [7, 7], "x": 17.5, "y": 1},
- {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [4, 1], "x": 1.75, "y": 2},
- {"matrix": [4, 2], "x": 2.75, "y": 2},
- {"matrix": [4, 3], "x": 3.75, "y": 2},
- {"matrix": [4, 4], "x": 4.75, "y": 2},
- {"matrix": [4, 5], "x": 5.75, "y": 2},
- {"matrix": [4, 6], "x": 6.75, "y": 2},
- {"matrix": [4, 7], "x": 7.75, "y": 2},
- {"matrix": [5, 0], "x": 8.75, "y": 2},
- {"matrix": [5, 1], "x": 9.75, "y": 2},
- {"matrix": [5, 2], "x": 10.75, "y": 2},
- {"matrix": [5, 3], "x": 11.75, "y": 2},
- {"matrix": [5, 4], "x": 12.75, "y": 2},
- {"matrix": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
- {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [6, 1], "x": 1.25, "y": 3},
- {"matrix": [6, 2], "x": 2.25, "y": 3},
- {"matrix": [6, 3], "x": 3.25, "y": 3},
- {"matrix": [6, 4], "x": 4.25, "y": 3},
- {"matrix": [6, 5], "x": 5.25, "y": 3},
- {"matrix": [6, 6], "x": 6.25, "y": 3},
- {"matrix": [6, 7], "x": 7.25, "y": 3},
- {"matrix": [7, 0], "x": 8.25, "y": 3},
- {"matrix": [7, 1], "x": 9.25, "y": 3},
- {"matrix": [7, 2], "x": 10.25, "y": 3},
- {"matrix": [7, 3], "x": 11.25, "y": 3},
- {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
- {"matrix": [3, 6], "x": 16.5, "y": 3},
- {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
- {"matrix": [1, 6], "x": 15.5, "y": 4},
- {"matrix": [3, 7], "x": 16.5, "y": 4},
- {"matrix": [1, 7], "x": 17.5, "y": 4}
- ]
- },
- "LAYOUT_all": {
- "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": [1, 0], "x": 8, "y": 0},
- {"matrix": [1, 1], "x": 9, "y": 0},
- {"matrix": [1, 2], "x": 10, "y": 0},
- {"matrix": [1, 3], "x": 11, "y": 0},
- {"matrix": [1, 4], "x": 12, "y": 0},
- {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
- {"matrix": [5, 5], "x": 15.5, "y": 0},
- {"matrix": [5, 6], "x": 16.5, "y": 0},
- {"matrix": [5, 7], "x": 17.5, "y": 0},
- {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 1},
- {"matrix": [2, 2], "x": 2.5, "y": 1},
- {"matrix": [2, 3], "x": 3.5, "y": 1},
- {"matrix": [2, 4], "x": 4.5, "y": 1},
- {"matrix": [2, 5], "x": 5.5, "y": 1},
- {"matrix": [2, 6], "x": 6.5, "y": 1},
- {"matrix": [2, 7], "x": 7.5, "y": 1},
- {"matrix": [3, 0], "x": 8.5, "y": 1},
- {"matrix": [3, 1], "x": 9.5, "y": 1},
- {"matrix": [3, 2], "x": 10.5, "y": 1},
- {"matrix": [3, 3], "x": 11.5, "y": 1},
- {"matrix": [3, 4], "x": 12.5, "y": 1},
- {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [7, 5], "x": 15.5, "y": 1},
- {"matrix": [7, 6], "x": 16.5, "y": 1},
- {"matrix": [7, 7], "x": 17.5, "y": 1},
- {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [4, 1], "x": 1.75, "y": 2},
- {"matrix": [4, 2], "x": 2.75, "y": 2},
- {"matrix": [4, 3], "x": 3.75, "y": 2},
- {"matrix": [4, 4], "x": 4.75, "y": 2},
- {"matrix": [4, 5], "x": 5.75, "y": 2},
- {"matrix": [4, 6], "x": 6.75, "y": 2},
- {"matrix": [4, 7], "x": 7.75, "y": 2},
- {"matrix": [5, 0], "x": 8.75, "y": 2},
- {"matrix": [5, 1], "x": 9.75, "y": 2},
- {"matrix": [5, 2], "x": 10.75, "y": 2},
- {"matrix": [5, 3], "x": 11.75, "y": 2},
- {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [6, 1], "x": 1.25, "y": 3},
- {"matrix": [6, 2], "x": 2.25, "y": 3},
- {"matrix": [6, 3], "x": 3.25, "y": 3},
- {"matrix": [6, 4], "x": 4.25, "y": 3},
- {"matrix": [6, 5], "x": 5.25, "y": 3},
- {"matrix": [6, 6], "x": 6.25, "y": 3},
- {"matrix": [6, 7], "x": 7.25, "y": 3},
- {"matrix": [7, 0], "x": 8.25, "y": 3},
- {"matrix": [7, 1], "x": 9.25, "y": 3},
- {"matrix": [7, 2], "x": 10.25, "y": 3},
- {"matrix": [7, 3], "x": 11.25, "y": 3},
- {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
- {"matrix": [3, 6], "x": 16.5, "y": 3},
- {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
- {"matrix": [1, 6], "x": 15.5, "y": 4},
- {"matrix": [3, 7], "x": 16.5, "y": 4},
- {"matrix": [1, 7], "x": 17.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/frooastboard/walnut/keyboard.json b/keyboards/frooastboard/walnut/keyboard.json
new file mode 100644
index 00000000000..4387452d381
--- /dev/null
+++ b/keyboards/frooastboard/walnut/keyboard.json
@@ -0,0 +1,302 @@
+{
+ "keyboard_name": "Frooastboard Walnut",
+ "manufacturer": "Frooastside",
+ "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/walnut",
+ "maintainer": "Frooastside",
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "rgb_matrix": {
+ "animations": {
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true
+ },
+ "default": {
+ "animation": "rainbow_moving_chevron",
+ "speed": 191
+ },
+ "driver": "is31fl3737",
+ "max_brightness": 191,
+ "sleep": true
+ },
+ "build": {
+ "lto": true
+ },
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"],
+ "rows": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "F1", "F0"]
+ },
+ "usb": {
+ "vid": "0x4642",
+ "pid": "0x776E",
+ "device_version": "1.0.0"
+ },
+ "community_layouts": ["tkl_nofrow_ansi", "tkl_nofrow_iso"],
+ "layout_aliases": {
+ "LAYOUT_ansi": "LAYOUT_tkl_nofrow_ansi",
+ "LAYOUT_iso": "LAYOUT_tkl_nofrow_iso"
+ },
+ "layouts": {
+ "LAYOUT_tkl_nofrow_ansi": {
+ "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": [1, 0], "x": 8, "y": 0},
+ {"matrix": [1, 1], "x": 9, "y": 0},
+ {"matrix": [1, 2], "x": 10, "y": 0},
+ {"matrix": [1, 3], "x": 11, "y": 0},
+ {"matrix": [1, 4], "x": 12, "y": 0},
+ {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+ {"matrix": [5, 5], "x": 15.5, "y": 0},
+ {"matrix": [5, 6], "x": 16.5, "y": 0},
+ {"matrix": [5, 7], "x": 17.5, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [2, 2], "x": 2.5, "y": 1},
+ {"matrix": [2, 3], "x": 3.5, "y": 1},
+ {"matrix": [2, 4], "x": 4.5, "y": 1},
+ {"matrix": [2, 5], "x": 5.5, "y": 1},
+ {"matrix": [2, 6], "x": 6.5, "y": 1},
+ {"matrix": [2, 7], "x": 7.5, "y": 1},
+ {"matrix": [3, 0], "x": 8.5, "y": 1},
+ {"matrix": [3, 1], "x": 9.5, "y": 1},
+ {"matrix": [3, 2], "x": 10.5, "y": 1},
+ {"matrix": [3, 3], "x": 11.5, "y": 1},
+ {"matrix": [3, 4], "x": 12.5, "y": 1},
+ {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [7, 5], "x": 15.5, "y": 1},
+ {"matrix": [7, 6], "x": 16.5, "y": 1},
+ {"matrix": [7, 7], "x": 17.5, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [4, 2], "x": 2.75, "y": 2},
+ {"matrix": [4, 3], "x": 3.75, "y": 2},
+ {"matrix": [4, 4], "x": 4.75, "y": 2},
+ {"matrix": [4, 5], "x": 5.75, "y": 2},
+ {"matrix": [4, 6], "x": 6.75, "y": 2},
+ {"matrix": [4, 7], "x": 7.75, "y": 2},
+ {"matrix": [5, 0], "x": 8.75, "y": 2},
+ {"matrix": [5, 1], "x": 9.75, "y": 2},
+ {"matrix": [5, 2], "x": 10.75, "y": 2},
+ {"matrix": [5, 3], "x": 11.75, "y": 2},
+ {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 2.25, "y": 3},
+ {"matrix": [6, 3], "x": 3.25, "y": 3},
+ {"matrix": [6, 4], "x": 4.25, "y": 3},
+ {"matrix": [6, 5], "x": 5.25, "y": 3},
+ {"matrix": [6, 6], "x": 6.25, "y": 3},
+ {"matrix": [6, 7], "x": 7.25, "y": 3},
+ {"matrix": [7, 0], "x": 8.25, "y": 3},
+ {"matrix": [7, 1], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [7, 3], "x": 11.25, "y": 3},
+ {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 6], "x": 16.5, "y": 3},
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [1, 6], "x": 15.5, "y": 4},
+ {"matrix": [3, 7], "x": 16.5, "y": 4},
+ {"matrix": [1, 7], "x": 17.5, "y": 4}
+ ]
+ },
+ "LAYOUT_tkl_nofrow_iso": {
+ "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": [1, 0], "x": 8, "y": 0},
+ {"matrix": [1, 1], "x": 9, "y": 0},
+ {"matrix": [1, 2], "x": 10, "y": 0},
+ {"matrix": [1, 3], "x": 11, "y": 0},
+ {"matrix": [1, 4], "x": 12, "y": 0},
+ {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+ {"matrix": [5, 5], "x": 15.5, "y": 0},
+ {"matrix": [5, 6], "x": 16.5, "y": 0},
+ {"matrix": [5, 7], "x": 17.5, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [2, 2], "x": 2.5, "y": 1},
+ {"matrix": [2, 3], "x": 3.5, "y": 1},
+ {"matrix": [2, 4], "x": 4.5, "y": 1},
+ {"matrix": [2, 5], "x": 5.5, "y": 1},
+ {"matrix": [2, 6], "x": 6.5, "y": 1},
+ {"matrix": [2, 7], "x": 7.5, "y": 1},
+ {"matrix": [3, 0], "x": 8.5, "y": 1},
+ {"matrix": [3, 1], "x": 9.5, "y": 1},
+ {"matrix": [3, 2], "x": 10.5, "y": 1},
+ {"matrix": [3, 3], "x": 11.5, "y": 1},
+ {"matrix": [3, 4], "x": 12.5, "y": 1},
+ {"matrix": [7, 5], "x": 15.5, "y": 1},
+ {"matrix": [7, 6], "x": 16.5, "y": 1},
+ {"matrix": [7, 7], "x": 17.5, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [4, 2], "x": 2.75, "y": 2},
+ {"matrix": [4, 3], "x": 3.75, "y": 2},
+ {"matrix": [4, 4], "x": 4.75, "y": 2},
+ {"matrix": [4, 5], "x": 5.75, "y": 2},
+ {"matrix": [4, 6], "x": 6.75, "y": 2},
+ {"matrix": [4, 7], "x": 7.75, "y": 2},
+ {"matrix": [5, 0], "x": 8.75, "y": 2},
+ {"matrix": [5, 1], "x": 9.75, "y": 2},
+ {"matrix": [5, 2], "x": 10.75, "y": 2},
+ {"matrix": [5, 3], "x": 11.75, "y": 2},
+ {"matrix": [5, 4], "x": 12.75, "y": 2},
+ {"matrix": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [6, 1], "x": 1.25, "y": 3},
+ {"matrix": [6, 2], "x": 2.25, "y": 3},
+ {"matrix": [6, 3], "x": 3.25, "y": 3},
+ {"matrix": [6, 4], "x": 4.25, "y": 3},
+ {"matrix": [6, 5], "x": 5.25, "y": 3},
+ {"matrix": [6, 6], "x": 6.25, "y": 3},
+ {"matrix": [6, 7], "x": 7.25, "y": 3},
+ {"matrix": [7, 0], "x": 8.25, "y": 3},
+ {"matrix": [7, 1], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [7, 3], "x": 11.25, "y": 3},
+ {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 6], "x": 16.5, "y": 3},
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [1, 6], "x": 15.5, "y": 4},
+ {"matrix": [3, 7], "x": 16.5, "y": 4},
+ {"matrix": [1, 7], "x": 17.5, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "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": [1, 0], "x": 8, "y": 0},
+ {"matrix": [1, 1], "x": 9, "y": 0},
+ {"matrix": [1, 2], "x": 10, "y": 0},
+ {"matrix": [1, 3], "x": 11, "y": 0},
+ {"matrix": [1, 4], "x": 12, "y": 0},
+ {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
+ {"matrix": [5, 5], "x": 15.5, "y": 0},
+ {"matrix": [5, 6], "x": 16.5, "y": 0},
+ {"matrix": [5, 7], "x": 17.5, "y": 0},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [2, 2], "x": 2.5, "y": 1},
+ {"matrix": [2, 3], "x": 3.5, "y": 1},
+ {"matrix": [2, 4], "x": 4.5, "y": 1},
+ {"matrix": [2, 5], "x": 5.5, "y": 1},
+ {"matrix": [2, 6], "x": 6.5, "y": 1},
+ {"matrix": [2, 7], "x": 7.5, "y": 1},
+ {"matrix": [3, 0], "x": 8.5, "y": 1},
+ {"matrix": [3, 1], "x": 9.5, "y": 1},
+ {"matrix": [3, 2], "x": 10.5, "y": 1},
+ {"matrix": [3, 3], "x": 11.5, "y": 1},
+ {"matrix": [3, 4], "x": 12.5, "y": 1},
+ {"matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [7, 5], "x": 15.5, "y": 1},
+ {"matrix": [7, 6], "x": 16.5, "y": 1},
+ {"matrix": [7, 7], "x": 17.5, "y": 1},
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [4, 2], "x": 2.75, "y": 2},
+ {"matrix": [4, 3], "x": 3.75, "y": 2},
+ {"matrix": [4, 4], "x": 4.75, "y": 2},
+ {"matrix": [4, 5], "x": 5.75, "y": 2},
+ {"matrix": [4, 6], "x": 6.75, "y": 2},
+ {"matrix": [4, 7], "x": 7.75, "y": 2},
+ {"matrix": [5, 0], "x": 8.75, "y": 2},
+ {"matrix": [5, 1], "x": 9.75, "y": 2},
+ {"matrix": [5, 2], "x": 10.75, "y": 2},
+ {"matrix": [5, 3], "x": 11.75, "y": 2},
+ {"matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [6, 1], "x": 1.25, "y": 3},
+ {"matrix": [6, 2], "x": 2.25, "y": 3},
+ {"matrix": [6, 3], "x": 3.25, "y": 3},
+ {"matrix": [6, 4], "x": 4.25, "y": 3},
+ {"matrix": [6, 5], "x": 5.25, "y": 3},
+ {"matrix": [6, 6], "x": 6.25, "y": 3},
+ {"matrix": [6, 7], "x": 7.25, "y": 3},
+ {"matrix": [7, 0], "x": 8.25, "y": 3},
+ {"matrix": [7, 1], "x": 9.25, "y": 3},
+ {"matrix": [7, 2], "x": 10.25, "y": 3},
+ {"matrix": [7, 3], "x": 11.25, "y": 3},
+ {"matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 6], "x": 16.5, "y": 3},
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [1, 6], "x": 15.5, "y": 4},
+ {"matrix": [3, 7], "x": 16.5, "y": 4},
+ {"matrix": [1, 7], "x": 17.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/frooastboard/walnut/rules.mk b/keyboards/frooastboard/walnut/rules.mk
deleted file mode 100644
index c529890fb51..00000000000
--- a/keyboards/frooastboard/walnut/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix
diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
deleted file mode 100644
index d153f9f834a..00000000000
--- a/keyboards/fungo/rev1/info.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
- "keyboard_name": "FungoSplit",
- "manufacturer": "Fungo",
- "url": "https://github.com/bojiguard/",
- "maintainer": "@bojiguard",
- "usb": {
- "vid": "0x5892",
- "pid": "0x1233",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
- "rows": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "io_delay": 15
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D3",
- "matrix_pins": {
- "right": {
- "cols": ["F7", "F6", "F5", "F4", "B5", "B4", "E6"],
- "rows": ["D1", "D0", "D4", "C6", "D7", "D3"]
- }
- }
- },
- "qmk": {
- "tap_keycode_delay": 50
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "debounce": 3,
- "tapping": {
- "toggle": 3
- },
- "layout_aliases": {
- "LAYOUT_fungo_split_num": "LAYOUT"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375},
- {"matrix": [0, 1], "x": 1, "y": 0.375},
- {"matrix": [0, 2], "x": 2, "y": 0.125},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.125},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
- {"matrix": [0, 6], "x": 6, "y": 0.5},
-
- {"matrix": [6, 0], "x": 12, "y": 0.5},
- {"matrix": [6, 1], "x": 13, "y": 0.25},
- {"matrix": [6, 2], "x": 14, "y": 0.125},
- {"matrix": [6, 3], "x": 15, "y": 0},
- {"matrix": [6, 4], "x": 16, "y": 0.125},
- {"matrix": [6, 5], "x": 17, "y": 0.375},
- {"matrix": [6, 6], "x": 18, "y": 0.375},
-
- {"matrix": [1, 0], "x": 0, "y": 1.375},
- {"matrix": [1, 1], "x": 1, "y": 1.375},
- {"matrix": [1, 2], "x": 2, "y": 1.125},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.125},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
-
- {"matrix": [7, 0], "x": 12, "y": 1.5},
- {"matrix": [7, 1], "x": 13, "y": 1.25},
- {"matrix": [7, 2], "x": 14, "y": 1.125},
- {"matrix": [7, 3], "x": 15, "y": 1},
- {"matrix": [7, 4], "x": 16, "y": 1.125},
- {"matrix": [7, 5], "x": 17, "y": 1.375},
- {"matrix": [7, 6], "x": 18, "y": 1.375},
-
- {"matrix": [2, 0], "x": 0, "y": 2.375},
- {"matrix": [2, 1], "x": 1, "y": 2.375},
- {"matrix": [2, 2], "x": 2, "y": 2.125},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.125},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
- {"matrix": [2, 6], "x": 6, "y": 2.5},
-
- {"matrix": [8, 0], "x": 12, "y": 2.5},
- {"matrix": [8, 1], "x": 13, "y": 2.25},
- {"matrix": [8, 2], "x": 14, "y": 2.125},
- {"matrix": [8, 3], "x": 15, "y": 2},
- {"matrix": [8, 4], "x": 16, "y": 2.125},
- {"matrix": [8, 5], "x": 17, "y": 2.375},
- {"matrix": [8, 6], "x": 18, "y": 2.375},
-
- {"matrix": [3, 0], "x": 0, "y": 3.375},
- {"matrix": [3, 1], "x": 1, "y": 3.375},
- {"matrix": [3, 2], "x": 2, "y": 3.125},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3.125},
- {"matrix": [3, 5], "x": 5, "y": 3.25},
- {"matrix": [3, 6], "x": 6, "y": 3.5},
- {"matrix": [4, 6], "x": 7, "y": 4.25},
- {"matrix": [5, 2], "x": 8, "y": 4.5},
-
- {"matrix": [11, 4], "x": 10, "y": 4.5},
- {"matrix": [10, 0], "x": 11, "y": 4.25},
- {"matrix": [9, 0], "x": 12, "y": 3.5},
- {"matrix": [9, 1], "x": 13, "y": 3.25},
- {"matrix": [9, 2], "x": 14, "y": 3.125},
- {"matrix": [9, 3], "x": 15, "y": 3},
- {"matrix": [9, 4], "x": 16, "y": 3.125},
- {"matrix": [9, 5], "x": 17, "y": 3.375},
- {"matrix": [9, 6], "x": 18, "y": 3.375},
-
- {"matrix": [5, 0], "x": 0, "y": 4.375},
- {"matrix": [5, 1], "x": 1, "y": 4.375},
- {"matrix": [4, 0], "x": 2, "y": 4.25},
- {"matrix": [4, 1], "x": 3.25, "y": 4.25},
- {"matrix": [4, 2], "x": 4.5, "y": 4.5},
- {"matrix": [4, 3], "x": 5.75, "y": 5},
- {"matrix": [4, 4], "x": 7, "y": 5.25},
- {"matrix": [4, 5], "x": 8, "y": 5.5},
-
- {"matrix": [10, 1], "x": 10, "y": 5.5},
- {"matrix": [10, 2], "x": 11, "y": 5.25},
- {"matrix": [10, 3], "x": 12.25, "y": 5},
- {"matrix": [10, 4], "x": 13.5, "y": 4.5},
- {"matrix": [10, 5], "x": 14.75, "y": 4.25},
- {"matrix": [10, 6], "x": 16, "y": 4.25},
- {"matrix": [11, 5], "x": 17, "y": 4.375},
- {"matrix": [11, 6], "x": 18, "y": 4.375}
- ]
- }
- }
-}
diff --git a/keyboards/fungo/rev1/keyboard.json b/keyboards/fungo/rev1/keyboard.json
new file mode 100644
index 00000000000..988ba0f6431
--- /dev/null
+++ b/keyboards/fungo/rev1/keyboard.json
@@ -0,0 +1,139 @@
+{
+ "keyboard_name": "FungoSplit",
+ "manufacturer": "Fungo",
+ "url": "https://github.com/bojiguard/",
+ "maintainer": "@bojiguard",
+ "usb": {
+ "vid": "0x5892",
+ "pid": "0x1233",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "key_lock": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "io_delay": 15
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F7", "F6", "F5", "F4", "B5", "B4", "E6"],
+ "rows": ["D1", "D0", "D4", "C6", "D7", "D3"]
+ }
+ }
+ },
+ "qmk": {
+ "tap_keycode_delay": 50
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "debounce": 3,
+ "tapping": {
+ "toggle": 3
+ },
+ "layout_aliases": {
+ "LAYOUT_fungo_split_num": "LAYOUT"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+ {"matrix": [6, 0], "x": 12, "y": 0.5},
+ {"matrix": [6, 1], "x": 13, "y": 0.25},
+ {"matrix": [6, 2], "x": 14, "y": 0.125},
+ {"matrix": [6, 3], "x": 15, "y": 0},
+ {"matrix": [6, 4], "x": 16, "y": 0.125},
+ {"matrix": [6, 5], "x": 17, "y": 0.375},
+ {"matrix": [6, 6], "x": 18, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+ {"matrix": [7, 0], "x": 12, "y": 1.5},
+ {"matrix": [7, 1], "x": 13, "y": 1.25},
+ {"matrix": [7, 2], "x": 14, "y": 1.125},
+ {"matrix": [7, 3], "x": 15, "y": 1},
+ {"matrix": [7, 4], "x": 16, "y": 1.125},
+ {"matrix": [7, 5], "x": 17, "y": 1.375},
+ {"matrix": [7, 6], "x": 18, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.5},
+
+ {"matrix": [8, 0], "x": 12, "y": 2.5},
+ {"matrix": [8, 1], "x": 13, "y": 2.25},
+ {"matrix": [8, 2], "x": 14, "y": 2.125},
+ {"matrix": [8, 3], "x": 15, "y": 2},
+ {"matrix": [8, 4], "x": 16, "y": 2.125},
+ {"matrix": [8, 5], "x": 17, "y": 2.375},
+ {"matrix": [8, 6], "x": 18, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 3.5},
+ {"matrix": [4, 6], "x": 7, "y": 4.25},
+ {"matrix": [5, 2], "x": 8, "y": 4.5},
+
+ {"matrix": [11, 4], "x": 10, "y": 4.5},
+ {"matrix": [10, 0], "x": 11, "y": 4.25},
+ {"matrix": [9, 0], "x": 12, "y": 3.5},
+ {"matrix": [9, 1], "x": 13, "y": 3.25},
+ {"matrix": [9, 2], "x": 14, "y": 3.125},
+ {"matrix": [9, 3], "x": 15, "y": 3},
+ {"matrix": [9, 4], "x": 16, "y": 3.125},
+ {"matrix": [9, 5], "x": 17, "y": 3.375},
+ {"matrix": [9, 6], "x": 18, "y": 3.375},
+
+ {"matrix": [5, 0], "x": 0, "y": 4.375},
+ {"matrix": [5, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 0], "x": 2, "y": 4.25},
+ {"matrix": [4, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 4.5},
+ {"matrix": [4, 3], "x": 5.75, "y": 5},
+ {"matrix": [4, 4], "x": 7, "y": 5.25},
+ {"matrix": [4, 5], "x": 8, "y": 5.5},
+
+ {"matrix": [10, 1], "x": 10, "y": 5.5},
+ {"matrix": [10, 2], "x": 11, "y": 5.25},
+ {"matrix": [10, 3], "x": 12.25, "y": 5},
+ {"matrix": [10, 4], "x": 13.5, "y": 4.5},
+ {"matrix": [10, 5], "x": 14.75, "y": 4.25},
+ {"matrix": [10, 6], "x": 16, "y": 4.25},
+ {"matrix": [11, 5], "x": 17, "y": 4.375},
+ {"matrix": [11, 6], "x": 18, "y": 4.375}
+ ]
+ }
+ }
+}
diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk
deleted file mode 100644
index e8d7a7aed53..00000000000
--- a/keyboards/fungo/rev1/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-KEY_LOCK_ENABLE = yes # kc_lock use
-
-
-OLED_ENABLE = no
-SPLIT_KEYBOARD = yes # split type
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index 80558ad6929..1d13c2458a7 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
@@ -10,6 +10,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
"tapping": {
"toggle": 1
},
diff --git a/keyboards/gboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk
index 6fbefbd22d7..5d025b31ef2 100644
--- a/keyboards/gboards/ergotaco/rules.mk
+++ b/keyboards/gboards/ergotaco/rules.mk
@@ -1,7 +1,4 @@
CUSTOM_MATRIX = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = yes
-COMMAND_ENABLE = yes
# A bunch of stuff that you shouldn't touch unless you
# know what you're doing.
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json
index 51737f75af8..066797a2415 100644
--- a/keyboards/gboards/georgi/info.json
+++ b/keyboards/gboards/georgi/info.json
@@ -11,6 +11,17 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "nkro": true,
+ "steno": true
+ },
+ "build": {
+ "lto": true
+ },
"tapping": {
"toggle": 2
},
diff --git a/keyboards/gboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk
index 5b63e269fa5..42be966784a 100644
--- a/keyboards/gboards/georgi/rules.mk
+++ b/keyboards/gboards/georgi/rules.mk
@@ -1,18 +1,4 @@
-# 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 = yes # 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
CUSTOM_MATRIX = yes
-STENO_ENABLE = yes
-LTO_ENABLE = yes
SRC += matrix.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
+I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index bc53f2db5f0..e576ac8012e 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/keyboards/gboards/gergo/info.json
@@ -16,6 +16,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
"tapping": {
"toggle": 1
},
diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk
index d789b349da8..77c632bc1ca 100644
--- a/keyboards/gboards/gergo/rules.mk
+++ b/keyboards/gboards/gergo/rules.mk
@@ -2,10 +2,6 @@
# change yes to no to disable
#
CUSTOM_MATRIX = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = yes
-COMMAND_ENABLE = yes
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
index c5f6be47509..cf1e4513923 100644
--- a/keyboards/gboards/gergoplex/info.json
+++ b/keyboards/gboards/gergoplex/info.json
@@ -13,6 +13,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk
index 9846c64771e..6ae3f1122b1 100644
--- a/keyboards/gboards/gergoplex/rules.mk
+++ b/keyboards/gboards/gergoplex/rules.mk
@@ -1,15 +1,6 @@
# 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 = yes # 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
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
deleted file mode 100644
index 953e0bebc37..00000000000
--- a/keyboards/giabalanai/info.json
+++ /dev/null
@@ -1,316 +0,0 @@
-{
- "keyboard_name": "giabalanai",
- "manufacturer": "3araht",
- "url": "https://github.com/3araht",
- "maintainer": "3araht",
- "usb": {
- "vid": "0xFEED",
- "pid": "0xF4B0",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations" :{
- "gradient_up_down": true,
- "rainbow_moving_chevron": true,
- "hue_breathing": true,
- "solid_reactive": true,
- "multisplash": true
- },
- "driver": "ws2812",
- "max_brightness": 50
- },
- "rgblight": {
- "led_count": 123,
- "max_brightness": 80,
- "led_map": [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 97, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48]
- },
- "matrix_pins": {
- "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
- "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
- },
- "diode_direction": "COL2ROW",
- "features": {
- "midi": true,
- "extrakey": true,
- "encoder": true,
- "bootmagic": false,
- "console": false,
- "mousekey": false,
- "nkro": false
- },
- "encoder": {
- "rotary": []
- },
- "ws2812": {
- "pin": "D3"
- },
- "split": {
- "enabled": true,
- "soft_serial_pin": "D2",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "B6"}
- ]
- }
- },
- "matrix_pins": {
- "right": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"],
- "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
- }
- }
- },
- "qmk": {
- "tap_keycode_delay": 10
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [1, 0], "x": 1, "y": 0},
- {"matrix": [2, 0], "x": 2, "y": 0},
- {"matrix": [3, 0], "x": 3, "y": 0},
- {"matrix": [4, 0], "x": 4, "y": 0},
- {"matrix": [5, 0], "x": 5, "y": 0},
- {"matrix": [5, 5], "x": 6, "y": 0},
- {"matrix": [4, 5], "x": 7, "y": 0},
- {"matrix": [3, 5], "x": 8, "y": 0},
- {"matrix": [2, 5], "x": 9, "y": 0},
- {"matrix": [1, 5], "x": 10, "y": 0},
- {"matrix": [0, 5], "x": 11, "y": 0},
-
- {"matrix": [0, 1], "x": 0.5, "y": 1},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [2, 1], "x": 2.5, "y": 1},
- {"matrix": [3, 1], "x": 3.5, "y": 1},
- {"matrix": [4, 1], "x": 4.5, "y": 1},
- {"matrix": [5, 1], "x": 5.5, "y": 1},
- {"matrix": [5, 6], "x": 6.5, "y": 1},
- {"matrix": [4, 6], "x": 7.5, "y": 1},
- {"matrix": [3, 6], "x": 8.5, "y": 1},
- {"matrix": [2, 6], "x": 9.5, "y": 1},
- {"matrix": [1, 6], "x": 10.5, "y": 1},
- {"matrix": [0, 6], "x": 11.5, "y": 1},
-
- {"matrix": [0, 2], "x": 14.5, "y": 1},
-
- {"matrix": [1, 2], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [3, 2], "x": 3, "y": 2},
- {"matrix": [4, 2], "x": 4, "y": 2},
- {"matrix": [5, 2], "x": 5, "y": 2},
- {"matrix": [5, 7], "x": 6, "y": 2},
- {"matrix": [4, 7], "x": 7, "y": 2},
- {"matrix": [3, 7], "x": 8, "y": 2},
- {"matrix": [2, 7], "x": 9, "y": 2},
- {"matrix": [1, 7], "x": 10, "y": 2},
- {"matrix": [0, 7], "x": 11, "y": 2},
- {"matrix": [0, 3], "x": 12, "y": 2},
-
- {"matrix": [1, 3], "x": 15, "y": 2},
- {"matrix": [2, 3], "x": 16, "y": 2},
- {"matrix": [3, 3], "x": 17, "y": 2},
- {"matrix": [4, 3], "x": 18, "y": 2},
- {"matrix": [5, 3], "x": 19, "y": 2},
- {"matrix": [5, 8], "x": 20, "y": 2},
- {"matrix": [4, 8], "x": 21, "y": 2},
- {"matrix": [3, 8], "x": 22, "y": 2},
- {"matrix": [2, 8], "x": 23, "y": 2},
- {"matrix": [1, 8], "x": 24, "y": 2},
- {"matrix": [0, 8], "x": 25, "y": 2},
- {"matrix": [0, 4], "x": 26, "y": 2},
-
- {"matrix": [1, 4], "x": 27.5, "y": 2},
-
- {"matrix": [2, 4], "x": 1.5, "y": 3},
- {"matrix": [3, 4], "x": 2.5, "y": 3},
- {"matrix": [4, 4], "x": 3.5, "y": 3},
- {"matrix": [5, 4], "x": 4.5, "y": 3},
- {"matrix": [5, 9], "x": 5.5, "y": 3},
- {"matrix": [4, 9], "x": 6.5, "y": 3},
- {"matrix": [3, 9], "x": 7.5, "y": 3},
- {"matrix": [2, 9], "x": 8.5, "y": 3},
- {"matrix": [1, 9], "x": 9.5, "y": 3},
- {"matrix": [0, 9], "x": 10.5, "y": 3},
- {"matrix": [8, 0], "x": 11.5, "y": 3},
- {"matrix": [6, 0], "x": 12.5, "y": 3},
-
- {"matrix": [6, 1], "x": 14.5, "y": 3},
- {"matrix": [6, 2], "x": 15.5, "y": 3},
- {"matrix": [6, 3], "x": 16.5, "y": 3},
- {"matrix": [6, 4], "x": 17.5, "y": 3},
- {"matrix": [6, 5], "x": 18.5, "y": 3},
- {"matrix": [6, 6], "x": 19.5, "y": 3},
- {"matrix": [9, 6], "x": 20.5, "y": 3},
- {"matrix": [9, 5], "x": 21.5, "y": 3},
- {"matrix": [9, 4], "x": 22.5, "y": 3},
- {"matrix": [9, 3], "x": 23.5, "y": 3},
- {"matrix": [9, 2], "x": 24.5, "y": 3},
- {"matrix": [9, 1], "x": 25.5, "y": 3},
- {"matrix": [7, 0], "x": 26.5, "y": 3},
-
- {"matrix": [7, 1], "x": 2, "y": 4},
- {"matrix": [7, 2], "x": 3, "y": 4},
- {"matrix": [7, 3], "x": 4, "y": 4},
- {"matrix": [7, 4], "x": 5, "y": 4},
- {"matrix": [7, 5], "x": 6, "y": 4},
- {"matrix": [7, 6], "x": 7, "y": 4},
- {"matrix": [10, 6], "x": 8, "y": 4},
- {"matrix": [10, 5], "x": 9, "y": 4},
- {"matrix": [10, 4], "x": 10, "y": 4},
- {"matrix": [10, 3], "x": 11, "y": 4},
- {"matrix": [10, 2], "x": 12, "y": 4},
- {"matrix": [10, 1], "x": 13, "y": 4},
-
- {"matrix": [8, 1], "x": 15, "y": 4},
- {"matrix": [8, 2], "x": 16, "y": 4},
- {"matrix": [8, 3], "x": 17, "y": 4},
- {"matrix": [8, 4], "x": 18, "y": 4},
- {"matrix": [8, 5], "x": 19, "y": 4},
- {"matrix": [8, 6], "x": 20, "y": 4},
- {"matrix": [11, 6], "x": 21, "y": 4},
- {"matrix": [11, 5], "x": 22, "y": 4},
- {"matrix": [11, 4], "x": 23, "y": 4},
- {"matrix": [11, 3], "x": 24, "y": 4},
- {"matrix": [11, 2], "x": 25, "y": 4},
- {"matrix": [11, 1], "x": 26, "y": 4}
- ]
- },
- "LAYOUT_giabarinaix2": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [1, 0], "x": 1, "y": 0},
- {"matrix": [2, 0], "x": 2, "y": 0},
- {"matrix": [3, 0], "x": 3, "y": 0},
- {"matrix": [4, 0], "x": 4, "y": 0},
- {"matrix": [5, 0], "x": 5, "y": 0},
- {"matrix": [5, 5], "x": 6, "y": 0},
- {"matrix": [4, 5], "x": 7, "y": 0},
- {"matrix": [3, 5], "x": 8, "y": 0},
- {"matrix": [2, 5], "x": 9, "y": 0},
- {"matrix": [1, 5], "x": 10, "y": 0},
- {"matrix": [0, 5], "x": 11, "y": 0},
-
- {"matrix": [0, 1], "x": 0.5, "y": 1},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [2, 1], "x": 2.5, "y": 1},
- {"matrix": [3, 1], "x": 3.5, "y": 1},
- {"matrix": [4, 1], "x": 4.5, "y": 1},
- {"matrix": [5, 1], "x": 5.5, "y": 1},
- {"matrix": [5, 6], "x": 6.5, "y": 1},
- {"matrix": [4, 6], "x": 7.5, "y": 1},
- {"matrix": [3, 6], "x": 8.5, "y": 1},
- {"matrix": [2, 6], "x": 9.5, "y": 1},
- {"matrix": [1, 6], "x": 10.5, "y": 1},
- {"matrix": [0, 6], "x": 11.5, "y": 1},
-
- {"matrix": [0, 2], "x": 1, "y": 2},
- {"matrix": [1, 2], "x": 2, "y": 2},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [3, 2], "x": 4, "y": 2},
- {"matrix": [4, 2], "x": 5, "y": 2},
- {"matrix": [5, 2], "x": 6, "y": 2},
- {"matrix": [5, 7], "x": 7, "y": 2},
- {"matrix": [4, 7], "x": 8, "y": 2},
- {"matrix": [3, 7], "x": 9, "y": 2},
- {"matrix": [2, 7], "x": 10, "y": 2},
- {"matrix": [1, 7], "x": 11, "y": 2},
- {"matrix": [0, 7], "x": 12, "y": 2},
-
- {"matrix": [0, 3], "x": 1.5, "y": 3},
- {"matrix": [1, 3], "x": 2.5, "y": 3},
- {"matrix": [2, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [4, 3], "x": 5.5, "y": 3},
- {"matrix": [5, 3], "x": 6.5, "y": 3},
- {"matrix": [5, 8], "x": 7.5, "y": 3},
- {"matrix": [4, 8], "x": 8.5, "y": 3},
- {"matrix": [3, 8], "x": 9.5, "y": 3},
- {"matrix": [2, 8], "x": 10.5, "y": 3},
- {"matrix": [1, 8], "x": 11.5, "y": 3},
- {"matrix": [0, 8], "x": 12.5, "y": 3},
-
- {"matrix": [0, 4], "x": 2, "y": 4},
- {"matrix": [1, 4], "x": 3, "y": 4},
- {"matrix": [2, 4], "x": 4, "y": 4},
- {"matrix": [3, 4], "x": 5, "y": 4},
- {"matrix": [4, 4], "x": 6, "y": 4},
- {"matrix": [5, 4], "x": 7, "y": 4},
- {"matrix": [5, 9], "x": 8, "y": 4},
- {"matrix": [4, 9], "x": 9, "y": 4},
- {"matrix": [3, 9], "x": 10, "y": 4},
- {"matrix": [2, 9], "x": 11, "y": 4},
- {"matrix": [1, 9], "x": 12, "y": 4},
- {"matrix": [0, 9], "x": 13, "y": 4},
-
- {"matrix": [6, 9], "x": 0, "y": 6},
- {"matrix": [7, 9], "x": 1, "y": 6},
- {"matrix": [8, 9], "x": 2, "y": 6},
- {"matrix": [9, 9], "x": 3, "y": 6},
- {"matrix": [10, 9], "x": 4, "y": 6},
- {"matrix": [11, 9], "x": 5, "y": 6},
- {"matrix": [11, 4], "x": 6, "y": 6},
- {"matrix": [10, 4], "x": 7, "y": 6},
- {"matrix": [9, 4], "x": 8, "y": 6},
- {"matrix": [8, 4], "x": 9, "y": 6},
- {"matrix": [7, 4], "x": 10, "y": 6},
- {"matrix": [6, 4], "x": 11, "y": 6},
-
- {"matrix": [6, 8], "x": 0.5, "y": 7},
- {"matrix": [7, 8], "x": 1.5, "y": 7},
- {"matrix": [8, 8], "x": 2.5, "y": 7},
- {"matrix": [9, 8], "x": 3.5, "y": 7},
- {"matrix": [10, 8], "x": 4.5, "y": 7},
- {"matrix": [11, 8], "x": 5.5, "y": 7},
- {"matrix": [11, 3], "x": 6.5, "y": 7},
- {"matrix": [10, 3], "x": 7.5, "y": 7},
- {"matrix": [9, 3], "x": 8.5, "y": 7},
- {"matrix": [8, 3], "x": 9.5, "y": 7},
- {"matrix": [7, 3], "x": 10.5, "y": 7},
- {"matrix": [6, 3], "x": 11.5, "y": 7},
-
- {"matrix": [6, 7], "x": 1, "y": 8},
- {"matrix": [7, 7], "x": 2, "y": 8},
- {"matrix": [8, 7], "x": 3, "y": 8},
- {"matrix": [9, 7], "x": 4, "y": 8},
- {"matrix": [10, 7], "x": 5, "y": 8},
- {"matrix": [11, 7], "x": 6, "y": 8},
- {"matrix": [11, 2], "x": 7, "y": 8},
- {"matrix": [10, 2], "x": 8, "y": 8},
- {"matrix": [9, 2], "x": 9, "y": 8},
- {"matrix": [8, 2], "x": 10, "y": 8},
- {"matrix": [7, 2], "x": 11, "y": 8},
- {"matrix": [6, 2], "x": 12, "y": 8},
-
- {"matrix": [6, 6], "x": 1.5, "y": 9},
- {"matrix": [7, 6], "x": 2.5, "y": 9},
- {"matrix": [8, 6], "x": 3.5, "y": 9},
- {"matrix": [9, 6], "x": 4.5, "y": 9},
- {"matrix": [10, 6], "x": 5.5, "y": 9},
- {"matrix": [11, 6], "x": 6.5, "y": 9},
- {"matrix": [11, 1], "x": 7.5, "y": 9},
- {"matrix": [10, 1], "x": 8.5, "y": 9},
- {"matrix": [9, 1], "x": 9.5, "y": 9},
- {"matrix": [8, 1], "x": 10.5, "y": 9},
- {"matrix": [7, 1], "x": 11.5, "y": 9},
- {"matrix": [6, 1], "x": 12.5, "y": 9},
-
- {"matrix": [6, 5], "x": 2, "y": 10},
- {"matrix": [7, 5], "x": 3, "y": 10},
- {"matrix": [8, 5], "x": 4, "y": 10},
- {"matrix": [9, 5], "x": 5, "y": 10},
- {"matrix": [10, 5], "x": 6, "y": 10},
- {"matrix": [11, 5], "x": 7, "y": 10},
- {"matrix": [11, 0], "x": 8, "y": 10},
- {"matrix": [10, 0], "x": 9, "y": 10},
- {"matrix": [9, 0], "x": 10, "y": 10},
- {"matrix": [8, 0], "x": 11, "y": 10},
- {"matrix": [7, 0], "x": 12, "y": 10},
- {"matrix": [6, 0], "x": 13, "y": 10}
- ]
- }
- }
-}
diff --git a/keyboards/giabalanai/keyboard.json b/keyboards/giabalanai/keyboard.json
new file mode 100644
index 00000000000..ae5787cec6e
--- /dev/null
+++ b/keyboards/giabalanai/keyboard.json
@@ -0,0 +1,322 @@
+{
+ "keyboard_name": "giabalanai",
+ "manufacturer": "3araht",
+ "url": "https://github.com/3araht",
+ "maintainer": "3araht",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xF4B0",
+ "device_version": "0.0.1"
+ },
+ "rgb_matrix": {
+ "animations" :{
+ "gradient_up_down": true,
+ "rainbow_moving_chevron": true,
+ "hue_breathing": true,
+ "solid_reactive": true,
+ "multisplash": true
+ },
+ "driver": "ws2812",
+ "max_brightness": 50
+ },
+ "rgblight": {
+ "led_count": 123,
+ "max_brightness": 80,
+ "led_map": [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 97, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48]
+ },
+ "matrix_pins": {
+ "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"],
+ "rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "features": {
+ "midi": true,
+ "extrakey": true,
+ "encoder": true,
+ "bootmagic": false,
+ "console": false,
+ "mousekey": false,
+ "nkro": false,
+ "command": false,
+ "backlight": false,
+ "rgb_matrix": false
+ },
+ "build": {
+ "lto": true
+ },
+ "encoder": {
+ "rotary": []
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B6"}
+ ]
+ }
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"],
+ "rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
+ }
+ }
+ },
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0},
+ {"matrix": [4, 0], "x": 4, "y": 0},
+ {"matrix": [5, 0], "x": 5, "y": 0},
+ {"matrix": [5, 5], "x": 6, "y": 0},
+ {"matrix": [4, 5], "x": 7, "y": 0},
+ {"matrix": [3, 5], "x": 8, "y": 0},
+ {"matrix": [2, 5], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [0, 1], "x": 0.5, "y": 1},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1},
+ {"matrix": [5, 1], "x": 5.5, "y": 1},
+ {"matrix": [5, 6], "x": 6.5, "y": 1},
+ {"matrix": [4, 6], "x": 7.5, "y": 1},
+ {"matrix": [3, 6], "x": 8.5, "y": 1},
+ {"matrix": [2, 6], "x": 9.5, "y": 1},
+ {"matrix": [1, 6], "x": 10.5, "y": 1},
+ {"matrix": [0, 6], "x": 11.5, "y": 1},
+
+ {"matrix": [0, 2], "x": 14.5, "y": 1},
+
+ {"matrix": [1, 2], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [3, 2], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [5, 7], "x": 6, "y": 2},
+ {"matrix": [4, 7], "x": 7, "y": 2},
+ {"matrix": [3, 7], "x": 8, "y": 2},
+ {"matrix": [2, 7], "x": 9, "y": 2},
+ {"matrix": [1, 7], "x": 10, "y": 2},
+ {"matrix": [0, 7], "x": 11, "y": 2},
+ {"matrix": [0, 3], "x": 12, "y": 2},
+
+ {"matrix": [1, 3], "x": 15, "y": 2},
+ {"matrix": [2, 3], "x": 16, "y": 2},
+ {"matrix": [3, 3], "x": 17, "y": 2},
+ {"matrix": [4, 3], "x": 18, "y": 2},
+ {"matrix": [5, 3], "x": 19, "y": 2},
+ {"matrix": [5, 8], "x": 20, "y": 2},
+ {"matrix": [4, 8], "x": 21, "y": 2},
+ {"matrix": [3, 8], "x": 22, "y": 2},
+ {"matrix": [2, 8], "x": 23, "y": 2},
+ {"matrix": [1, 8], "x": 24, "y": 2},
+ {"matrix": [0, 8], "x": 25, "y": 2},
+ {"matrix": [0, 4], "x": 26, "y": 2},
+
+ {"matrix": [1, 4], "x": 27.5, "y": 2},
+
+ {"matrix": [2, 4], "x": 1.5, "y": 3},
+ {"matrix": [3, 4], "x": 2.5, "y": 3},
+ {"matrix": [4, 4], "x": 3.5, "y": 3},
+ {"matrix": [5, 4], "x": 4.5, "y": 3},
+ {"matrix": [5, 9], "x": 5.5, "y": 3},
+ {"matrix": [4, 9], "x": 6.5, "y": 3},
+ {"matrix": [3, 9], "x": 7.5, "y": 3},
+ {"matrix": [2, 9], "x": 8.5, "y": 3},
+ {"matrix": [1, 9], "x": 9.5, "y": 3},
+ {"matrix": [0, 9], "x": 10.5, "y": 3},
+ {"matrix": [8, 0], "x": 11.5, "y": 3},
+ {"matrix": [6, 0], "x": 12.5, "y": 3},
+
+ {"matrix": [6, 1], "x": 14.5, "y": 3},
+ {"matrix": [6, 2], "x": 15.5, "y": 3},
+ {"matrix": [6, 3], "x": 16.5, "y": 3},
+ {"matrix": [6, 4], "x": 17.5, "y": 3},
+ {"matrix": [6, 5], "x": 18.5, "y": 3},
+ {"matrix": [6, 6], "x": 19.5, "y": 3},
+ {"matrix": [9, 6], "x": 20.5, "y": 3},
+ {"matrix": [9, 5], "x": 21.5, "y": 3},
+ {"matrix": [9, 4], "x": 22.5, "y": 3},
+ {"matrix": [9, 3], "x": 23.5, "y": 3},
+ {"matrix": [9, 2], "x": 24.5, "y": 3},
+ {"matrix": [9, 1], "x": 25.5, "y": 3},
+ {"matrix": [7, 0], "x": 26.5, "y": 3},
+
+ {"matrix": [7, 1], "x": 2, "y": 4},
+ {"matrix": [7, 2], "x": 3, "y": 4},
+ {"matrix": [7, 3], "x": 4, "y": 4},
+ {"matrix": [7, 4], "x": 5, "y": 4},
+ {"matrix": [7, 5], "x": 6, "y": 4},
+ {"matrix": [7, 6], "x": 7, "y": 4},
+ {"matrix": [10, 6], "x": 8, "y": 4},
+ {"matrix": [10, 5], "x": 9, "y": 4},
+ {"matrix": [10, 4], "x": 10, "y": 4},
+ {"matrix": [10, 3], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 12, "y": 4},
+ {"matrix": [10, 1], "x": 13, "y": 4},
+
+ {"matrix": [8, 1], "x": 15, "y": 4},
+ {"matrix": [8, 2], "x": 16, "y": 4},
+ {"matrix": [8, 3], "x": 17, "y": 4},
+ {"matrix": [8, 4], "x": 18, "y": 4},
+ {"matrix": [8, 5], "x": 19, "y": 4},
+ {"matrix": [8, 6], "x": 20, "y": 4},
+ {"matrix": [11, 6], "x": 21, "y": 4},
+ {"matrix": [11, 5], "x": 22, "y": 4},
+ {"matrix": [11, 4], "x": 23, "y": 4},
+ {"matrix": [11, 3], "x": 24, "y": 4},
+ {"matrix": [11, 2], "x": 25, "y": 4},
+ {"matrix": [11, 1], "x": 26, "y": 4}
+ ]
+ },
+ "LAYOUT_giabarinaix2": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0},
+ {"matrix": [4, 0], "x": 4, "y": 0},
+ {"matrix": [5, 0], "x": 5, "y": 0},
+ {"matrix": [5, 5], "x": 6, "y": 0},
+ {"matrix": [4, 5], "x": 7, "y": 0},
+ {"matrix": [3, 5], "x": 8, "y": 0},
+ {"matrix": [2, 5], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [0, 1], "x": 0.5, "y": 1},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [4, 1], "x": 4.5, "y": 1},
+ {"matrix": [5, 1], "x": 5.5, "y": 1},
+ {"matrix": [5, 6], "x": 6.5, "y": 1},
+ {"matrix": [4, 6], "x": 7.5, "y": 1},
+ {"matrix": [3, 6], "x": 8.5, "y": 1},
+ {"matrix": [2, 6], "x": 9.5, "y": 1},
+ {"matrix": [1, 6], "x": 10.5, "y": 1},
+ {"matrix": [0, 6], "x": 11.5, "y": 1},
+
+ {"matrix": [0, 2], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [3, 2], "x": 4, "y": 2},
+ {"matrix": [4, 2], "x": 5, "y": 2},
+ {"matrix": [5, 2], "x": 6, "y": 2},
+ {"matrix": [5, 7], "x": 7, "y": 2},
+ {"matrix": [4, 7], "x": 8, "y": 2},
+ {"matrix": [3, 7], "x": 9, "y": 2},
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [1, 7], "x": 11, "y": 2},
+ {"matrix": [0, 7], "x": 12, "y": 2},
+
+ {"matrix": [0, 3], "x": 1.5, "y": 3},
+ {"matrix": [1, 3], "x": 2.5, "y": 3},
+ {"matrix": [2, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [4, 3], "x": 5.5, "y": 3},
+ {"matrix": [5, 3], "x": 6.5, "y": 3},
+ {"matrix": [5, 8], "x": 7.5, "y": 3},
+ {"matrix": [4, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 8], "x": 9.5, "y": 3},
+ {"matrix": [2, 8], "x": 10.5, "y": 3},
+ {"matrix": [1, 8], "x": 11.5, "y": 3},
+ {"matrix": [0, 8], "x": 12.5, "y": 3},
+
+ {"matrix": [0, 4], "x": 2, "y": 4},
+ {"matrix": [1, 4], "x": 3, "y": 4},
+ {"matrix": [2, 4], "x": 4, "y": 4},
+ {"matrix": [3, 4], "x": 5, "y": 4},
+ {"matrix": [4, 4], "x": 6, "y": 4},
+ {"matrix": [5, 4], "x": 7, "y": 4},
+ {"matrix": [5, 9], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [3, 9], "x": 10, "y": 4},
+ {"matrix": [2, 9], "x": 11, "y": 4},
+ {"matrix": [1, 9], "x": 12, "y": 4},
+ {"matrix": [0, 9], "x": 13, "y": 4},
+
+ {"matrix": [6, 9], "x": 0, "y": 6},
+ {"matrix": [7, 9], "x": 1, "y": 6},
+ {"matrix": [8, 9], "x": 2, "y": 6},
+ {"matrix": [9, 9], "x": 3, "y": 6},
+ {"matrix": [10, 9], "x": 4, "y": 6},
+ {"matrix": [11, 9], "x": 5, "y": 6},
+ {"matrix": [11, 4], "x": 6, "y": 6},
+ {"matrix": [10, 4], "x": 7, "y": 6},
+ {"matrix": [9, 4], "x": 8, "y": 6},
+ {"matrix": [8, 4], "x": 9, "y": 6},
+ {"matrix": [7, 4], "x": 10, "y": 6},
+ {"matrix": [6, 4], "x": 11, "y": 6},
+
+ {"matrix": [6, 8], "x": 0.5, "y": 7},
+ {"matrix": [7, 8], "x": 1.5, "y": 7},
+ {"matrix": [8, 8], "x": 2.5, "y": 7},
+ {"matrix": [9, 8], "x": 3.5, "y": 7},
+ {"matrix": [10, 8], "x": 4.5, "y": 7},
+ {"matrix": [11, 8], "x": 5.5, "y": 7},
+ {"matrix": [11, 3], "x": 6.5, "y": 7},
+ {"matrix": [10, 3], "x": 7.5, "y": 7},
+ {"matrix": [9, 3], "x": 8.5, "y": 7},
+ {"matrix": [8, 3], "x": 9.5, "y": 7},
+ {"matrix": [7, 3], "x": 10.5, "y": 7},
+ {"matrix": [6, 3], "x": 11.5, "y": 7},
+
+ {"matrix": [6, 7], "x": 1, "y": 8},
+ {"matrix": [7, 7], "x": 2, "y": 8},
+ {"matrix": [8, 7], "x": 3, "y": 8},
+ {"matrix": [9, 7], "x": 4, "y": 8},
+ {"matrix": [10, 7], "x": 5, "y": 8},
+ {"matrix": [11, 7], "x": 6, "y": 8},
+ {"matrix": [11, 2], "x": 7, "y": 8},
+ {"matrix": [10, 2], "x": 8, "y": 8},
+ {"matrix": [9, 2], "x": 9, "y": 8},
+ {"matrix": [8, 2], "x": 10, "y": 8},
+ {"matrix": [7, 2], "x": 11, "y": 8},
+ {"matrix": [6, 2], "x": 12, "y": 8},
+
+ {"matrix": [6, 6], "x": 1.5, "y": 9},
+ {"matrix": [7, 6], "x": 2.5, "y": 9},
+ {"matrix": [8, 6], "x": 3.5, "y": 9},
+ {"matrix": [9, 6], "x": 4.5, "y": 9},
+ {"matrix": [10, 6], "x": 5.5, "y": 9},
+ {"matrix": [11, 6], "x": 6.5, "y": 9},
+ {"matrix": [11, 1], "x": 7.5, "y": 9},
+ {"matrix": [10, 1], "x": 8.5, "y": 9},
+ {"matrix": [9, 1], "x": 9.5, "y": 9},
+ {"matrix": [8, 1], "x": 10.5, "y": 9},
+ {"matrix": [7, 1], "x": 11.5, "y": 9},
+ {"matrix": [6, 1], "x": 12.5, "y": 9},
+
+ {"matrix": [6, 5], "x": 2, "y": 10},
+ {"matrix": [7, 5], "x": 3, "y": 10},
+ {"matrix": [8, 5], "x": 4, "y": 10},
+ {"matrix": [9, 5], "x": 5, "y": 10},
+ {"matrix": [10, 5], "x": 6, "y": 10},
+ {"matrix": [11, 5], "x": 7, "y": 10},
+ {"matrix": [11, 0], "x": 8, "y": 10},
+ {"matrix": [10, 0], "x": 9, "y": 10},
+ {"matrix": [9, 0], "x": 10, "y": 10},
+ {"matrix": [8, 0], "x": 11, "y": 10},
+ {"matrix": [7, 0], "x": 12, "y": 10},
+ {"matrix": [6, 0], "x": 13, "y": 10}
+ ]
+ }
+ }
+}
diff --git a/keyboards/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk
deleted file mode 100644
index 90ba252d264..00000000000
--- a/keyboards/giabalanai/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-COMMAND_ENABLE = no # Commands for debug and configuration
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-# RGB_MATRIX_ENABLE is not suitable for giabalanai keyboard on the right side (there are dulpicate keys).
-RGB_MATRIX_ENABLE = no # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-
-LTO_ENABLE = yes
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
index bc9b1cacfad..54fbce6bdad 100644
--- a/keyboards/gl516/a52gl/info.json
+++ b/keyboards/gl516/a52gl/info.json
@@ -10,6 +10,11 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/gl516/a52gl/rules.mk b/keyboards/gl516/a52gl/rules.mk
index 109f8bc976d..179d02c3c68 100644
--- a/keyboards/gl516/a52gl/rules.mk
+++ b/keyboards/gl516/a52gl/rules.mk
@@ -1,16 +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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = lite
-SRC += matrix.c
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
index fa78788e666..b252363f700 100644
--- a/keyboards/gl516/j73gl/info.json
+++ b/keyboards/gl516/j73gl/info.json
@@ -28,6 +28,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/gl516/j73gl/rules.mk b/keyboards/gl516/j73gl/rules.mk
index 3ea771b6701..179d02c3c68 100644
--- a/keyboards/gl516/j73gl/rules.mk
+++ b/keyboards/gl516/j73gl/rules.mk
@@ -1,16 +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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
CUSTOM_MATRIX = lite
-SRC += matrix.c
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
index c5abdd45428..0e54ee52a45 100644
--- a/keyboards/gl516/n51gl/info.json
+++ b/keyboards/gl516/n51gl/info.json
@@ -33,6 +33,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgblight": true,
+ "encoder": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/gl516/n51gl/rules.mk b/keyboards/gl516/n51gl/rules.mk
index c5b4f3e3764..179d02c3c68 100644
--- a/keyboards/gl516/n51gl/rules.mk
+++ b/keyboards/gl516/n51gl/rules.mk
@@ -1,16 +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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
CUSTOM_MATRIX = lite
-SRC += matrix.c
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/info.json
index ea49dabbca4..038498fd10a 100644
--- a/keyboards/glenpickle/chimera_ergo/info.json
+++ b/keyboards/glenpickle/chimera_ergo/info.json
@@ -10,6 +10,14 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/glenpickle/chimera_ergo/rules.mk b/keyboards/glenpickle/chimera_ergo/rules.mk
index f543b5fd9a2..18d234d62a0 100644
--- a/keyboards/glenpickle/chimera_ergo/rules.mk
+++ b/keyboards/glenpickle/chimera_ergo/rules.mk
@@ -1,15 +1,3 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
CUSTOM_MATRIX = lite
# project specific files
diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json
index 300b6be928e..b0d6a529124 100644
--- a/keyboards/glenpickle/chimera_ls/info.json
+++ b/keyboards/glenpickle/chimera_ls/info.json
@@ -10,6 +10,14 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
"community_layouts": ["ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x12": {
diff --git a/keyboards/glenpickle/chimera_ls/rules.mk b/keyboards/glenpickle/chimera_ls/rules.mk
index 706d6106538..812e3cef929 100644
--- a/keyboards/glenpickle/chimera_ls/rules.mk
+++ b/keyboards/glenpickle/chimera_ls/rules.mk
@@ -1,15 +1,3 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
CUSTOM_MATRIX = lite
# project specific files
diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json
index 4932d2f5a5a..b62616ce689 100644
--- a/keyboards/glenpickle/chimera_ortho/info.json
+++ b/keyboards/glenpickle/chimera_ortho/info.json
@@ -9,6 +9,14 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/glenpickle/chimera_ortho/rules.mk b/keyboards/glenpickle/chimera_ortho/rules.mk
index f543b5fd9a2..18d234d62a0 100644
--- a/keyboards/glenpickle/chimera_ortho/rules.mk
+++ b/keyboards/glenpickle/chimera_ortho/rules.mk
@@ -1,15 +1,3 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
CUSTOM_MATRIX = lite
# project specific files
diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json
index 39d6c11eb22..bf0ae445483 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/info.json
+++ b/keyboards/glenpickle/chimera_ortho_plus/info.json
@@ -9,6 +9,15 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "unicode": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/glenpickle/chimera_ortho_plus/rules.mk b/keyboards/glenpickle/chimera_ortho_plus/rules.mk
index 539a2d1004b..18d234d62a0 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/rules.mk
+++ b/keyboards/glenpickle/chimera_ortho_plus/rules.mk
@@ -1,16 +1,3 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
-UNICODE_ENABLE = yes
CUSTOM_MATRIX = lite
# project specific files
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
index 63ae544ad32..70e2d3e6791 100644
--- a/keyboards/gmmk/numpad/info.json
+++ b/keyboards/gmmk/numpad/info.json
@@ -6,7 +6,10 @@
"usb": {
"vid": "0x320F",
"pid": "0x5088",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"eeprom": {
"driver": "wear_leveling",
@@ -70,6 +73,18 @@
},
"processor": "WB32F3G71",
"bootloader": "wb32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "encoder": true,
+ "midi": true
+ },
+ "build": {
+ "lto": true
+ },
"diode_direction": "ROW2COL",
"matrix_pins": {
"rows": ["A3", "A4", "A5", "A6", "A7"],
diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk
index d289eb81a4d..752b0ce9d0b 100644
--- a/keyboards/gmmk/numpad/rules.mk
+++ b/keyboards/gmmk/numpad/rules.mk
@@ -1,23 +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
-ENCODER_ENABLE = yes
-KEYBOARD_SHARED_EP = yes
-MIDI_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
-
ANALOG_DRIVER_REQUIRED = yes
SRC += matrix.c
diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json
index 38152a32e6c..33ad716b4fd 100644
--- a/keyboards/gon/nerd60/info.json
+++ b/keyboards/gon/nerd60/info.json
@@ -21,6 +21,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/gon/nerd60/rules.mk b/keyboards/gon/nerd60/rules.mk
index e0782ddcb51..3437a35bdf1 100644
--- a/keyboards/gon/nerd60/rules.mk
+++ b/keyboards/gon/nerd60/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json
index 103c856bf0b..301cbaf19f1 100644
--- a/keyboards/gon/nerdtkl/info.json
+++ b/keyboards/gon/nerdtkl/info.json
@@ -21,6 +21,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true
+ },
"layouts": {
"LAYOUT_tkl": {
"layout": [
diff --git a/keyboards/gon/nerdtkl/rules.mk b/keyboards/gon/nerdtkl/rules.mk
index e0782ddcb51..3437a35bdf1 100644
--- a/keyboards/gon/nerdtkl/rules.mk
+++ b/keyboards/gon/nerdtkl/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # 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
diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json
index 13669a85420..b704582aa6c 100644
--- a/keyboards/gopolar/gg86/info.json
+++ b/keyboards/gopolar/gg86/info.json
@@ -7,7 +7,8 @@
"vid": "0x0007",
"pid": "0x0007",
"device_version": "0.0.1",
- "force_nkro": true
+ "force_nkro": true,
+ "no_startup_check": true
},
"ws2812": {
"pin": "E2"
@@ -64,6 +65,17 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "oled": true
+ },
+ "build": {
+ "lto": true
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/gopolar/gg86/rules.mk b/keyboards/gopolar/gg86/rules.mk
index acdf49b47da..7b380ccdfbe 100644
--- a/keyboards/gopolar/gg86/rules.mk
+++ b/keyboards/gopolar/gg86/rules.mk
@@ -1,24 +1 @@
SRC += lib/logo.c
-
-# 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
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
-
-# RGB Matrix enabled
-RGB_MATRIX_ENABLE = yes
-
-# OLED enabled
-OLED_ENABLE = yes
diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json
index 653885f963e..e3687ce9591 100644
--- a/keyboards/gray_studio/cod67/info.json
+++ b/keyboards/gray_studio/cod67/info.json
@@ -41,6 +41,14 @@
},
"processor": "atmega32u4",
"bootloader": "lufa-ms",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "backlight": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/gray_studio/cod67/rules.mk b/keyboards/gray_studio/cod67/rules.mk
index c8d3337cb38..e22d5248895 100644
--- a/keyboards/gray_studio/cod67/rules.mk
+++ b/keyboards/gray_studio/cod67/rules.mk
@@ -1,15 +1,2 @@
# This board uses the older unsafe 6k version of lufa-ms
BOOTLOADER_SIZE = 6144
-
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/info.json
deleted file mode 100644
index 6f3758c31a1..00000000000
--- a/keyboards/gummykey/info.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
- "keyboard_name": "GummyKey",
- "manufacturer": "Gumorr",
- "url": "https://github.com/gumorr/GummyKey",
- "maintainer": "Gumorr",
- "usb": {
- "vid": "0xAA12",
- "pid": "0x0001",
- "device_version": "1.0.0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "diode_direction": "ROW2COL",
- "layouts": {
- "LAYOUT_split_4x6_5": {
- "layout": [
- {"matrix": [0, 0], "x": 0.25, "y": 0},
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0.125},
- {"matrix": [0, 5], "x": 5.25, "y": 0.25},
-
- {"matrix": [5, 5], "x": 0.25, "y": 1},
- {"matrix": [5, 4], "x": 1.25, "y": 1},
- {"matrix": [5, 3], "x": 2.25, "y": 1},
- {"matrix": [5, 2], "x": 3.25, "y": 1},
- {"matrix": [5, 1], "x": 4.25, "y": 1.125},
- {"matrix": [5, 0], "x": 5.25, "y": 1.25},
-
- {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 2},
- {"matrix": [1, 2], "x": 2.25, "y": 2},
- {"matrix": [1, 3], "x": 3.25, "y": 2},
- {"matrix": [1, 4], "x": 4.25, "y": 2.125},
- {"matrix": [1, 5], "x": 5.25, "y": 2.25},
-
- {"matrix": [6, 5], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [6, 4], "x": 1.25, "y": 3},
- {"matrix": [6, 3], "x": 2.25, "y": 3},
- {"matrix": [6, 2], "x": 3.25, "y": 3},
- {"matrix": [6, 1], "x": 4.25, "y": 3.125},
- {"matrix": [6, 0], "x": 5.25, "y": 3.25},
-
- {"matrix": [2, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [2, 1], "x": 1.25, "y": 4},
- {"matrix": [2, 2], "x": 2.25, "y": 4},
- {"matrix": [2, 3], "x": 3.5, "y": 4.25, "w": 2.25},
- {"matrix": [2, 4], "x": 6.75, "y": 4.25},
- {"matrix": [2, 5], "x": 13.25, "y": 0},
-
- {"matrix": [7, 5], "x": 12.25, "y": 0},
- {"matrix": [7, 4], "x": 11.25, "y": 0},
- {"matrix": [7, 3], "x": 10.25, "y": 0},
- {"matrix": [7, 2], "x": 9.25, "y": 0.125},
- {"matrix": [7, 1], "x": 8.25, "y": 0.25},
- {"matrix": [7, 0], "x": 13.25, "y": 1},
-
- {"matrix": [3, 0], "x": 12.25, "y": 1},
- {"matrix": [3, 1], "x": 11.25, "y": 1},
- {"matrix": [3, 2], "x": 10.25, "y": 1},
- {"matrix": [3, 3], "x": 9.25, "y": 1.125},
- {"matrix": [3, 4], "x": 8.25, "y": 1.25},
- {"matrix": [3, 5], "x": 13.25, "y": 2, "w": 1.25},
-
- {"matrix": [8, 5], "x": 12.25, "y": 2},
- {"matrix": [8, 4], "x": 11.25, "y": 2},
- {"matrix": [8, 3], "x": 10.25, "y": 2},
- {"matrix": [8, 2], "x": 9.25, "y": 2.125},
- {"matrix": [8, 1], "x": 8.25, "y": 2.25},
- {"matrix": [8, 0], "x": 13.25, "y": 3, "w": 1.25},
-
- {"matrix": [4, 0], "x": 12.25, "y": 3},
- {"matrix": [4, 1], "x": 11.25, "y": 3},
- {"matrix": [4, 2], "x": 10.25, "y": 3},
- {"matrix": [4, 4], "x": 9.25, "y": 3.125},
- {"matrix": [4, 5], "x": 8.25, "y": 3.25},
-
- {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 12.25, "y": 4},
- {"matrix": [9, 2], "x": 11.25, "y": 4},
- {"matrix": [9, 1], "x": 8, "y": 4.25, "w": 2.25},
- {"matrix": [9, 0], "x": 7, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/gummykey/keyboard.json b/keyboards/gummykey/keyboard.json
new file mode 100644
index 00000000000..bb7001438df
--- /dev/null
+++ b/keyboards/gummykey/keyboard.json
@@ -0,0 +1,98 @@
+{
+ "keyboard_name": "GummyKey",
+ "manufacturer": "Gumorr",
+ "url": "https://github.com/gumorr/GummyKey",
+ "maintainer": "Gumorr",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "usb": {
+ "vid": "0xAA12",
+ "pid": "0x0001",
+ "device_version": "1.0.0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "split": {
+ "enabled": true
+ },
+ "diode_direction": "ROW2COL",
+ "layouts": {
+ "LAYOUT_split_4x6_5": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.25, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0.125},
+ {"matrix": [0, 5], "x": 5.25, "y": 0.25},
+
+ {"matrix": [5, 5], "x": 0.25, "y": 1},
+ {"matrix": [5, 4], "x": 1.25, "y": 1},
+ {"matrix": [5, 3], "x": 2.25, "y": 1},
+ {"matrix": [5, 2], "x": 3.25, "y": 1},
+ {"matrix": [5, 1], "x": 4.25, "y": 1.125},
+ {"matrix": [5, 0], "x": 5.25, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 2},
+ {"matrix": [1, 2], "x": 2.25, "y": 2},
+ {"matrix": [1, 3], "x": 3.25, "y": 2},
+ {"matrix": [1, 4], "x": 4.25, "y": 2.125},
+ {"matrix": [1, 5], "x": 5.25, "y": 2.25},
+
+ {"matrix": [6, 5], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [6, 4], "x": 1.25, "y": 3},
+ {"matrix": [6, 3], "x": 2.25, "y": 3},
+ {"matrix": [6, 2], "x": 3.25, "y": 3},
+ {"matrix": [6, 1], "x": 4.25, "y": 3.125},
+ {"matrix": [6, 0], "x": 5.25, "y": 3.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 4},
+ {"matrix": [2, 2], "x": 2.25, "y": 4},
+ {"matrix": [2, 3], "x": 3.5, "y": 4.25, "w": 2.25},
+ {"matrix": [2, 4], "x": 6.75, "y": 4.25},
+ {"matrix": [2, 5], "x": 13.25, "y": 0},
+
+ {"matrix": [7, 5], "x": 12.25, "y": 0},
+ {"matrix": [7, 4], "x": 11.25, "y": 0},
+ {"matrix": [7, 3], "x": 10.25, "y": 0},
+ {"matrix": [7, 2], "x": 9.25, "y": 0.125},
+ {"matrix": [7, 1], "x": 8.25, "y": 0.25},
+ {"matrix": [7, 0], "x": 13.25, "y": 1},
+
+ {"matrix": [3, 0], "x": 12.25, "y": 1},
+ {"matrix": [3, 1], "x": 11.25, "y": 1},
+ {"matrix": [3, 2], "x": 10.25, "y": 1},
+ {"matrix": [3, 3], "x": 9.25, "y": 1.125},
+ {"matrix": [3, 4], "x": 8.25, "y": 1.25},
+ {"matrix": [3, 5], "x": 13.25, "y": 2, "w": 1.25},
+
+ {"matrix": [8, 5], "x": 12.25, "y": 2},
+ {"matrix": [8, 4], "x": 11.25, "y": 2},
+ {"matrix": [8, 3], "x": 10.25, "y": 2},
+ {"matrix": [8, 2], "x": 9.25, "y": 2.125},
+ {"matrix": [8, 1], "x": 8.25, "y": 2.25},
+ {"matrix": [8, 0], "x": 13.25, "y": 3, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 12.25, "y": 3},
+ {"matrix": [4, 1], "x": 11.25, "y": 3},
+ {"matrix": [4, 2], "x": 10.25, "y": 3},
+ {"matrix": [4, 4], "x": 9.25, "y": 3.125},
+ {"matrix": [4, 5], "x": 8.25, "y": 3.25},
+
+ {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 12.25, "y": 4},
+ {"matrix": [9, 2], "x": 11.25, "y": 4},
+ {"matrix": [9, 1], "x": 8, "y": 4.25, "w": 2.25},
+ {"matrix": [9, 0], "x": 7, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/gummykey/rules.mk b/keyboards/gummykey/rules.mk
deleted file mode 100644
index b043543633b..00000000000
--- a/keyboards/gummykey/rules.mk
+++ /dev/null
@@ -1,13 +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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/info.json
deleted file mode 100644
index fb1dc102b7e..00000000000
--- a/keyboards/hadron/ver2/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["F6", "F7", "D6", "C7", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "B3", "B2", "B1", "B0"],
- "rows": ["D7", "E6", "B4", "B5", "B6"]
- },
- "diode_direction": "COL2ROW",
- "rgblight": {
- "hue_steps": 10,
- "led_count": 14,
- "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": {
- "pin": "D4"
- },
- "processor": "atmega32u4",
- "bootloader": "halfkay"
-}
diff --git a/keyboards/hadron/ver2/keyboard.json b/keyboards/hadron/ver2/keyboard.json
new file mode 100644
index 00000000000..fbb97f1c186
--- /dev/null
+++ b/keyboards/hadron/ver2/keyboard.json
@@ -0,0 +1,39 @@
+{
+ "usb": {
+ "device_version": "0.0.2"
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "D6", "C7", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "B3", "B2", "B1", "B0"],
+ "rows": ["D7", "E6", "B4", "B5", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 14,
+ "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": {
+ "pin": "D4"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "halfkay",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "oled": true
+ }
+}
diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk
deleted file mode 100644
index 188b4696f18..00000000000
--- a/keyboards/hadron/ver2/rules.mk
+++ /dev/null
@@ -1,13 +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 # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight
-OLED_ENABLE = yes
diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json
index 381a5dc5501..02a75d59eb8 100644
--- a/keyboards/hadron/ver3/info.json
+++ b/keyboards/hadron/ver3/info.json
@@ -35,5 +35,17 @@
},
"processor": "STM32F303",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "nkro": true,
+ "audio": true,
+ "rgblight": true,
+ "haptic": true,
+ "oled": true,
+ "encoder": true
+ },
"board": "QMK_PROTON_C"
}
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index edc5fa7d5bf..dea510c2ab3 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -1,17 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-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 = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = drv2605l
-OLED_ENABLE = yes
-ENCODER_ENABLER = yes
diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json
index 0c9b4ddb0f4..1f60537b249 100644
--- a/keyboards/halfcliff/info.json
+++ b/keyboards/halfcliff/info.json
@@ -14,6 +14,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"rgblight": {
@@ -28,6 +29,11 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/halfcliff/rules.mk b/keyboards/halfcliff/rules.mk
index 004db2a6d71..8784813b335 100644
--- a/keyboards/halfcliff/rules.mk
+++ b/keyboards/halfcliff/rules.mk
@@ -1,19 +1,2 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = no
-POINTING_DEVICE_ENABLE = no
CUSTOM_MATRIX = yes
-OLED_ENABLE = no
-
SRC += matrix.c
diff --git a/keyboards/hand88/info.json b/keyboards/hand88/info.json
deleted file mode 100755
index 0dc55ed89ac..00000000000
--- a/keyboards/hand88/info.json
+++ /dev/null
@@ -1,564 +0,0 @@
-{
- "keyboard_name": "Hand 88",
- "manufacturer": "Yiancar-Designs",
- "url": "https://yiancar-designs.com",
- "maintainer": "Yiancar-Designs",
- "usb": {
- "vid": "0x8968",
- "pid": "0x3838",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
- "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "indicators": {
- "caps_lock": "B6",
- "on_state": 0
- },
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "community_layouts": [
- "tkl_f13_ansi_tsangan",
- "tkl_f13_ansi_tsangan_split_bs_rshift",
- "tkl_f13_iso_tsangan",
- "tkl_f13_iso_tsangan_split_bs_rshift"
- ],
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
- {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
- {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_f13_ansi_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
- {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
- {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
- {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
- {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_f13_iso_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
- {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
- {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
- {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
- {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/hand88/keyboard.json b/keyboards/hand88/keyboard.json
new file mode 100755
index 00000000000..cb8a320aaf0
--- /dev/null
+++ b/keyboards/hand88/keyboard.json
@@ -0,0 +1,572 @@
+{
+ "keyboard_name": "Hand 88",
+ "manufacturer": "Yiancar-Designs",
+ "url": "https://yiancar-designs.com",
+ "maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x3838",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"],
+ "rows": ["A2", "A14", "A15", "B3", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "B6",
+ "on_state": 0
+ },
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "community_layouts": [
+ "tkl_f13_ansi_tsangan",
+ "tkl_f13_ansi_tsangan_split_bs_rshift",
+ "tkl_f13_iso_tsangan",
+ "tkl_f13_iso_tsangan_split_bs_rshift"
+ ],
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_f13_ansi_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [3, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_f13_iso_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "Menu", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/hand88/rules.mk b/keyboards/hand88/rules.mk
deleted file mode 100644
index d3ca7b060e1..00000000000
--- a/keyboards/hand88/rules.mk
+++ /dev/null
@@ -1,13 +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
diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json
index 605c77875d2..396b4c33cb5 100644
--- a/keyboards/handwired/108key_trackpoint/info.json
+++ b/keyboards/handwired/108key_trackpoint/info.json
@@ -15,6 +15,16 @@
"diode_direction": "COL2ROW",
"processor": "at90usb1286",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "ps2_mouse": true,
+ "ps2": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/108key_trackpoint/rules.mk b/keyboards/handwired/108key_trackpoint/rules.mk
index acdf7bf3932..74035c9903b 100644
--- a/keyboards/handwired/108key_trackpoint/rules.mk
+++ b/keyboards/handwired/108key_trackpoint/rules.mk
@@ -1,15 +1 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
PS2_DRIVER = usart
diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json
deleted file mode 100644
index 9c215a5e860..00000000000
--- a/keyboards/handwired/10k/info.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "keyboard_name": "10k",
- "maintainer": "Nabos",
- "manufacturer": "Nabos",
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["C6", "D7", "E6", "B4", "B5"],
- "rows": ["B6"]
- },
- "features": {
- "bootmagic": false,
- "command": false,
- "console": false,
- "extrakey": false,
- "mousekey": false,
- "nkro": false
- },
- "usb": {
- "vid": "0x6869",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_split_1x5"
- },
- "layouts": {
- "LAYOUT_split_1x5": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.25},
- {"matrix": [0, 1], "x": 1, "y": 0.125},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.5},
- {"matrix": [0, 4], "x": 3.75, "y": 2.75},
-
- {"matrix": [1, 0], "x": 5.75, "y": 2.75},
- {"matrix": [1, 1], "x": 6.5, "y": 0.5},
- {"matrix": [1, 2], "x": 7.5, "y": 0},
- {"matrix": [1, 3], "x": 8.5, "y": 0.125},
- {"matrix": [1, 4], "x": 9.5, "y": 0.25}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/10k/keyboard.json b/keyboards/handwired/10k/keyboard.json
new file mode 100644
index 00000000000..a3293601e3a
--- /dev/null
+++ b/keyboards/handwired/10k/keyboard.json
@@ -0,0 +1,51 @@
+{
+ "keyboard_name": "10k",
+ "maintainer": "Nabos",
+ "manufacturer": "Nabos",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["B6"]
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false
+ },
+ "split": {
+ "enabled": true
+ },
+ "usb": {
+ "vid": "0x6869",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_1x5"
+ },
+ "layouts": {
+ "LAYOUT_split_1x5": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.25},
+ {"matrix": [0, 1], "x": 1, "y": 0.125},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 3.75, "y": 2.75},
+
+ {"matrix": [1, 0], "x": 5.75, "y": 2.75},
+ {"matrix": [1, 1], "x": 6.5, "y": 0.5},
+ {"matrix": [1, 2], "x": 7.5, "y": 0},
+ {"matrix": [1, 3], "x": 8.5, "y": 0.125},
+ {"matrix": [1, 4], "x": 9.5, "y": 0.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk
deleted file mode 100644
index b4310ab72a6..00000000000
--- a/keyboards/handwired/10k/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json
index e2cc8dbf716..d68dcd1ec2f 100644
--- a/keyboards/handwired/42/info.json
+++ b/keyboards/handwired/42/info.json
@@ -21,6 +21,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "bluetooth": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk
index 0c5b506f63f..3437a35bdf1 100644
--- a/keyboards/handwired/42/rules.mk
+++ b/keyboards/handwired/42/rules.mk
@@ -1,17 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json
index 173abdfb60a..6ab686c5186 100644
--- a/keyboards/handwired/aball/info.json
+++ b/keyboards/handwired/aball/info.json
@@ -10,6 +10,12 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": false,
+ "pointing_device": true
+ },
"matrix_pins": {
"direct": [
[null]
diff --git a/keyboards/handwired/aball/rules.mk b/keyboards/handwired/aball/rules.mk
index d5e8e6ab985..84de35aeb14 100644
--- a/keyboards/handwired/aball/rules.mk
+++ b/keyboards/handwired/aball/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-
-# Add trackball support
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json
index 06ef96ba21e..3b4010ce40c 100644
--- a/keyboards/handwired/battleship_gamepad/info.json
+++ b/keyboards/handwired/battleship_gamepad/info.json
@@ -15,6 +15,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "joystick": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/battleship_gamepad/rules.mk b/keyboards/handwired/battleship_gamepad/rules.mk
index a41273f8900..c5ab560bca9 100644
--- a/keyboards/handwired/battleship_gamepad/rules.mk
+++ b/keyboards/handwired/battleship_gamepad/rules.mk
@@ -1,14 +1 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-JOYSTICK_ENABLE = yes
JOYSTICK_DRIVER = analog
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json
index e5c94794537..76d9e42f83c 100644
--- a/keyboards/handwired/bdn9_ble/info.json
+++ b/keyboards/handwired/bdn9_ble/info.json
@@ -18,6 +18,15 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "backlight": true,
+ "bluetooth": true
+ },
"matrix_pins": {
"direct": [
["D1", "D0", "C6"],
diff --git a/keyboards/handwired/bdn9_ble/rules.mk b/keyboards/handwired/bdn9_ble/rules.mk
index 0dafe2f289e..3437a35bdf1 100644
--- a/keyboards/handwired/bdn9_ble/rules.mk
+++ b/keyboards/handwired/bdn9_ble/rules.mk
@@ -1,17 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
deleted file mode 100644
index 6730c14a361..00000000000
--- a/keyboards/handwired/bento/rev1/info.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- "keyboard_name": "Bento Macropad Rev. 1",
- "manufacturer": "GhostSeven",
- "url": "https://www.thingiverse.com/thing:4416966",
- "maintainer": "Ghostseven",
- "usb": {
- "vid": "0xFEED",
- "pid": "0xDAD3",
- "device_version": "1.0.0"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 4,
- "sleep": true,
- "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": {
- "pin": "D3"
- },
- "encoder": {
- "rotary": [
- {"pin_a": "D1", "pin_b": "D0"}
- ]
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "matrix_pins": {
- "direct": [
- ["D7", "B1", "D2"],
- ["E6", "B4", "B2"]
- ]
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]},
- {"x": 1, "y": 0, "matrix": [0, 1]},
- {"x": 2, "y": 0, "matrix": [0, 2]},
- {"x": 0, "y": 1, "matrix": [1, 0]},
- {"x": 1, "y": 1, "matrix": [1, 1]},
- {"x": 2, "y": 1, "matrix": [1, 2]}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/bento/rev1/keyboard.json b/keyboards/handwired/bento/rev1/keyboard.json
new file mode 100644
index 00000000000..3baa7d77ce4
--- /dev/null
+++ b/keyboards/handwired/bento/rev1/keyboard.json
@@ -0,0 +1,66 @@
+{
+ "keyboard_name": "Bento Macropad Rev. 1",
+ "manufacturer": "GhostSeven",
+ "url": "https://www.thingiverse.com/thing:4416966",
+ "maintainer": "Ghostseven",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xDAD3",
+ "device_version": "1.0.0"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 4,
+ "sleep": true,
+ "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": {
+ "pin": "D3"
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D1", "pin_b": "D0"}
+ ]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "rgblight": true,
+ "encoder": true
+ },
+ "matrix_pins": {
+ "direct": [
+ ["D7", "B1", "D2"],
+ ["E6", "B4", "B2"]
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 0, "y": 1, "matrix": [1, 0]},
+ {"x": 1, "y": 1, "matrix": [1, 1]},
+ {"x": 2, "y": 1, "matrix": [1, 2]}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/bento/rev1/rules.mk b/keyboards/handwired/bento/rev1/rules.mk
deleted file mode 100644
index 6a4a0677378..00000000000
--- a/keyboards/handwired/bento/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 = no # 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 = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
deleted file mode 100644
index 910a628ca6a..00000000000
--- a/keyboards/handwired/brain/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
- "keyboard_name": "Brain",
- "manufacturer": "Klackygears",
- "url": "",
- "maintainer": "Klackygears",
- "usb": {
- "vid": "0x4A53",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F4", "F5", "F6", "F7", "B1"]
- },
- "diode_direction": "COL2ROW",
- "bootmagic": {
- "matrix": [0, 6]
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgblight": {
- "led_count": 28,
- "split": true,
- "max_brightness": 120
- },
- "split": {
- "soft_serial_pin": "D0",
- "bootmagic": {
- "matrix": [5, 0]
- },
- "matrix_pins": {
- "right": {
- "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D1"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 1], "x": 1, "y": 1},
- {"matrix": [0, 2], "x": 2, "y": 0.5},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.5},
- {"matrix": [0, 5], "x": 5, "y": 0.75},
- {"matrix": [0, 6], "x": 6, "y": 1},
-
- {"matrix": [5, 0], "x": 8, "y": 1},
- {"matrix": [5, 1], "x": 9, "y": 0.75},
- {"matrix": [5, 2], "x": 10, "y": 0.5},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0.5},
- {"matrix": [5, 5], "x": 13, "y": 1},
-
- {"matrix": [1, 0], "x": 0, "y": 2.25},
- {"matrix": [1, 1], "x": 1, "y": 2},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"matrix": [1, 5], "x": 5, "y": 1.75},
- {"matrix": [1, 6], "x": 6, "y": 2},
-
- {"matrix": [6, 0], "x": 8, "y": 2},
- {"matrix": [6, 1], "x": 9, "y": 1.75},
- {"matrix": [6, 2], "x": 10, "y": 1.5},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1.5},
- {"matrix": [6, 5], "x": 13, "y": 2},
- {"matrix": [6, 6], "x": 14, "y": 2.25},
-
- {"matrix": [2, 0], "x": 0, "y": 3.25},
- {"matrix": [2, 1], "x": 1, "y": 3},
- {"matrix": [2, 2], "x": 2, "y": 2.5},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.5},
- {"matrix": [2, 5], "x": 5, "y": 2.75},
- {"matrix": [2, 6], "x": 6, "y": 3},
-
- {"matrix": [7, 0], "x": 8, "y": 3},
- {"matrix": [7, 1], "x": 9, "y": 2.75},
- {"matrix": [7, 2], "x": 10, "y": 2.5},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2.5},
- {"matrix": [7, 5], "x": 13, "y": 3},
- {"matrix": [7, 6], "x": 14, "y": 3.25},
-
- {"matrix": [3, 1], "x": 1, "y": 4},
- {"matrix": [3, 2], "x": 2, "y": 3.5},
- {"matrix": [3, 3], "x": 3.5, "y": 4.25},
- {"matrix": [3, 4], "x": 4.5, "y": 4.25},
- {"matrix": [3, 5], "x": 5.5, "y": 4.25},
-
- {"matrix": [8, 1], "x": 8.5, "y": 4.25},
- {"matrix": [8, 2], "x": 9.5, "y": 4.25},
- {"matrix": [8, 3], "x": 10.5, "y": 4.25},
- {"matrix": [8, 4], "x": 12, "y": 3.5},
- {"matrix": [8, 5], "x": 13, "y": 4},
-
- {"matrix": [4, 3], "x": 3.5, "y": 5.25},
- {"matrix": [4, 4], "x": 4.5, "y": 5.25},
- {"matrix": [4, 5], "x": 5.5, "y": 5.25},
-
- {"matrix": [9, 1], "x": 8.5, "y": 5.25},
- {"matrix": [9, 2], "x": 9.5, "y": 5.25},
- {"matrix": [9, 3], "x": 10.5, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/brain/keyboard.json b/keyboards/handwired/brain/keyboard.json
new file mode 100644
index 00000000000..e9093711d00
--- /dev/null
+++ b/keyboards/handwired/brain/keyboard.json
@@ -0,0 +1,120 @@
+{
+ "keyboard_name": "Brain",
+ "manufacturer": "Klackygears",
+ "url": "",
+ "maintainer": "Klackygears",
+ "usb": {
+ "vid": "0x4A53",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7", "B1"]
+ },
+ "diode_direction": "COL2ROW",
+ "bootmagic": {
+ "matrix": [0, 6]
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgblight": {
+ "led_count": 28,
+ "split": true,
+ "max_brightness": 120
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "bootmagic": {
+ "matrix": [5, 0]
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D1"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 0.5},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+ {"matrix": [0, 5], "x": 5, "y": 0.75},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+
+ {"matrix": [5, 0], "x": 8, "y": 1},
+ {"matrix": [5, 1], "x": 9, "y": 0.75},
+ {"matrix": [5, 2], "x": 10, "y": 0.5},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0.5},
+ {"matrix": [5, 5], "x": 13, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.75},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+
+ {"matrix": [6, 0], "x": 8, "y": 2},
+ {"matrix": [6, 1], "x": 9, "y": 1.75},
+ {"matrix": [6, 2], "x": 10, "y": 1.5},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1.5},
+ {"matrix": [6, 5], "x": 13, "y": 2},
+ {"matrix": [6, 6], "x": 14, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+ {"matrix": [2, 5], "x": 5, "y": 2.75},
+ {"matrix": [2, 6], "x": 6, "y": 3},
+
+ {"matrix": [7, 0], "x": 8, "y": 3},
+ {"matrix": [7, 1], "x": 9, "y": 2.75},
+ {"matrix": [7, 2], "x": 10, "y": 2.5},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2.5},
+ {"matrix": [7, 5], "x": 13, "y": 3},
+ {"matrix": [7, 6], "x": 14, "y": 3.25},
+
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.5, "y": 4.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+
+ {"matrix": [8, 1], "x": 8.5, "y": 4.25},
+ {"matrix": [8, 2], "x": 9.5, "y": 4.25},
+ {"matrix": [8, 3], "x": 10.5, "y": 4.25},
+ {"matrix": [8, 4], "x": 12, "y": 3.5},
+ {"matrix": [8, 5], "x": 13, "y": 4},
+
+ {"matrix": [4, 3], "x": 3.5, "y": 5.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 5.25},
+ {"matrix": [4, 5], "x": 5.5, "y": 5.25},
+
+ {"matrix": [9, 1], "x": 8.5, "y": 5.25},
+ {"matrix": [9, 2], "x": 9.5, "y": 5.25},
+ {"matrix": [9, 3], "x": 10.5, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/brain/rules.mk b/keyboards/handwired/brain/rules.mk
deleted file mode 100644
index df7d719da16..00000000000
--- a/keyboards/handwired/brain/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json
deleted file mode 100644
index 0bbdefe9216..00000000000
--- a/keyboards/handwired/chiron/info.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
- "keyboard_name": "Chiron",
- "manufacturer": "Mike Hix",
- "url": "",
- "maintainer": "musl",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
- "rows": ["D4", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B6",
- "levels": 7
- },
- "rgblight": {
- "led_count": 4
- },
- "ws2812": {
- "pin": "D3"
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_chiron": "LAYOUT"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 6], "x": 0, "y": 0},
- {"matrix": [0, 5], "x": 1, "y": 0},
- {"matrix": [0, 4], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0},
- {"matrix": [0, 1], "x": 5, "y": 0},
- {"matrix": [0, 0], "x": 6, "y": 0},
-
- {"matrix": [5, 6], "x": 8, "y": 0},
- {"matrix": [5, 5], "x": 9, "y": 0},
- {"matrix": [5, 4], "x": 10, "y": 0},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 2], "x": 12, "y": 0},
- {"matrix": [5, 1], "x": 13, "y": 0},
- {"matrix": [5, 0], "x": 14, "y": 0},
-
- {"matrix": [1, 6], "x": 0, "y": 1},
- {"matrix": [1, 5], "x": 1, "y": 1},
- {"matrix": [1, 4], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 2], "x": 4, "y": 1},
- {"matrix": [1, 1], "x": 5, "y": 1},
- {"matrix": [1, 0], "x": 6, "y": 1},
-
- {"matrix": [6, 6], "x": 8, "y": 1},
- {"matrix": [6, 5], "x": 9, "y": 1},
- {"matrix": [6, 4], "x": 10, "y": 1},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1},
- {"matrix": [6, 1], "x": 13, "y": 1},
- {"matrix": [6, 0], "x": 14, "y": 1},
-
- {"matrix": [2, 6], "x": 0, "y": 2},
- {"matrix": [2, 5], "x": 1, "y": 2},
- {"matrix": [2, 4], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 2], "x": 4, "y": 2},
- {"matrix": [2, 1], "x": 5, "y": 2},
- {"matrix": [2, 0], "x": 6, "y": 2},
-
- {"matrix": [7, 6], "x": 8, "y": 2},
- {"matrix": [7, 5], "x": 9, "y": 2},
- {"matrix": [7, 4], "x": 10, "y": 2},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 2], "x": 12, "y": 2},
- {"matrix": [7, 1], "x": 13, "y": 2},
- {"matrix": [7, 0], "x": 14, "y": 2},
-
- {"matrix": [3, 6], "x": 0, "y": 3},
- {"matrix": [3, 5], "x": 1, "y": 3},
- {"matrix": [3, 4], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 2], "x": 4, "y": 3},
- {"matrix": [3, 1], "x": 5, "y": 3},
- {"matrix": [3, 0], "x": 6, "y": 3},
-
- {"matrix": [8, 6], "x": 8, "y": 3},
- {"matrix": [8, 5], "x": 9, "y": 3},
- {"matrix": [8, 4], "x": 10, "y": 3},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 2], "x": 12, "y": 3},
- {"matrix": [8, 1], "x": 13, "y": 3},
- {"matrix": [8, 0], "x": 14, "y": 3},
-
- {"matrix": [4, 6], "x": 0, "y": 4},
- {"matrix": [4, 5], "x": 1, "y": 4},
- {"matrix": [4, 4], "x": 2, "y": 4},
- {"matrix": [4, 2], "x": 4, "y": 4, "h": 1.25},
- {"matrix": [4, 1], "x": 5, "y": 4, "h": 1.25},
- {"matrix": [4, 0], "x": 6, "y": 4, "h": 1.25},
-
- {"matrix": [9, 6], "x": 8, "y": 4, "h": 1.25},
- {"matrix": [9, 5], "x": 9, "y": 4, "h": 1.25},
- {"matrix": [9, 4], "x": 10, "y": 4, "h": 1.25},
- {"matrix": [9, 2], "x": 12, "y": 4},
- {"matrix": [9, 1], "x": 13, "y": 4},
- {"matrix": [9, 0], "x": 14, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/chiron/keyboard.json b/keyboards/handwired/chiron/keyboard.json
new file mode 100644
index 00000000000..6c2626df64b
--- /dev/null
+++ b/keyboards/handwired/chiron/keyboard.json
@@ -0,0 +1,128 @@
+{
+ "keyboard_name": "Chiron",
+ "manufacturer": "Mike Hix",
+ "url": "",
+ "maintainer": "musl",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true,
+ "sleep_led": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B6",
+ "levels": 7
+ },
+ "rgblight": {
+ "led_count": 4
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_chiron": "LAYOUT"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 6], "x": 0, "y": 0},
+ {"matrix": [0, 5], "x": 1, "y": 0},
+ {"matrix": [0, 4], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 0], "x": 6, "y": 0},
+
+ {"matrix": [5, 6], "x": 8, "y": 0},
+ {"matrix": [5, 5], "x": 9, "y": 0},
+ {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 1], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "y": 0},
+
+ {"matrix": [1, 6], "x": 0, "y": 1},
+ {"matrix": [1, 5], "x": 1, "y": 1},
+ {"matrix": [1, 4], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 1], "x": 5, "y": 1},
+ {"matrix": [1, 0], "x": 6, "y": 1},
+
+ {"matrix": [6, 6], "x": 8, "y": 1},
+ {"matrix": [6, 5], "x": 9, "y": 1},
+ {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 1], "x": 13, "y": 1},
+ {"matrix": [6, 0], "x": 14, "y": 1},
+
+ {"matrix": [2, 6], "x": 0, "y": 2},
+ {"matrix": [2, 5], "x": 1, "y": 2},
+ {"matrix": [2, 4], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [2, 1], "x": 5, "y": 2},
+ {"matrix": [2, 0], "x": 6, "y": 2},
+
+ {"matrix": [7, 6], "x": 8, "y": 2},
+ {"matrix": [7, 5], "x": 9, "y": 2},
+ {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 1], "x": 13, "y": 2},
+ {"matrix": [7, 0], "x": 14, "y": 2},
+
+ {"matrix": [3, 6], "x": 0, "y": 3},
+ {"matrix": [3, 5], "x": 1, "y": 3},
+ {"matrix": [3, 4], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 1], "x": 5, "y": 3},
+ {"matrix": [3, 0], "x": 6, "y": 3},
+
+ {"matrix": [8, 6], "x": 8, "y": 3},
+ {"matrix": [8, 5], "x": 9, "y": 3},
+ {"matrix": [8, 4], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 1], "x": 13, "y": 3},
+ {"matrix": [8, 0], "x": 14, "y": 3},
+
+ {"matrix": [4, 6], "x": 0, "y": 4},
+ {"matrix": [4, 5], "x": 1, "y": 4},
+ {"matrix": [4, 4], "x": 2, "y": 4},
+ {"matrix": [4, 2], "x": 4, "y": 4, "h": 1.25},
+ {"matrix": [4, 1], "x": 5, "y": 4, "h": 1.25},
+ {"matrix": [4, 0], "x": 6, "y": 4, "h": 1.25},
+
+ {"matrix": [9, 6], "x": 8, "y": 4, "h": 1.25},
+ {"matrix": [9, 5], "x": 9, "y": 4, "h": 1.25},
+ {"matrix": [9, 4], "x": 10, "y": 4, "h": 1.25},
+ {"matrix": [9, 2], "x": 12, "y": 4},
+ {"matrix": [9, 1], "x": 13, "y": 4},
+ {"matrix": [9, 0], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/chiron/rules.mk b/keyboards/handwired/chiron/rules.mk
deleted file mode 100644
index 9ca8ab3ebc9..00000000000
--- a/keyboards/handwired/chiron/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-AUDIO_ENABLE = no
-AUTOLOG_ENABLE = no
-BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-COMMAND_ENABLE = no
-CONSOLE_ENABLE = no
-DEBUG_ENABLE = no
-EXTRAKEY_ENABLE = no
-LEADER_ENABLE = no
-MOUSEKEY_ENABLE = yes
-NKRO_ENABLE = no # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes
-SLEEP_LED_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json
index 6b2db46b1f0..344c576462d 100644
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/info.json
@@ -36,6 +36,13 @@
"diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"layout_aliases": {
"LAYOUT_all": "LAYOUT_split_space_split_bs"
},
diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk
index cc9d7bb3f53..0ab54aaaf71 100644
--- a/keyboards/handwired/cyberstar/rules.mk
+++ b/keyboards/handwired/cyberstar/rules.mk
@@ -1,15 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json
index be8fffea3d5..99c8a673263 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/info.json
@@ -43,6 +43,18 @@
"tap_keycode_delay": 10
},
"development_board": "proton_c",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "nkro": true,
+ "audio": true,
+ "rgblight": true,
+ "encoder": true,
+ "oled": true,
+ "unicode": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk
index 7fa8dfdd340..62866f887a6 100644
--- a/keyboards/handwired/d48/rules.mk
+++ b/keyboards/handwired/d48/rules.mk
@@ -1,18 +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 = yes # 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 = yes
-USE_I2C = no
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-UNICODE_ENABLE = yes
-
SRC += ds1307.c taphold.c
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json
index e95c380d9c0..339119e6fd4 100644
--- a/keyboards/handwired/dactyl/info.json
+++ b/keyboards/handwired/dactyl/info.json
@@ -10,6 +10,14 @@
},
"processor": "atmega32u4",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "unicode": true,
+ "swap_hands": true
+ },
"debounce": 15,
"tapping": {
"toggle": 1
diff --git a/keyboards/handwired/dactyl/rules.mk b/keyboards/handwired/dactyl/rules.mk
index bffd901b04d..35b5df19738 100644
--- a/keyboards/handwired/dactyl/rules.mk
+++ b/keyboards/handwired/dactyl/rules.mk
@@ -1,17 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-POINTING_DEVICE_ENABLE = no
-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
-CUSTOM_MATRIX = yes # Custom matrix file for the Dactyl
-NKRO_ENABLE = yes # Enable N-Key Rollover
-UNICODE_ENABLE = yes # Unicode
-SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard
-RGBLIGHT_ENABLE = no
+CUSTOM_MATRIX = yes
# project specific files
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json
deleted file mode 100644
index 141bb477177..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
- "keyboard_name": "Dactyl Manuform 4x5",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3435",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["C6", "D7", "E6", "B4", "B5"],
- "rows": ["F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "community_layouts": ["split_3x5_3"],
- "layouts": {
- "LAYOUT": {
- "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": [5, 4], "x": 10, "y": 0},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 2], "x": 12, "y": 0},
- {"matrix": [5, 1], "x": 13, "y": 0},
- {"matrix": [5, 0], "x": 14, "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": [6, 4], "x": 10, "y": 1},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1},
- {"matrix": [6, 1], "x": 13, "y": 1},
- {"matrix": [6, 0], "x": 14, "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": [7, 4], "x": 10, "y": 2},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 2], "x": 12, "y": 2},
- {"matrix": [7, 1], "x": 13, "y": 2},
- {"matrix": [7, 0], "x": 14, "y": 2},
-
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
-
- {"matrix": [8, 2], "x": 12, "y": 3},
- {"matrix": [8, 1], "x": 13, "y": 3},
-
- {"matrix": [3, 3], "x": 3, "y": 4},
- {"matrix": [3, 4], "x": 4, "y": 4},
-
- {"matrix": [8, 4], "x": 10, "y": 4},
- {"matrix": [8, 3], "x": 11, "y": 4},
-
- {"matrix": [4, 4], "x": 5, "y": 5},
- {"matrix": [4, 3], "x": 6, "y": 5},
-
- {"matrix": [9, 3], "x": 8, "y": 5},
- {"matrix": [9, 4], "x": 9, "y": 5},
-
- {"matrix": [4, 2], "x": 5, "y": 6},
- {"matrix": [4, 1], "x": 6, "y": 6},
-
- {"matrix": [9, 1], "x": 8, "y": 6},
- {"matrix": [9, 2], "x": 9, "y": 6}
- ]
- },
- "LAYOUT_split_3x5_3": {
- "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": [5, 4], "x": 10, "y": 0},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 2], "x": 12, "y": 0},
- {"matrix": [5, 1], "x": 13, "y": 0},
- {"matrix": [5, 0], "x": 14, "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": [6, 4], "x": 10, "y": 1},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1},
- {"matrix": [6, 1], "x": 13, "y": 1},
- {"matrix": [6, 0], "x": 14, "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": [7, 4], "x": 10, "y": 2},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 2], "x": 12, "y": 2},
- {"matrix": [7, 1], "x": 13, "y": 2},
- {"matrix": [7, 0], "x": 14, "y": 2},
-
- {"matrix": [3, 3], "x": 3, "y": 4},
- {"matrix": [3, 4], "x": 4, "y": 4},
-
- {"matrix": [8, 4], "x": 10, "y": 4},
- {"matrix": [8, 3], "x": 11, "y": 4},
-
- {"matrix": [4, 4], "x": 5, "y": 5},
-
- {"matrix": [9, 4], "x": 9, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json
new file mode 100644
index 00000000000..b779e9d3c1e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json
@@ -0,0 +1,151 @@
+{
+ "keyboard_name": "Dactyl Manuform 4x5",
+ "manufacturer": "tshort",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3435",
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "community_layouts": ["split_3x5_3"],
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 1], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "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": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 1], "x": 13, "y": 1},
+ {"matrix": [6, 0], "x": 14, "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": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 1], "x": 13, "y": 2},
+ {"matrix": [7, 0], "x": 14, "y": 2},
+
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 1], "x": 13, "y": 3},
+
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+
+ {"matrix": [8, 4], "x": 10, "y": 4},
+ {"matrix": [8, 3], "x": 11, "y": 4},
+
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 3], "x": 6, "y": 5},
+
+ {"matrix": [9, 3], "x": 8, "y": 5},
+ {"matrix": [9, 4], "x": 9, "y": 5},
+
+ {"matrix": [4, 2], "x": 5, "y": 6},
+ {"matrix": [4, 1], "x": 6, "y": 6},
+
+ {"matrix": [9, 1], "x": 8, "y": 6},
+ {"matrix": [9, 2], "x": 9, "y": 6}
+ ]
+ },
+ "LAYOUT_split_3x5_3": {
+ "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": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 1], "x": 13, "y": 0},
+ {"matrix": [5, 0], "x": 14, "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": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 1], "x": 13, "y": 1},
+ {"matrix": [6, 0], "x": 14, "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": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 1], "x": 13, "y": 2},
+ {"matrix": [7, 0], "x": 14, "y": 2},
+
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+
+ {"matrix": [8, 4], "x": 10, "y": 4},
+ {"matrix": [8, 3], "x": 11, "y": 4},
+
+ {"matrix": [4, 4], "x": 5, "y": 5},
+
+ {"matrix": [9, 4], "x": 9, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
deleted file mode 100644
index 76f13971d45..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
- "keyboard_name": "Dactyl ManuForm 4x5_5",
- "manufacturer": "ssedrick",
- "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
- "maintainer": "ssedrick",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3435",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "F6"],
- "rows": ["F7", "B1", "B3", "B2", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "development_board": "promicro",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 8, "y": 0},
- {"matrix": [5, 1], "x": 9, "y": 0},
- {"matrix": [5, 2], "x": 10, "y": 0},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "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": [6, 0], "x": 8, "y": 1},
- {"matrix": [6, 1], "x": 9, "y": 1},
- {"matrix": [6, 2], "x": 10, "y": 1},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "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": [7, 0], "x": 8, "y": 2},
- {"matrix": [7, 1], "x": 9, "y": 2},
- {"matrix": [7, 2], "x": 10, "y": 2},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2},
-
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
-
- {"matrix": [8, 2], "x": 10, "y": 3},
- {"matrix": [8, 3], "x": 11, "y": 3},
-
- {"matrix": [3, 3], "x": 3, "y": 4},
- {"matrix": [3, 4], "x": 4, "y": 4},
- {"matrix": [4, 4], "x": 5, "y": 4},
-
- {"matrix": [8, 1], "x": 9, "y": 4},
- {"matrix": [9, 0], "x": 7, "y": 4},
- {"matrix": [8, 0], "x": 8, "y": 4},
-
- {"matrix": [4, 2], "x": 4, "y": 5},
- {"matrix": [4, 3], "x": 5, "y": 5},
-
- {"matrix": [9, 1], "x": 7, "y": 5},
- {"matrix": [9, 2], "x": 8, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json
new file mode 100644
index 00000000000..8f53dd03039
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json
@@ -0,0 +1,90 @@
+{
+ "keyboard_name": "Dactyl ManuForm 4x5_5",
+ "manufacturer": "ssedrick",
+ "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
+ "maintainer": "ssedrick",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3435",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "F6"],
+ "rows": ["F7", "B1", "B3", "B2", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "development_board": "promicro",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 8, "y": 0},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "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": [6, 0], "x": 8, "y": 1},
+ {"matrix": [6, 1], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "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": [7, 0], "x": 8, "y": 2},
+ {"matrix": [7, 1], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
+
+ {"matrix": [8, 1], "x": 9, "y": 4},
+ {"matrix": [9, 0], "x": 7, "y": 4},
+ {"matrix": [8, 0], "x": 8, "y": 4},
+
+ {"matrix": [4, 2], "x": 4, "y": 5},
+ {"matrix": [4, 3], "x": 5, "y": 5},
+
+ {"matrix": [9, 1], "x": 7, "y": 5},
+ {"matrix": [9, 2], "x": 8, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
deleted file mode 100644
index 4240679233b..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-
-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 = yes # 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json
deleted file mode 100644
index 5b415fbd2bb..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
- "keyboard_name": "Dactyl Manuform 4x6",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3436",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 11, "y": 0},
- {"matrix": [5, 1], "x": 12, "y": 0},
- {"matrix": [5, 2], "x": 13, "y": 0},
- {"matrix": [5, 3], "x": 14, "y": 0},
- {"matrix": [5, 4], "x": 15, "y": 0},
- {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
- {"matrix": [6, 1], "x": 12, "y": 1},
- {"matrix": [6, 2], "x": 13, "y": 1},
- {"matrix": [6, 3], "x": 14, "y": 1},
- {"matrix": [6, 4], "x": 15, "y": 1},
- {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
- {"matrix": [7, 1], "x": 12, "y": 2},
- {"matrix": [7, 2], "x": 13, "y": 2},
- {"matrix": [7, 3], "x": 14, "y": 2},
- {"matrix": [7, 4], "x": 15, "y": 2},
- {"matrix": [7, 5], "x": 16, "y": 2},
-
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
-
- {"matrix": [8, 2], "x": 13, "y": 3},
- {"matrix": [8, 3], "x": 14, "y": 3},
-
- {"matrix": [3, 4], "x": 4, "y": 4},
- {"matrix": [3, 5], "x": 5, "y": 4},
-
- {"matrix": [8, 0], "x": 11, "y": 4},
- {"matrix": [8, 1], "x": 12, "y": 4},
-
- {"matrix": [4, 4], "x": 6, "y": 5},
- {"matrix": [4, 5], "x": 7, "y": 5},
-
- {"matrix": [9, 0], "x": 9, "y": 5},
- {"matrix": [9, 1], "x": 10, "y": 5},
-
- {"matrix": [4, 2], "x": 6, "y": 6},
- {"matrix": [4, 3], "x": 7, "y": 6},
-
- {"matrix": [9, 2], "x": 9, "y": 6},
- {"matrix": [9, 3], "x": 10, "y": 6}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json
new file mode 100644
index 00000000000..feb58db5dbe
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json
@@ -0,0 +1,107 @@
+{
+ "keyboard_name": "Dactyl Manuform 4x6",
+ "manufacturer": "tshort",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3436",
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 3], "x": 14, "y": 0},
+ {"matrix": [5, 4], "x": 15, "y": 0},
+ {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
+ {"matrix": [6, 1], "x": 12, "y": 1},
+ {"matrix": [6, 2], "x": 13, "y": 1},
+ {"matrix": [6, 3], "x": 14, "y": 1},
+ {"matrix": [6, 4], "x": 15, "y": 1},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
+ {"matrix": [7, 1], "x": 12, "y": 2},
+ {"matrix": [7, 2], "x": 13, "y": 2},
+ {"matrix": [7, 3], "x": 14, "y": 2},
+ {"matrix": [7, 4], "x": 15, "y": 2},
+ {"matrix": [7, 5], "x": 16, "y": 2},
+
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3},
+
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+
+ {"matrix": [8, 0], "x": 11, "y": 4},
+ {"matrix": [8, 1], "x": 12, "y": 4},
+
+ {"matrix": [4, 4], "x": 6, "y": 5},
+ {"matrix": [4, 5], "x": 7, "y": 5},
+
+ {"matrix": [9, 0], "x": 9, "y": 5},
+ {"matrix": [9, 1], "x": 10, "y": 5},
+
+ {"matrix": [4, 2], "x": 6, "y": 6},
+ {"matrix": [4, 3], "x": 7, "y": 6},
+
+ {"matrix": [9, 2], "x": 9, "y": 6},
+ {"matrix": [9, 3], "x": 10, "y": 6}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x6/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
deleted file mode 100644
index f54f0d56d25..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ /dev/null
@@ -1,195 +0,0 @@
-{
- "keyboard_name": "Dactyl Manuform 4x6 5 thumb keys",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3436",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "community_layouts": ["split_3x6_3", "split_3x5_3"],
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 11, "y": 0},
- {"matrix": [5, 1], "x": 12, "y": 0},
- {"matrix": [5, 2], "x": 13, "y": 0},
- {"matrix": [5, 3], "x": 14, "y": 0},
- {"matrix": [5, 4], "x": 15, "y": 0},
- {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
- {"matrix": [6, 1], "x": 12, "y": 1},
- {"matrix": [6, 2], "x": 13, "y": 1},
- {"matrix": [6, 3], "x": 14, "y": 1},
- {"matrix": [6, 4], "x": 15, "y": 1},
- {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
- {"matrix": [7, 1], "x": 12, "y": 2},
- {"matrix": [7, 2], "x": 13, "y": 2},
- {"matrix": [7, 3], "x": 14, "y": 2},
- {"matrix": [7, 4], "x": 15, "y": 2},
- {"matrix": [7, 5], "x": 16, "y": 2},
-
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3},
-
- {"matrix": [8, 2], "x": 13, "y": 3},
- {"matrix": [8, 3], "x": 14, "y": 3},
-
- {"matrix": [3, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
- {"matrix": [4, 3], "x": 6, "y": 4},
-
- {"matrix": [9, 2], "x": 10, "y": 4},
- {"matrix": [9, 0], "x": 11, "y": 4},
- {"matrix": [8, 1], "x": 12, "y": 4},
-
- {"matrix": [4, 4], "x": 5, "y": 5},
- {"matrix": [4, 2], "x": 6, "y": 5},
-
- {"matrix": [9, 3], "x": 10, "y": 5},
- {"matrix": [9, 1], "x": 11, "y": 5}
- ]
- },
- "LAYOUT_split_3x6_3": {
- "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": [5, 0], "x": 11, "y": 0},
- {"matrix": [5, 1], "x": 12, "y": 0},
- {"matrix": [5, 2], "x": 13, "y": 0},
- {"matrix": [5, 3], "x": 14, "y": 0},
- {"matrix": [5, 4], "x": 15, "y": 0},
- {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
- {"matrix": [6, 1], "x": 12, "y": 1},
- {"matrix": [6, 2], "x": 13, "y": 1},
- {"matrix": [6, 3], "x": 14, "y": 1},
- {"matrix": [6, 4], "x": 15, "y": 1},
- {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
- {"matrix": [7, 1], "x": 12, "y": 2},
- {"matrix": [7, 2], "x": 13, "y": 2},
- {"matrix": [7, 3], "x": 14, "y": 2},
- {"matrix": [7, 4], "x": 15, "y": 2},
- {"matrix": [7, 5], "x": 16, "y": 2},
-
- {"matrix": [3, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
- {"matrix": [4, 3], "x": 6, "y": 4},
-
- {"matrix": [9, 2], "x": 10, "y": 4},
- {"matrix": [9, 0], "x": 11, "y": 4},
- {"matrix": [8, 1], "x": 12, "y": 4}
- ]
- },
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"matrix": [0, 1], "x": 0, "y": 0},
- {"matrix": [0, 2], "x": 1, "y": 0},
- {"matrix": [0, 3], "x": 2, "y": 0},
- {"matrix": [0, 4], "x": 3, "y": 0},
- {"matrix": [0, 5], "x": 4, "y": 0},
-
- {"matrix": [5, 0], "x": 10, "y": 0},
- {"matrix": [5, 1], "x": 11, "y": 0},
- {"matrix": [5, 2], "x": 12, "y": 0},
- {"matrix": [5, 3], "x": 13, "y": 0},
- {"matrix": [5, 4], "x": 14, "y": 0},
-
- {"matrix": [1, 1], "x": 0, "y": 1},
- {"matrix": [1, 2], "x": 1, "y": 1},
- {"matrix": [1, 3], "x": 2, "y": 1},
- {"matrix": [1, 4], "x": 3, "y": 1},
- {"matrix": [1, 5], "x": 4, "y": 1},
-
- {"matrix": [6, 0], "x": 10, "y": 1},
- {"matrix": [6, 1], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1},
- {"matrix": [6, 3], "x": 13, "y": 1},
- {"matrix": [6, 4], "x": 14, "y": 1},
-
- {"matrix": [2, 1], "x": 0, "y": 2},
- {"matrix": [2, 2], "x": 1, "y": 2},
- {"matrix": [2, 3], "x": 2, "y": 2},
- {"matrix": [2, 4], "x": 3, "y": 2},
- {"matrix": [2, 5], "x": 4, "y": 2},
-
- {"matrix": [7, 0], "x": 10, "y": 2},
- {"matrix": [7, 1], "x": 11, "y": 2},
- {"matrix": [7, 2], "x": 12, "y": 2},
- {"matrix": [7, 3], "x": 13, "y": 2},
- {"matrix": [7, 4], "x": 14, "y": 2},
-
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [4, 5], "x": 5, "y": 3},
- {"matrix": [4, 3], "x": 6, "y": 3},
-
- {"matrix": [9, 2], "x": 8, "y": 3},
- {"matrix": [9, 0], "x": 9, "y": 3},
- {"matrix": [8, 1], "x": 10, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json
new file mode 100644
index 00000000000..a0607c70683
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json
@@ -0,0 +1,204 @@
+{
+ "keyboard_name": "Dactyl Manuform 4x6 5 thumb keys",
+ "manufacturer": "tshort",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3436",
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "community_layouts": ["split_3x6_3", "split_3x5_3"],
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 3], "x": 14, "y": 0},
+ {"matrix": [5, 4], "x": 15, "y": 0},
+ {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
+ {"matrix": [6, 1], "x": 12, "y": 1},
+ {"matrix": [6, 2], "x": 13, "y": 1},
+ {"matrix": [6, 3], "x": 14, "y": 1},
+ {"matrix": [6, 4], "x": 15, "y": 1},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
+ {"matrix": [7, 1], "x": 12, "y": 2},
+ {"matrix": [7, 2], "x": 13, "y": 2},
+ {"matrix": [7, 3], "x": 14, "y": 2},
+ {"matrix": [7, 4], "x": 15, "y": 2},
+ {"matrix": [7, 5], "x": 16, "y": 2},
+
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3},
+
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 3], "x": 6, "y": 4},
+
+ {"matrix": [9, 2], "x": 10, "y": 4},
+ {"matrix": [9, 0], "x": 11, "y": 4},
+ {"matrix": [8, 1], "x": 12, "y": 4},
+
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 2], "x": 6, "y": 5},
+
+ {"matrix": [9, 3], "x": 10, "y": 5},
+ {"matrix": [9, 1], "x": 11, "y": 5}
+ ]
+ },
+ "LAYOUT_split_3x6_3": {
+ "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": [5, 0], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 3], "x": 14, "y": 0},
+ {"matrix": [5, 4], "x": 15, "y": 0},
+ {"matrix": [5, 5], "x": 16, "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": [6, 0], "x": 11, "y": 1},
+ {"matrix": [6, 1], "x": 12, "y": 1},
+ {"matrix": [6, 2], "x": 13, "y": 1},
+ {"matrix": [6, 3], "x": 14, "y": 1},
+ {"matrix": [6, 4], "x": 15, "y": 1},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 2},
+ {"matrix": [7, 1], "x": 12, "y": 2},
+ {"matrix": [7, 2], "x": 13, "y": 2},
+ {"matrix": [7, 3], "x": 14, "y": 2},
+ {"matrix": [7, 4], "x": 15, "y": 2},
+ {"matrix": [7, 5], "x": 16, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 3], "x": 6, "y": 4},
+
+ {"matrix": [9, 2], "x": 10, "y": 4},
+ {"matrix": [9, 0], "x": 11, "y": 4},
+ {"matrix": [8, 1], "x": 12, "y": 4}
+ ]
+ },
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 1], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 5], "x": 4, "y": 0},
+
+ {"matrix": [5, 0], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 4], "x": 14, "y": 0},
+
+ {"matrix": [1, 1], "x": 0, "y": 1},
+ {"matrix": [1, 2], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 5], "x": 4, "y": 1},
+
+ {"matrix": [6, 0], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 4], "x": 14, "y": 1},
+
+ {"matrix": [2, 1], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 5], "x": 4, "y": 2},
+
+ {"matrix": [7, 0], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [4, 5], "x": 5, "y": 3},
+ {"matrix": [4, 3], "x": 6, "y": 3},
+
+ {"matrix": [9, 2], "x": 8, "y": 3},
+ {"matrix": [9, 0], "x": 9, "y": 3},
+ {"matrix": [8, 1], "x": 10, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json
deleted file mode 100644
index e6372961d8f..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
- "keyboard_name": "Dactyl-Manuform (5x6)",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3536",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_5x6": {
- "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": [6, 0], "x": 11, "y": 0},
- {"matrix": [6, 1], "x": 12, "y": 0},
- {"matrix": [6, 2], "x": 13, "y": 0},
- {"matrix": [6, 3], "x": 14, "y": 0},
- {"matrix": [6, 4], "x": 15, "y": 0},
- {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
- {"matrix": [7, 1], "x": 12, "y": 1},
- {"matrix": [7, 2], "x": 13, "y": 1},
- {"matrix": [7, 3], "x": 14, "y": 1},
- {"matrix": [7, 4], "x": 15, "y": 1},
- {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
- {"matrix": [8, 1], "x": 12, "y": 2},
- {"matrix": [8, 2], "x": 13, "y": 2},
- {"matrix": [8, 3], "x": 14, "y": 2},
- {"matrix": [8, 4], "x": 15, "y": 2},
- {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
- {"matrix": [9, 1], "x": 12, "y": 3},
- {"matrix": [9, 2], "x": 13, "y": 3},
- {"matrix": [9, 3], "x": 14, "y": 3},
- {"matrix": [9, 4], "x": 15, "y": 3},
- {"matrix": [9, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
-
- {"matrix": [10, 2], "x": 13, "y": 4},
- {"matrix": [10, 3], "x": 14, "y": 4},
-
- {"matrix": [4, 4], "x": 4, "y": 5},
- {"matrix": [4, 5], "x": 5, "y": 5},
-
- {"matrix": [10, 0], "x": 11, "y": 5},
- {"matrix": [10, 1], "x": 12, "y": 5},
-
- {"matrix": [5, 4], "x": 6, "y": 6},
- {"matrix": [5, 5], "x": 7, "y": 6},
-
- {"matrix": [11, 0], "x": 9, "y": 6},
- {"matrix": [11, 1], "x": 10, "y": 6},
-
- {"matrix": [5, 2], "x": 6, "y": 7},
- {"matrix": [5, 3], "x": 7, "y": 7},
-
- {"matrix": [11, 2], "x": 9, "y": 7},
- {"matrix": [11, 3], "x": 10, "y": 7}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json
new file mode 100644
index 00000000000..b5681f4ca7e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json
@@ -0,0 +1,121 @@
+{
+ "keyboard_name": "Dactyl-Manuform (5x6)",
+ "manufacturer": "tshort",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3536",
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_5x6": {
+ "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": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
+
+ {"matrix": [10, 0], "x": 11, "y": 5},
+ {"matrix": [10, 1], "x": 12, "y": 5},
+
+ {"matrix": [5, 4], "x": 6, "y": 6},
+ {"matrix": [5, 5], "x": 7, "y": 6},
+
+ {"matrix": [11, 0], "x": 9, "y": 6},
+ {"matrix": [11, 1], "x": 10, "y": 6},
+
+ {"matrix": [5, 2], "x": 6, "y": 7},
+ {"matrix": [5, 3], "x": 7, "y": 7},
+
+ {"matrix": [11, 2], "x": 9, "y": 7},
+ {"matrix": [11, 3], "x": 10, "y": 7}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
deleted file mode 100644
index e9aba3fa180..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "keyboard_name": "Dactyl-Manuform (5x6+2)",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "jceb",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3536",
- "device_version": "0.0.3"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0",
- "bootmagic": {
- "matrix": [6, 5]
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_5x6_2_5": {
- "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": [6, 0], "x": 11, "y": 0},
- {"matrix": [6, 1], "x": 12, "y": 0},
- {"matrix": [6, 2], "x": 13, "y": 0},
- {"matrix": [6, 3], "x": 14, "y": 0},
- {"matrix": [6, 4], "x": 15, "y": 0},
- {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
- {"matrix": [7, 1], "x": 12, "y": 1},
- {"matrix": [7, 2], "x": 13, "y": 1},
- {"matrix": [7, 3], "x": 14, "y": 1},
- {"matrix": [7, 4], "x": 15, "y": 1},
- {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
- {"matrix": [8, 1], "x": 12, "y": 2},
- {"matrix": [8, 2], "x": 13, "y": 2},
- {"matrix": [8, 3], "x": 14, "y": 2},
- {"matrix": [8, 4], "x": 15, "y": 2},
- {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
- {"matrix": [9, 1], "x": 12, "y": 3},
- {"matrix": [9, 2], "x": 13, "y": 3},
- {"matrix": [9, 3], "x": 14, "y": 3},
- {"matrix": [9, 4], "x": 15, "y": 3},
- {"matrix": [9, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 5, "y": 4},
- {"matrix": [5, 5], "x": 6, "y": 4},
- {"matrix": [5, 3], "x": 7, "y": 4},
-
- {"matrix": [11, 2], "x": 9, "y": 4},
- {"matrix": [11, 0], "x": 10, "y": 4},
- {"matrix": [10, 1], "x": 11, "y": 4},
- {"matrix": [10, 2], "x": 13, "y": 4},
- {"matrix": [10, 3], "x": 14, "y": 4},
- {"matrix": [10, 4], "x": 15, "y": 4},
- {"matrix": [10, 5], "x": 16, "y": 4},
-
- {"matrix": [5, 4], "x": 6, "y": 5},
- {"matrix": [5, 2], "x": 7, "y": 5},
-
- {"matrix": [11, 3], "x": 9, "y": 5},
- {"matrix": [11, 1], "x": 10, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json
new file mode 100644
index 00000000000..e36acea627c
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json
@@ -0,0 +1,116 @@
+{
+ "keyboard_name": "Dactyl-Manuform (5x6+2)",
+ "manufacturer": "tshort",
+ "url": "",
+ "maintainer": "jceb",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3536",
+ "device_version": "0.0.3"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "bootmagic": {
+ "matrix": [6, 5]
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_5x6_2_5": {
+ "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": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
+ {"matrix": [5, 5], "x": 6, "y": 4},
+ {"matrix": [5, 3], "x": 7, "y": 4},
+
+ {"matrix": [11, 2], "x": 9, "y": 4},
+ {"matrix": [11, 0], "x": 10, "y": 4},
+ {"matrix": [10, 1], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+ {"matrix": [10, 4], "x": 15, "y": 4},
+ {"matrix": [10, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 4], "x": 6, "y": 5},
+ {"matrix": [5, 2], "x": 7, "y": 5},
+
+ {"matrix": [11, 3], "x": 9, "y": 5},
+ {"matrix": [11, 1], "x": 10, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk
deleted file mode 100644
index 04b1fc01b7f..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk
+++ /dev/null
@@ -1,13 +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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
deleted file mode 100644
index e60286d1664..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
- "keyboard_name": "Dactyl-Manuform (5x6)",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "jceb",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3536",
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0",
- "bootmagic": {
- "matrix": [6, 5]
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_5x6_5": {
- "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": [6, 0], "x": 11, "y": 0},
- {"matrix": [6, 1], "x": 12, "y": 0},
- {"matrix": [6, 2], "x": 13, "y": 0},
- {"matrix": [6, 3], "x": 14, "y": 0},
- {"matrix": [6, 4], "x": 15, "y": 0},
- {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
- {"matrix": [7, 1], "x": 12, "y": 1},
- {"matrix": [7, 2], "x": 13, "y": 1},
- {"matrix": [7, 3], "x": 14, "y": 1},
- {"matrix": [7, 4], "x": 15, "y": 1},
- {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
- {"matrix": [8, 1], "x": 12, "y": 2},
- {"matrix": [8, 2], "x": 13, "y": 2},
- {"matrix": [8, 3], "x": 14, "y": 2},
- {"matrix": [8, 4], "x": 15, "y": 2},
- {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
- {"matrix": [9, 1], "x": 12, "y": 3},
- {"matrix": [9, 2], "x": 13, "y": 3},
- {"matrix": [9, 3], "x": 14, "y": 3},
- {"matrix": [9, 4], "x": 15, "y": 3},
- {"matrix": [9, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 5, "y": 4},
- {"matrix": [5, 5], "x": 6, "y": 4},
- {"matrix": [5, 3], "x": 7, "y": 4},
-
- {"matrix": [11, 2], "x": 9, "y": 4},
- {"matrix": [11, 0], "x": 10, "y": 4},
- {"matrix": [10, 1], "x": 11, "y": 4},
- {"matrix": [10, 2], "x": 13, "y": 4},
- {"matrix": [10, 3], "x": 14, "y": 4},
-
- {"matrix": [5, 4], "x": 6, "y": 5},
- {"matrix": [5, 2], "x": 7, "y": 5},
-
- {"matrix": [11, 3], "x": 9, "y": 5},
- {"matrix": [11, 1], "x": 10, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json
new file mode 100644
index 00000000000..1153bcdb44e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json
@@ -0,0 +1,112 @@
+{
+ "keyboard_name": "Dactyl-Manuform (5x6)",
+ "manufacturer": "tshort",
+ "url": "",
+ "maintainer": "jceb",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3536",
+ "device_version": "0.0.2"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "bootmagic": {
+ "matrix": [6, 5]
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_5x6_5": {
+ "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": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
+ {"matrix": [5, 5], "x": 6, "y": 4},
+ {"matrix": [5, 3], "x": 7, "y": 4},
+
+ {"matrix": [11, 2], "x": 9, "y": 4},
+ {"matrix": [11, 0], "x": 10, "y": 4},
+ {"matrix": [10, 1], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+
+ {"matrix": [5, 4], "x": 6, "y": 5},
+ {"matrix": [5, 2], "x": 7, "y": 5},
+
+ {"matrix": [11, 3], "x": 9, "y": 5},
+ {"matrix": [11, 1], "x": 10, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk
deleted file mode 100644
index c397f50ab5c..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk
+++ /dev/null
@@ -1,13 +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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
deleted file mode 100644
index a00a3bda18d..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
- "manufacturer": "QMK",
- "keyboard_name": "Dactyl Manuform 5x6+6",
- "url": "https://github.com/fgoodwin/dactyl-manuform-5x6_6/tree/main/5x6_6",
- "maintainer": "fgoodwin",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3536",
- "device_version": "0.0.3"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_split_5x6_6": {
- "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": [7, 0], "x": 11, "y": 0},
- {"matrix": [7, 1], "x": 12, "y": 0},
- {"matrix": [7, 2], "x": 13, "y": 0},
- {"matrix": [7, 3], "x": 14, "y": 0},
- {"matrix": [7, 4], "x": 15, "y": 0},
- {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
- {"matrix": [8, 1], "x": 12, "y": 1},
- {"matrix": [8, 2], "x": 13, "y": 1},
- {"matrix": [8, 3], "x": 14, "y": 1},
- {"matrix": [8, 4], "x": 15, "y": 1},
- {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
- {"matrix": [9, 1], "x": 12, "y": 2},
- {"matrix": [9, 2], "x": 13, "y": 2},
- {"matrix": [9, 3], "x": 14, "y": 2},
- {"matrix": [9, 4], "x": 15, "y": 2},
- {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
- {"matrix": [10, 1], "x": 12, "y": 3},
- {"matrix": [10, 2], "x": 13, "y": 3},
- {"matrix": [10, 3], "x": 14, "y": 3},
- {"matrix": [10, 4], "x": 15, "y": 3},
- {"matrix": [10, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 5, "y": 4},
- {"matrix": [4, 5], "x": 6, "y": 4},
-
- {"matrix": [11, 0], "x": 7, "y": 4},
- {"matrix": [11, 1], "x": 9, "y": 4},
- {"matrix": [11, 2], "x": 10, "y": 4},
- {"matrix": [11, 3], "x": 11, "y": 4},
-
- {"matrix": [5, 4], "x": 13, "y": 4},
- {"matrix": [5, 5], "x": 14, "y": 4},
-
- {"matrix": [12, 0], "x": 5, "y": 5},
- {"matrix": [12, 1], "x": 6, "y": 5},
-
- {"matrix": [6, 4], "x": 7, "y": 5},
- {"matrix": [6, 5], "x": 5, "y": 5},
-
- {"matrix": [13, 0], "x": 9, "y": 5},
- {"matrix": [13, 1], "x": 10, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json
new file mode 100644
index 00000000000..8a3e69f2efb
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json
@@ -0,0 +1,113 @@
+{
+ "manufacturer": "QMK",
+ "keyboard_name": "Dactyl Manuform 5x6+6",
+ "url": "https://github.com/fgoodwin/dactyl-manuform-5x6_6/tree/main/5x6_6",
+ "maintainer": "fgoodwin",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3536",
+ "device_version": "0.0.3"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_split_5x6_6": {
+ "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": [7, 0], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [7, 2], "x": 13, "y": 0},
+ {"matrix": [7, 3], "x": 14, "y": 0},
+ {"matrix": [7, 4], "x": 15, "y": 0},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
+ {"matrix": [8, 1], "x": 12, "y": 1},
+ {"matrix": [8, 2], "x": 13, "y": 1},
+ {"matrix": [8, 3], "x": 14, "y": 1},
+ {"matrix": [8, 4], "x": 15, "y": 1},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
+ {"matrix": [9, 1], "x": 12, "y": 2},
+ {"matrix": [9, 2], "x": 13, "y": 2},
+ {"matrix": [9, 3], "x": 14, "y": 2},
+ {"matrix": [9, 4], "x": 15, "y": 2},
+ {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
+ {"matrix": [10, 1], "x": 12, "y": 3},
+ {"matrix": [10, 2], "x": 13, "y": 3},
+ {"matrix": [10, 3], "x": 14, "y": 3},
+ {"matrix": [10, 4], "x": 15, "y": 3},
+ {"matrix": [10, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4},
+ {"matrix": [4, 5], "x": 6, "y": 4},
+
+ {"matrix": [11, 0], "x": 7, "y": 4},
+ {"matrix": [11, 1], "x": 9, "y": 4},
+ {"matrix": [11, 2], "x": 10, "y": 4},
+ {"matrix": [11, 3], "x": 11, "y": 4},
+
+ {"matrix": [5, 4], "x": 13, "y": 4},
+ {"matrix": [5, 5], "x": 14, "y": 4},
+
+ {"matrix": [12, 0], "x": 5, "y": 5},
+ {"matrix": [12, 1], "x": 6, "y": 5},
+
+ {"matrix": [6, 4], "x": 7, "y": 5},
+ {"matrix": [6, 5], "x": 5, "y": 5},
+
+ {"matrix": [13, 0], "x": 9, "y": 5},
+ {"matrix": [13, 1], "x": 10, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
deleted file mode 100644
index 59ada7958fa..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/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 = yes # 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
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json
deleted file mode 100644
index 68270606cc4..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
- "keyboard_name": "Dactyl-Manuform (5x7)",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3537",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_5x7": {
- "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
-
- {"matrix": [4, 4], "x": 4, "y": 5},
- {"matrix": [4, 5], "x": 5, "y": 5},
-
- {"matrix": [5, 4], "x": 6, "y": 6},
- {"matrix": [5, 5], "x": 7, "y": 6},
-
- {"matrix": [5, 2], "x": 6, "y": 7},
- {"matrix": [5, 3], "x": 7, "y": 7},
-
- {"matrix": [6, 0], "x": 10, "y": 0},
- {"matrix": [6, 1], "x": 11, "y": 0},
- {"matrix": [6, 2], "x": 12, "y": 0},
- {"matrix": [6, 3], "x": 13, "y": 0},
- {"matrix": [6, 4], "x": 14, "y": 0},
- {"matrix": [6, 5], "x": 15, "y": 0},
- {"matrix": [6, 6], "x": 16, "y": 0},
-
- {"matrix": [7, 0], "x": 10, "y": 1},
- {"matrix": [7, 1], "x": 11, "y": 1},
- {"matrix": [7, 2], "x": 12, "y": 1},
- {"matrix": [7, 3], "x": 13, "y": 1},
- {"matrix": [7, 4], "x": 14, "y": 1},
- {"matrix": [7, 5], "x": 15, "y": 1},
- {"matrix": [7, 6], "x": 16, "y": 1},
-
- {"matrix": [8, 0], "x": 10, "y": 2},
- {"matrix": [8, 1], "x": 11, "y": 2},
- {"matrix": [8, 2], "x": 12, "y": 2},
- {"matrix": [8, 3], "x": 13, "y": 2},
- {"matrix": [8, 4], "x": 14, "y": 2},
- {"matrix": [8, 5], "x": 15, "y": 2},
- {"matrix": [8, 6], "x": 16, "y": 2},
-
- {"matrix": [9, 1], "x": 11, "y": 3},
- {"matrix": [9, 2], "x": 12, "y": 3},
- {"matrix": [9, 3], "x": 13, "y": 3},
- {"matrix": [9, 4], "x": 14, "y": 3},
- {"matrix": [9, 5], "x": 15, "y": 3},
- {"matrix": [9, 6], "x": 16, "y": 3},
-
- {"matrix": [10, 3], "x": 13, "y": 4},
- {"matrix": [10, 4], "x": 14, "y": 4},
- {"matrix": [10, 5], "x": 15, "y": 4},
- {"matrix": [10, 6], "x": 16, "y": 4},
-
- {"matrix": [10, 1], "x": 11, "y": 5},
- {"matrix": [10, 2], "x": 12, "y": 5},
-
- {"matrix": [11, 1], "x": 9, "y": 6},
- {"matrix": [11, 2], "x": 10, "y": 6},
-
- {"matrix": [11, 3], "x": 9, "y": 7},
- {"matrix": [11, 4], "x": 10, "y": 7}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json
new file mode 100644
index 00000000000..bc734607cf3
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json
@@ -0,0 +1,131 @@
+{
+ "keyboard_name": "Dactyl-Manuform (5x7)",
+ "manufacturer": "tshort",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3537",
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_5x7": {
+ "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
+
+ {"matrix": [5, 4], "x": 6, "y": 6},
+ {"matrix": [5, 5], "x": 7, "y": 6},
+
+ {"matrix": [5, 2], "x": 6, "y": 7},
+ {"matrix": [5, 3], "x": 7, "y": 7},
+
+ {"matrix": [6, 0], "x": 10, "y": 0},
+ {"matrix": [6, 1], "x": 11, "y": 0},
+ {"matrix": [6, 2], "x": 12, "y": 0},
+ {"matrix": [6, 3], "x": 13, "y": 0},
+ {"matrix": [6, 4], "x": 14, "y": 0},
+ {"matrix": [6, 5], "x": 15, "y": 0},
+ {"matrix": [6, 6], "x": 16, "y": 0},
+
+ {"matrix": [7, 0], "x": 10, "y": 1},
+ {"matrix": [7, 1], "x": 11, "y": 1},
+ {"matrix": [7, 2], "x": 12, "y": 1},
+ {"matrix": [7, 3], "x": 13, "y": 1},
+ {"matrix": [7, 4], "x": 14, "y": 1},
+ {"matrix": [7, 5], "x": 15, "y": 1},
+ {"matrix": [7, 6], "x": 16, "y": 1},
+
+ {"matrix": [8, 0], "x": 10, "y": 2},
+ {"matrix": [8, 1], "x": 11, "y": 2},
+ {"matrix": [8, 2], "x": 12, "y": 2},
+ {"matrix": [8, 3], "x": 13, "y": 2},
+ {"matrix": [8, 4], "x": 14, "y": 2},
+ {"matrix": [8, 5], "x": 15, "y": 2},
+ {"matrix": [8, 6], "x": 16, "y": 2},
+
+ {"matrix": [9, 1], "x": 11, "y": 3},
+ {"matrix": [9, 2], "x": 12, "y": 3},
+ {"matrix": [9, 3], "x": 13, "y": 3},
+ {"matrix": [9, 4], "x": 14, "y": 3},
+ {"matrix": [9, 5], "x": 15, "y": 3},
+ {"matrix": [9, 6], "x": 16, "y": 3},
+
+ {"matrix": [10, 3], "x": 13, "y": 4},
+ {"matrix": [10, 4], "x": 14, "y": 4},
+ {"matrix": [10, 5], "x": 15, "y": 4},
+ {"matrix": [10, 6], "x": 16, "y": 4},
+
+ {"matrix": [10, 1], "x": 11, "y": 5},
+ {"matrix": [10, 2], "x": 12, "y": 5},
+
+ {"matrix": [11, 1], "x": 9, "y": 6},
+ {"matrix": [11, 2], "x": 10, "y": 6},
+
+ {"matrix": [11, 3], "x": 9, "y": 7},
+ {"matrix": [11, 4], "x": 10, "y": 7}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/5x7/rules.mk b/keyboards/handwired/dactyl_manuform/5x7/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
index f63f1594673..9391d3a46d4 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
@@ -5,9 +5,17 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"bootmagic": {
"matrix": [7, 0]
}
},
- "development_board": "blackpill_f411"
+ "development_board": "blackpill_f411",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ }
}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
index 9be91100437..c018471cadc 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
@@ -1,21 +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 = 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
-
-
-# Build Options
-# change yes to no to disable
-#
-SPLIT_KEYBOARD = yes
# split settings
# https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver
SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
index 245310fd3c5..0ec00196ba5 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
@@ -5,6 +5,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
@@ -14,5 +15,11 @@
"pin": "D3"
},
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ }
}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
index 84645084d3a..29194b429ef 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
@@ -1,15 +1 @@
-# 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 = 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
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = handwired/dactyl_manuform/6x6/promicro
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
deleted file mode 100644
index 955060de7a0..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
- "keyboard_name": "Dactyl-Manuform (6x6+4)",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "dmik",
- "usb": {
- "vid": "0x444D",
- "pid": "0x3636",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_6x6_4": {
- "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": [7, 0], "x": 11, "y": 0},
- {"matrix": [7, 1], "x": 12, "y": 0},
- {"matrix": [7, 2], "x": 13, "y": 0},
- {"matrix": [7, 3], "x": 14, "y": 0},
- {"matrix": [7, 4], "x": 15, "y": 0},
- {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
- {"matrix": [8, 1], "x": 12, "y": 1},
- {"matrix": [8, 2], "x": 13, "y": 1},
- {"matrix": [8, 3], "x": 14, "y": 1},
- {"matrix": [8, 4], "x": 15, "y": 1},
- {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
- {"matrix": [9, 1], "x": 12, "y": 2},
- {"matrix": [9, 2], "x": 13, "y": 2},
- {"matrix": [9, 3], "x": 14, "y": 2},
- {"matrix": [9, 4], "x": 15, "y": 2},
- {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
- {"matrix": [10, 1], "x": 12, "y": 3},
- {"matrix": [10, 2], "x": 13, "y": 3},
- {"matrix": [10, 3], "x": 14, "y": 3},
- {"matrix": [10, 4], "x": 15, "y": 3},
- {"matrix": [10, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
-
- {"matrix": [11, 0], "x": 11, "y": 4},
- {"matrix": [11, 1], "x": 12, "y": 4},
- {"matrix": [11, 2], "x": 13, "y": 4},
- {"matrix": [11, 3], "x": 14, "y": 4},
- {"matrix": [11, 4], "x": 15, "y": 4},
- {"matrix": [11, 5], "x": 16, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5},
- {"matrix": [5, 1], "x": 1, "y": 5},
- {"matrix": [5, 2], "x": 2, "y": 5},
- {"matrix": [5, 3], "x": 3, "y": 5},
-
- {"matrix": [12, 2], "x": 13, "y": 5},
- {"matrix": [12, 3], "x": 14, "y": 5},
- {"matrix": [12, 4], "x": 15, "y": 5},
- {"matrix": [12, 5], "x": 16, "y": 5},
-
- {"matrix": [5, 4], "x": 4, "y": 6},
- {"matrix": [5, 5], "x": 5, "y": 6},
-
- {"matrix": [12, 0], "x": 11, "y": 6},
- {"matrix": [12, 1], "x": 12, "y": 6},
-
- {"matrix": [6, 4], "x": 6, "y": 7},
- {"matrix": [6, 5], "x": 7, "y": 7},
-
- {"matrix": [13, 0], "x": 9, "y": 7},
- {"matrix": [13, 1], "x": 10, "y": 7},
-
- {"matrix": [6, 2], "x": 6, "y": 8},
- {"matrix": [6, 3], "x": 7, "y": 8},
-
- {"matrix": [13, 2], "x": 9, "y": 8},
- {"matrix": [13, 3], "x": 10, "y": 8}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json
new file mode 100644
index 00000000000..36051fb7feb
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json
@@ -0,0 +1,139 @@
+{
+ "keyboard_name": "Dactyl-Manuform (6x6+4)",
+ "manufacturer": "tshort",
+ "url": "",
+ "maintainer": "dmik",
+ "usb": {
+ "vid": "0x444D",
+ "pid": "0x3636",
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_6x6_4": {
+ "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": [7, 0], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [7, 2], "x": 13, "y": 0},
+ {"matrix": [7, 3], "x": 14, "y": 0},
+ {"matrix": [7, 4], "x": 15, "y": 0},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 1},
+ {"matrix": [8, 1], "x": 12, "y": 1},
+ {"matrix": [8, 2], "x": 13, "y": 1},
+ {"matrix": [8, 3], "x": 14, "y": 1},
+ {"matrix": [8, 4], "x": 15, "y": 1},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2},
+ {"matrix": [9, 1], "x": 12, "y": 2},
+ {"matrix": [9, 2], "x": 13, "y": 2},
+ {"matrix": [9, 3], "x": 14, "y": 2},
+ {"matrix": [9, 4], "x": 15, "y": 2},
+ {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3},
+ {"matrix": [10, 1], "x": 12, "y": 3},
+ {"matrix": [10, 2], "x": 13, "y": 3},
+ {"matrix": [10, 3], "x": 14, "y": 3},
+ {"matrix": [10, 4], "x": 15, "y": 3},
+ {"matrix": [10, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [11, 0], "x": 11, "y": 4},
+ {"matrix": [11, 1], "x": 12, "y": 4},
+ {"matrix": [11, 2], "x": 13, "y": 4},
+ {"matrix": [11, 3], "x": 14, "y": 4},
+ {"matrix": [11, 4], "x": 15, "y": 4},
+ {"matrix": [11, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+
+ {"matrix": [12, 2], "x": 13, "y": 5},
+ {"matrix": [12, 3], "x": 14, "y": 5},
+ {"matrix": [12, 4], "x": 15, "y": 5},
+ {"matrix": [12, 5], "x": 16, "y": 5},
+
+ {"matrix": [5, 4], "x": 4, "y": 6},
+ {"matrix": [5, 5], "x": 5, "y": 6},
+
+ {"matrix": [12, 0], "x": 11, "y": 6},
+ {"matrix": [12, 1], "x": 12, "y": 6},
+
+ {"matrix": [6, 4], "x": 6, "y": 7},
+ {"matrix": [6, 5], "x": 7, "y": 7},
+
+ {"matrix": [13, 0], "x": 9, "y": 7},
+ {"matrix": [13, 1], "x": 10, "y": 7},
+
+ {"matrix": [6, 2], "x": 6, "y": 8},
+ {"matrix": [6, 3], "x": 7, "y": 8},
+
+ {"matrix": [13, 2], "x": 9, "y": 8},
+ {"matrix": [13, 3], "x": 10, "y": 8}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json
deleted file mode 100644
index 2ae20d2f4a8..00000000000
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
- "keyboard_name": "Dactyl Ergo(6x6)",
- "manufacturer": "tshort",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 12
- },
- "ws2812": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_6x6": {
- "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": [6, 0], "x": 11, "y": 0},
- {"matrix": [6, 1], "x": 12, "y": 0},
- {"matrix": [6, 2], "x": 13, "y": 0},
- {"matrix": [6, 3], "x": 14, "y": 0},
- {"matrix": [6, 4], "x": 15, "y": 0},
- {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
- {"matrix": [7, 1], "x": 12, "y": 1},
- {"matrix": [7, 2], "x": 13, "y": 1},
- {"matrix": [7, 3], "x": 14, "y": 1},
- {"matrix": [7, 4], "x": 15, "y": 1},
- {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
- {"matrix": [8, 1], "x": 12, "y": 2},
- {"matrix": [8, 2], "x": 13, "y": 2},
- {"matrix": [8, 3], "x": 14, "y": 2},
- {"matrix": [8, 4], "x": 15, "y": 2},
- {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
- {"matrix": [9, 1], "x": 12, "y": 3},
- {"matrix": [9, 2], "x": 13, "y": 3},
- {"matrix": [9, 3], "x": 14, "y": 3},
- {"matrix": [9, 4], "x": 15, "y": 3},
- {"matrix": [9, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 6, "h": 2},
-
- {"matrix": [10, 0], "x": 11, "y": 6, "h": 2},
- {"matrix": [10, 1], "x": 12, "y": 4},
- {"matrix": [10, 2], "x": 13, "y": 4},
- {"matrix": [10, 3], "x": 14, "y": 4},
- {"matrix": [10, 4], "x": 15, "y": 4},
- {"matrix": [10, 5], "x": 16, "y": 4},
-
- {"matrix": [5, 5], "x": 6, "y": 6, "h": 2},
- {"matrix": [5, 1], "x": 6, "y": 5},
- {"matrix": [5, 2], "x": 7, "y": 5},
-
- {"matrix": [11, 3], "x": 9, "y": 5},
- {"matrix": [11, 4], "x": 10, "y": 5},
- {"matrix": [11, 0], "x": 10, "y": 6, "h": 2},
-
- {"matrix": [5, 3], "x": 7, "y": 6},
- {"matrix": [11, 2], "x": 9, "y": 6},
-
- {"matrix": [5, 4], "x": 7, "y": 7},
- {"matrix": [11, 1], "x": 9, "y": 7}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_promicro/keyboard.json b/keyboards/handwired/dactyl_promicro/keyboard.json
new file mode 100644
index 00000000000..572ea05b2f3
--- /dev/null
+++ b/keyboards/handwired/dactyl_promicro/keyboard.json
@@ -0,0 +1,125 @@
+{
+ "keyboard_name": "Dactyl Ergo(6x6)",
+ "manufacturer": "tshort",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 12
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_6x6": {
+ "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": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 6, "h": 2},
+
+ {"matrix": [10, 0], "x": 11, "y": 6, "h": 2},
+ {"matrix": [10, 1], "x": 12, "y": 4},
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+ {"matrix": [10, 4], "x": 15, "y": 4},
+ {"matrix": [10, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 5], "x": 6, "y": 6, "h": 2},
+ {"matrix": [5, 1], "x": 6, "y": 5},
+ {"matrix": [5, 2], "x": 7, "y": 5},
+
+ {"matrix": [11, 3], "x": 9, "y": 5},
+ {"matrix": [11, 4], "x": 10, "y": 5},
+ {"matrix": [11, 0], "x": 10, "y": 6, "h": 2},
+
+ {"matrix": [5, 3], "x": 7, "y": 6},
+ {"matrix": [11, 2], "x": 9, "y": 6},
+
+ {"matrix": [5, 4], "x": 7, "y": 7},
+ {"matrix": [11, 1], "x": 9, "y": 7}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_promicro/rules.mk b/keyboards/handwired/dactyl_promicro/rules.mk
deleted file mode 100644
index d3768185db4..00000000000
--- a/keyboards/handwired/dactyl_promicro/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json
deleted file mode 100644
index bfacb99a4b0..00000000000
--- a/keyboards/handwired/dactyl_rah/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
- "keyboard_name": "Dactyl RAH",
- "manufacturer": "ralphie02",
- "url": "https://qmk.fm/keyboards/",
- "maintainer": "ralphie02",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "tapping": {
- "toggle": 1
- },
- "layouts": {
- "LAYOUT_6x6": {
- "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": [6, 0], "x": 11, "y": 0},
- {"matrix": [6, 1], "x": 12, "y": 0},
- {"matrix": [6, 2], "x": 13, "y": 0},
- {"matrix": [6, 3], "x": 14, "y": 0},
- {"matrix": [6, 4], "x": 15, "y": 0},
- {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
- {"matrix": [7, 1], "x": 12, "y": 1},
- {"matrix": [7, 2], "x": 13, "y": 1},
- {"matrix": [7, 3], "x": 14, "y": 1},
- {"matrix": [7, 4], "x": 15, "y": 1},
- {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
- {"matrix": [8, 1], "x": 12, "y": 2},
- {"matrix": [8, 2], "x": 13, "y": 2},
- {"matrix": [8, 3], "x": 14, "y": 2},
- {"matrix": [8, 4], "x": 15, "y": 2},
- {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
- {"matrix": [9, 1], "x": 12, "y": 3},
- {"matrix": [9, 2], "x": 13, "y": 3},
- {"matrix": [9, 3], "x": 14, "y": 3},
- {"matrix": [9, 4], "x": 15, "y": 3},
- {"matrix": [9, 5], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
-
- {"matrix": [10, 1], "x": 12, "y": 4},
- {"matrix": [10, 2], "x": 13, "y": 4},
- {"matrix": [10, 3], "x": 14, "y": 4},
- {"matrix": [10, 4], "x": 15, "y": 4},
- {"matrix": [10, 5], "x": 16, "y": 4},
-
- {"matrix": [5, 5], "x": 6, "y": 5},
- {"matrix": [5, 4], "x": 7, "y": 5},
-
- {"matrix": [11, 1], "x": 9, "y": 5},
- {"matrix": [11, 0], "x": 10, "y": 5},
-
- {"matrix": [5, 3], "x": 7, "y": 6},
-
- {"matrix": [11, 2], "x": 9, "y": 6},
-
- {"matrix": [5, 0], "x": 5, "y": 7, "h": 2},
- {"matrix": [5, 1], "x": 6, "y": 7, "h": 2},
- {"matrix": [5, 2], "x": 7, "y": 7},
-
- {"matrix": [11, 3], "x": 9, "y": 7},
- {"matrix": [11, 4], "x": 10, "y": 7, "h": 2},
- {"matrix": [11, 5], "x": 11, "y": 7, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/dactyl_rah/keyboard.json b/keyboards/handwired/dactyl_rah/keyboard.json
new file mode 100644
index 00000000000..f550a055c7f
--- /dev/null
+++ b/keyboards/handwired/dactyl_rah/keyboard.json
@@ -0,0 +1,124 @@
+{
+ "keyboard_name": "Dactyl RAH",
+ "manufacturer": "ralphie02",
+ "url": "https://qmk.fm/keyboards/",
+ "maintainer": "ralphie02",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "tapping": {
+ "toggle": 1
+ },
+ "layouts": {
+ "LAYOUT_6x6": {
+ "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": [6, 0], "x": 11, "y": 0},
+ {"matrix": [6, 1], "x": 12, "y": 0},
+ {"matrix": [6, 2], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 4], "x": 15, "y": 0},
+ {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1},
+ {"matrix": [7, 1], "x": 12, "y": 1},
+ {"matrix": [7, 2], "x": 13, "y": 1},
+ {"matrix": [7, 3], "x": 14, "y": 1},
+ {"matrix": [7, 4], "x": 15, "y": 1},
+ {"matrix": [7, 5], "x": 16, "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": [8, 0], "x": 11, "y": 2},
+ {"matrix": [8, 1], "x": 12, "y": 2},
+ {"matrix": [8, 2], "x": 13, "y": 2},
+ {"matrix": [8, 3], "x": 14, "y": 2},
+ {"matrix": [8, 4], "x": 15, "y": 2},
+ {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3},
+ {"matrix": [9, 1], "x": 12, "y": 3},
+ {"matrix": [9, 2], "x": 13, "y": 3},
+ {"matrix": [9, 3], "x": 14, "y": 3},
+ {"matrix": [9, 4], "x": 15, "y": 3},
+ {"matrix": [9, 5], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+
+ {"matrix": [10, 1], "x": 12, "y": 4},
+ {"matrix": [10, 2], "x": 13, "y": 4},
+ {"matrix": [10, 3], "x": 14, "y": 4},
+ {"matrix": [10, 4], "x": 15, "y": 4},
+ {"matrix": [10, 5], "x": 16, "y": 4},
+
+ {"matrix": [5, 5], "x": 6, "y": 5},
+ {"matrix": [5, 4], "x": 7, "y": 5},
+
+ {"matrix": [11, 1], "x": 9, "y": 5},
+ {"matrix": [11, 0], "x": 10, "y": 5},
+
+ {"matrix": [5, 3], "x": 7, "y": 6},
+
+ {"matrix": [11, 2], "x": 9, "y": 6},
+
+ {"matrix": [5, 0], "x": 5, "y": 7, "h": 2},
+ {"matrix": [5, 1], "x": 6, "y": 7, "h": 2},
+ {"matrix": [5, 2], "x": 7, "y": 7},
+
+ {"matrix": [11, 3], "x": 9, "y": 7},
+ {"matrix": [11, 4], "x": 10, "y": 7, "h": 2},
+ {"matrix": [11, 5], "x": 11, "y": 7, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/dactyl_rah/rules.mk b/keyboards/handwired/dactyl_rah/rules.mk
deleted file mode 100644
index b893863bb52..00000000000
--- a/keyboards/handwired/dactyl_rah/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 = 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json
index 372619565da..96e49388dc8 100644
--- a/keyboards/handwired/datahand/info.json
+++ b/keyboards/handwired/datahand/info.json
@@ -11,6 +11,14 @@
},
"processor": "at90usb1286",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
"debounce": 0,
"layouts": {
"LAYOUT": {
diff --git a/keyboards/handwired/datahand/rules.mk b/keyboards/handwired/datahand/rules.mk
index 447e7fdc02c..a0a4f497e13 100644
--- a/keyboards/handwired/datahand/rules.mk
+++ b/keyboards/handwired/datahand/rules.mk
@@ -1,15 +1,4 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-CUSTOM_MATRIX = yes # We definitely have a nonstandard matrix
+CUSTOM_MATRIX = yes
# Project specific files
SRC = matrix.c
diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json
index 4df41850109..4e45a5a920c 100644
--- a/keyboards/handwired/dqz11n1g/info.json
+++ b/keyboards/handwired/dqz11n1g/info.json
@@ -15,6 +15,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "audio": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/dqz11n1g/rules.mk b/keyboards/handwired/dqz11n1g/rules.mk
index 220e353ab77..d998c6a8843 100644
--- a/keyboards/handwired/dqz11n1g/rules.mk
+++ b/keyboards/handwired/dqz11n1g/rules.mk
@@ -2,17 +2,3 @@
CUSTOM_MATRIX = lite
SRC += matrix.c
SPI_DRIVER_REQUIRED = yes
-
-# 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 = 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 = yes # Audio output
-
diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json
index be32abfb94c..2d0c354f3b2 100644
--- a/keyboards/handwired/dygma/raise/info.json
+++ b/keyboards/handwired/dygma/raise/info.json
@@ -25,5 +25,11 @@
"sleep": true
},
"development_board": "blackpill_f411",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
"debounce": 0
}
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index ecf156629aa..7a078c9757b 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -1,16 +1,3 @@
-# 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
CUSTOM_MATRIX = lite
# TODO(ibash) we don't actually need to enable raw, but there's some side effect
diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json
deleted file mode 100644
index 9a43e14c883..00000000000
--- a/keyboards/handwired/elrgo_s/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "keyboard_name": "Elrgo S",
- "manufacturer": "Eloren",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x454C",
- "pid": "0x3436",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
- "rows": ["B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_split_3x6_5": {
- "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": [4, 0], "x": 9, "y": 0},
- {"matrix": [4, 1], "x": 10, "y": 0},
- {"matrix": [4, 2], "x": 11, "y": 0},
- {"matrix": [4, 3], "x": 12, "y": 0},
- {"matrix": [4, 4], "x": 13, "y": 0},
- {"matrix": [4, 5], "x": 14, "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": [5, 0], "x": 9, "y": 1},
- {"matrix": [5, 1], "x": 10, "y": 1},
- {"matrix": [5, 2], "x": 11, "y": 1},
- {"matrix": [5, 3], "x": 12, "y": 1},
- {"matrix": [5, 4], "x": 13, "y": 1},
- {"matrix": [5, 5], "x": 14, "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": [6, 0], "x": 9, "y": 2},
- {"matrix": [6, 1], "x": 10, "y": 2},
- {"matrix": [6, 2], "x": 11, "y": 2},
- {"matrix": [6, 3], "x": 12, "y": 2},
- {"matrix": [6, 4], "x": 13, "y": 2},
- {"matrix": [6, 5], "x": 14, "y": 2},
-
- {"matrix": [3, 1], "x": 3, "y": 3},
- {"matrix": [3, 2], "x": 4, "y": 3},
- {"matrix": [3, 3], "x": 5, "y": 3},
- {"matrix": [3, 4], "x": 6, "y": 3},
-
- {"matrix": [3, 5], "x": 6, "y": 2},
-
- {"matrix": [7, 0], "x": 8, "y": 2},
-
- {"matrix": [7, 1], "x": 8, "y": 3},
- {"matrix": [7, 2], "x": 9, "y": 3},
- {"matrix": [7, 3], "x": 10, "y": 3},
- {"matrix": [7, 4], "x": 11, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/elrgo_s/keyboard.json b/keyboards/handwired/elrgo_s/keyboard.json
new file mode 100644
index 00000000000..0da809d2ac5
--- /dev/null
+++ b/keyboards/handwired/elrgo_s/keyboard.json
@@ -0,0 +1,91 @@
+{
+ "keyboard_name": "Elrgo S",
+ "manufacturer": "Eloren",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x454C",
+ "pid": "0x3436",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_split_3x6_5": {
+ "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": [4, 0], "x": 9, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 4], "x": 13, "y": 0},
+ {"matrix": [4, 5], "x": 14, "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": [5, 0], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 4], "x": 13, "y": 1},
+ {"matrix": [5, 5], "x": 14, "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": [6, 0], "x": 9, "y": 2},
+ {"matrix": [6, 1], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 4], "x": 13, "y": 2},
+ {"matrix": [6, 5], "x": 14, "y": 2},
+
+ {"matrix": [3, 1], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 4], "x": 6, "y": 3},
+
+ {"matrix": [3, 5], "x": 6, "y": 2},
+
+ {"matrix": [7, 0], "x": 8, "y": 2},
+
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/elrgo_s/rules.mk b/keyboards/handwired/elrgo_s/rules.mk
deleted file mode 100644
index 04b1fc01b7f..00000000000
--- a/keyboards/handwired/elrgo_s/rules.mk
+++ /dev/null
@@ -1,13 +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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json
index 8d031b3c42f..ab811888a9a 100644
--- a/keyboards/handwired/frenchdev/info.json
+++ b/keyboards/handwired/frenchdev/info.json
@@ -9,6 +9,14 @@
},
"processor": "atmega32u4",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
"tapping": {
"toggle": 1
},
diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk
index e226d0b5172..9b396b76686 100644
--- a/keyboards/handwired/frenchdev/rules.mk
+++ b/keyboards/handwired/frenchdev/rules.mk
@@ -1,16 +1,4 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-CUSTOM_MATRIX = yes # Custom matrix file (taken and adapted from the ErgoDox EZ to handle custom number of columns)
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no
+CUSTOM_MATRIX = yes
# project specific files
SRC = matrix.c
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json
deleted file mode 100644
index 0be6c8cdb98..00000000000
--- a/keyboards/handwired/freoduo/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-"keyboard_name": "Freoduo",
-"manufacturer": "ParyzFilip",
-"url": "https://github.com/FilipParyz",
-"maintainer": "https://github.com/FilipParyz",
-"usb": {
- "vid": "0xB141",
- "pid": "0x0602",
- "device_version": "0.0.1"
-},
-"matrix_pins": {
- "cols": ["B2", "B6", "F6", "B3", "B1", "F7"],
- "rows": ["C6", "D7", "E6", "B4", "B5"]
-},
-"diode_direction": "COL2ROW",
-"split": {
- "soft_serial_pin": "D0"
-},
-"rgblight": {
- "hue_steps": 16,
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 30,
- "sleep": true,
- "led_map": [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
- "split_count": [16, 14],
- "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": {
- "pin": "D4"
-},
-"processor": "atmega32u4",
-"bootloader": "caterina",
-"debounce": 3,
-"layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 7, "y": 0},
- {"matrix": [5, 1], "x": 8, "y": 0},
- {"matrix": [5, 2], "x": 9, "y": 0},
- {"matrix": [5, 3], "x": 10, "y": 0},
- {"matrix": [5, 4], "x": 11, "y": 0},
- {"matrix": [5, 5], "x": 12, "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": [6, 0], "x": 7, "y": 1},
- {"matrix": [6, 1], "x": 8, "y": 1},
- {"matrix": [6, 2], "x": 9, "y": 1},
- {"matrix": [6, 3], "x": 10, "y": 1},
- {"matrix": [6, 4], "x": 11, "y": 1},
- {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
- {"matrix": [7, 1], "x": 8, "y": 2},
- {"matrix": [7, 2], "x": 9, "y": 2},
- {"matrix": [7, 3], "x": 10, "y": 2},
- {"matrix": [7, 4], "x": 11, "y": 2},
- {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
- {"matrix": [8, 1], "x": 8, "y": 3},
- {"matrix": [8, 2], "x": 9, "y": 3},
- {"matrix": [8, 3], "x": 10, "y": 3},
- {"matrix": [8, 4], "x": 11, "y": 3},
- {"matrix": [8, 5], "x": 12, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4, "w": 2},
-
- {"matrix": [9, 1], "x": 7, "y": 4, "w": 2},
- {"matrix": [9, 2], "x": 9, "y": 4},
- {"matrix": [9, 3], "x": 10, "y": 4},
- {"matrix": [9, 4], "x": 11, "y": 4},
- {"matrix": [9, 5], "x": 12, "y": 4}
- ]
- }
-}
-}
diff --git a/keyboards/handwired/freoduo/keyboard.json b/keyboards/handwired/freoduo/keyboard.json
new file mode 100644
index 00000000000..0d23776f4a6
--- /dev/null
+++ b/keyboards/handwired/freoduo/keyboard.json
@@ -0,0 +1,130 @@
+{
+"keyboard_name": "Freoduo",
+"manufacturer": "ParyzFilip",
+"url": "https://github.com/FilipParyz",
+"maintainer": "https://github.com/FilipParyz",
+"usb": {
+ "vid": "0xB141",
+ "pid": "0x0602",
+ "device_version": "0.0.1"
+},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "velocikey": true
+ },
+"matrix_pins": {
+ "cols": ["B2", "B6", "F6", "B3", "B1", "F7"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+},
+"diode_direction": "COL2ROW",
+"split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+},
+"rgblight": {
+ "hue_steps": 16,
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 30,
+ "sleep": true,
+ "led_map": [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30],
+ "split_count": [16, 14],
+ "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": {
+ "pin": "D4"
+},
+"processor": "atmega32u4",
+"bootloader": "caterina",
+"debounce": 3,
+"layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "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": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
+ {"matrix": [7, 1], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
+ {"matrix": [8, 1], "x": 8, "y": 3},
+ {"matrix": [8, 2], "x": 9, "y": 3},
+ {"matrix": [8, 3], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 5], "x": 12, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 2},
+
+ {"matrix": [9, 1], "x": 7, "y": 4, "w": 2},
+ {"matrix": [9, 2], "x": 9, "y": 4},
+ {"matrix": [9, 3], "x": 10, "y": 4},
+ {"matrix": [9, 4], "x": 11, "y": 4},
+ {"matrix": [9, 5], "x": 12, "y": 4}
+ ]
+ }
+}
+}
diff --git a/keyboards/handwired/freoduo/rules.mk b/keyboards/handwired/freoduo/rules.mk
deleted file mode 100644
index ed940647bba..00000000000
--- a/keyboards/handwired/freoduo/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-VELOCIKEY_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json
index 34b1edc8207..4984f3fc03c 100644
--- a/keyboards/handwired/fruity60/info.json
+++ b/keyboards/handwired/fruity60/info.json
@@ -18,6 +18,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "bluetooth": true
+ },
"community_layouts": ["60_tsangan_hhkb"],
"layouts": {
"LAYOUT_60_tsangan_hhkb": {
diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk
index 79e2ef4eff9..3437a35bdf1 100644
--- a/keyboards/handwired/fruity60/rules.mk
+++ b/keyboards/handwired/fruity60/rules.mk
@@ -1,16 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = 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
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json
deleted file mode 100644
index 899bd58bcbf..00000000000
--- a/keyboards/handwired/hacked_motospeed/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
- "keyboard_name": "Hacked Motospeed",
- "manufacturer": "MMO_Corp",
- "url": "",
- "maintainer": "Deckweiss",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0690",
- "device_version": "0.0.1"
- },
- "bluetooth": {
- "driver": "rn42"
- },
- "matrix_pins": {
- "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"],
- "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B7"
- },
- "processor": "at90usb1286",
- "bootloader": "halfkay",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0, "h": 2},
- {"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": [1, 5], "x": 5, "y": 0},
-
- {"matrix": [6, 6], "x": 7, "y": 0},
- {"matrix": [5, 8], "x": 8, "y": 0},
- {"matrix": [5, 7], "x": 9, "y": 0},
- {"matrix": [5, 9], "x": 10, "y": 0},
- {"matrix": [5, 10], "x": 11, "y": 0, "w": 2},
-
- {"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": [3, 5], "x": 5, "y": 1},
-
- {"matrix": [9, 10], "x": 7, "y": 1},
- {"matrix": [6, 7], "x": 8, "y": 1},
- {"matrix": [6, 8], "x": 9, "y": 1},
- {"matrix": [6, 9], "x": 10, "y": 1},
- {"matrix": [6, 10], "x": 11, "y": 1},
- {"matrix": [5, 11], "x": 12, "y": 1},
-
- {"matrix": [3, 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": [4, 1], "x": 5, "y": 2},
-
- {"matrix": [5, 6], "x": 7, "y": 2},
- {"matrix": [7, 7], "x": 8, "y": 2},
- {"matrix": [7, 8], "x": 9, "y": 2},
- {"matrix": [7, 9], "x": 10, "y": 2},
- {"matrix": [7, 10], "x": 11, "y": 2},
-
- {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 4], "x": 3, "y": 3},
- {"matrix": [3, 3], "x": 4, "y": 3},
- {"matrix": [2, 5], "x": 5, "y": 3},
-
- {"matrix": [7, 6], "x": 7, "y": 3},
- {"matrix": [8, 7], "x": 8, "y": 3},
- {"matrix": [8, 8], "x": 9, "y": 3},
- {"matrix": [8, 9], "x": 10, "y": 3},
- {"matrix": [8, 10], "x": 11, "y": 3},
- {"matrix": [8, 11], "x": 12, "y": 2, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/hacked_motospeed/keyboard.json b/keyboards/handwired/hacked_motospeed/keyboard.json
new file mode 100644
index 00000000000..af76a4dd769
--- /dev/null
+++ b/keyboards/handwired/hacked_motospeed/keyboard.json
@@ -0,0 +1,91 @@
+{
+ "keyboard_name": "Hacked Motospeed",
+ "manufacturer": "MMO_Corp",
+ "url": "",
+ "maintainer": "Deckweiss",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0690",
+ "device_version": "0.0.1",
+ "no_startup_check": true
+ },
+ "bluetooth": {
+ "driver": "rn42"
+ },
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"],
+ "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B7"
+ },
+ "processor": "at90usb1286",
+ "bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "backlight": true,
+ "bluetooth": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "h": 2},
+ {"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": [1, 5], "x": 5, "y": 0},
+
+ {"matrix": [6, 6], "x": 7, "y": 0},
+ {"matrix": [5, 8], "x": 8, "y": 0},
+ {"matrix": [5, 7], "x": 9, "y": 0},
+ {"matrix": [5, 9], "x": 10, "y": 0},
+ {"matrix": [5, 10], "x": 11, "y": 0, "w": 2},
+
+ {"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": [3, 5], "x": 5, "y": 1},
+
+ {"matrix": [9, 10], "x": 7, "y": 1},
+ {"matrix": [6, 7], "x": 8, "y": 1},
+ {"matrix": [6, 8], "x": 9, "y": 1},
+ {"matrix": [6, 9], "x": 10, "y": 1},
+ {"matrix": [6, 10], "x": 11, "y": 1},
+ {"matrix": [5, 11], "x": 12, "y": 1},
+
+ {"matrix": [3, 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": [4, 1], "x": 5, "y": 2},
+
+ {"matrix": [5, 6], "x": 7, "y": 2},
+ {"matrix": [7, 7], "x": 8, "y": 2},
+ {"matrix": [7, 8], "x": 9, "y": 2},
+ {"matrix": [7, 9], "x": 10, "y": 2},
+ {"matrix": [7, 10], "x": 11, "y": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+
+ {"matrix": [7, 6], "x": 7, "y": 3},
+ {"matrix": [8, 7], "x": 8, "y": 3},
+ {"matrix": [8, 8], "x": 9, "y": 3},
+ {"matrix": [8, 9], "x": 10, "y": 3},
+ {"matrix": [8, 10], "x": 11, "y": 3},
+ {"matrix": [8, 11], "x": 12, "y": 2, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/hacked_motospeed/rules.mk b/keyboards/handwired/hacked_motospeed/rules.mk
deleted file mode 100644
index 362a7fadbed..00000000000
--- a/keyboards/handwired/hacked_motospeed/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json
deleted file mode 100644
index fd121427291..00000000000
--- a/keyboards/handwired/jtallbean/split_65/info.json
+++ /dev/null
@@ -1,216 +0,0 @@
-{
- "keyboard_name": "split_65",
- "manufacturer": "jtallbean",
- "url": "",
- "maintainer": "samlli",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"],
- "rows": ["F4", "F1", "F0", "C7", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0",
- "matrix_pins": {
- "right": {
- "cols": ["B4", "B5", "B6", "C6", "C7", "D4", "D6", "D3", "D2"],
- "rows": ["E6", "F0", "F1", "F7", "D7"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0},
- {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0},
- {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0},
- {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0},
- {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0},
- {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0},
- {"label": "`", "matrix": [5, 6], "x": 15.25, "y": 0},
- {"label": "Backspace", "matrix": [5, 7], "x": 16.25, "y": 0},
- {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0},
-
- {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1},
-
- {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1},
- {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1},
- {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1},
- {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1},
- {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1},
-
- {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1},
- {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1},
- {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1},
- {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1},
- {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1},
- {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1},
- {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1},
- {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
- {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1},
-
- {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2},
-
- {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 3], "x": 3, "y": 2},
- {"label": "S", "matrix": [2, 4], "x": 4, "y": 2},
- {"label": "D", "matrix": [2, 5], "x": 5, "y": 2},
- {"label": "F", "matrix": [2, 6], "x": 6, "y": 2},
- {"label": "G", "matrix": [2, 7], "x": 7, "y": 2},
-
- {"label": "H", "matrix": [7, 0], "x": 9, "y": 2},
- {"label": "J", "matrix": [7, 1], "x": 10, "y": 2},
- {"label": "K", "matrix": [7, 2], "x": 11, "y": 2},
- {"label": "L", "matrix": [7, 3], "x": 12, "y": 2},
- {"label": ";", "matrix": [7, 4], "x": 13, "y": 2},
- {"label": "'", "matrix": [7, 5], "x": 14, "y": 2},
- {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
- {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2},
-
- {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3},
-
- {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
- {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
- {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
- {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
- {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-
- {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3},
- {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3},
- {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3},
- {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3},
- {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3},
- {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3},
- {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3},
-
- {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
-
- {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
-
- {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25},
- {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25},
- {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
-
- {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4},
- {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4},
- {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4}
- ]
- },
- "LAYOUT_2u_bs": {
- "layout": [
- {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0},
- {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0},
- {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0},
- {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0},
- {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0},
- {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0},
- {"label": "Backspace", "matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
- {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0},
-
- {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1},
-
- {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1},
- {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1},
- {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1},
- {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1},
- {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1},
-
- {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1},
- {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1},
- {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1},
- {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1},
- {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1},
- {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1},
- {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1},
- {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
- {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1},
-
- {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2},
-
- {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 3], "x": 3, "y": 2},
- {"label": "S", "matrix": [2, 4], "x": 4, "y": 2},
- {"label": "D", "matrix": [2, 5], "x": 5, "y": 2},
- {"label": "F", "matrix": [2, 6], "x": 6, "y": 2},
- {"label": "G", "matrix": [2, 7], "x": 7, "y": 2},
-
- {"label": "H", "matrix": [7, 0], "x": 9, "y": 2},
- {"label": "J", "matrix": [7, 1], "x": 10, "y": 2},
- {"label": "K", "matrix": [7, 2], "x": 11, "y": 2},
- {"label": "L", "matrix": [7, 3], "x": 12, "y": 2},
- {"label": ";", "matrix": [7, 4], "x": 13, "y": 2},
- {"label": "'", "matrix": [7, 5], "x": 14, "y": 2},
- {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
- {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2},
-
- {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3},
-
- {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
- {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
- {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
- {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
- {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
-
- {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3},
- {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3},
- {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3},
- {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3},
- {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3},
- {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3},
- {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3},
-
- {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
-
- {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
-
- {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25},
- {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25},
- {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
-
- {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4},
- {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4},
- {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/jtallbean/split_65/keyboard.json b/keyboards/handwired/jtallbean/split_65/keyboard.json
new file mode 100644
index 00000000000..d1b974a59be
--- /dev/null
+++ b/keyboards/handwired/jtallbean/split_65/keyboard.json
@@ -0,0 +1,225 @@
+{
+ "keyboard_name": "split_65",
+ "manufacturer": "jtallbean",
+ "url": "",
+ "maintainer": "samlli",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"],
+ "rows": ["F4", "F1", "F0", "C7", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["B4", "B5", "B6", "C6", "C7", "D4", "D6", "D3", "D2"],
+ "rows": ["E6", "F0", "F1", "F7", "D7"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0},
+ {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0},
+ {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0},
+ {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0},
+ {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0},
+ {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0},
+ {"label": "`", "matrix": [5, 6], "x": 15.25, "y": 0},
+ {"label": "Backspace", "matrix": [5, 7], "x": 16.25, "y": 0},
+ {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0},
+
+ {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1},
+
+ {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1},
+ {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1},
+ {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1},
+ {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1},
+ {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1},
+
+ {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1},
+ {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1},
+ {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1},
+ {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1},
+ {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1},
+ {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1},
+ {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1},
+ {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+ {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1},
+
+ {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 3], "x": 3, "y": 2},
+ {"label": "S", "matrix": [2, 4], "x": 4, "y": 2},
+ {"label": "D", "matrix": [2, 5], "x": 5, "y": 2},
+ {"label": "F", "matrix": [2, 6], "x": 6, "y": 2},
+ {"label": "G", "matrix": [2, 7], "x": 7, "y": 2},
+
+ {"label": "H", "matrix": [7, 0], "x": 9, "y": 2},
+ {"label": "J", "matrix": [7, 1], "x": 10, "y": 2},
+ {"label": "K", "matrix": [7, 2], "x": 11, "y": 2},
+ {"label": "L", "matrix": [7, 3], "x": 12, "y": 2},
+ {"label": ";", "matrix": [7, 4], "x": 13, "y": 2},
+ {"label": "'", "matrix": [7, 5], "x": 14, "y": 2},
+ {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
+ {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2},
+
+ {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3},
+
+ {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+ {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+ {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+ {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+ {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+
+ {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3},
+ {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3},
+ {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3},
+ {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3},
+ {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3},
+ {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3},
+ {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3},
+
+ {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
+
+ {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
+
+ {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25},
+ {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4},
+ {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4},
+ {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4}
+ ]
+ },
+ "LAYOUT_2u_bs": {
+ "layout": [
+ {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0},
+ {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0},
+ {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0},
+ {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0},
+ {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0},
+ {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0},
+ {"label": "Backspace", "matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
+ {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0},
+
+ {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1},
+
+ {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1},
+ {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1},
+ {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1},
+ {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1},
+ {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1},
+
+ {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1},
+ {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1},
+ {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1},
+ {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1},
+ {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1},
+ {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1},
+ {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1},
+ {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+ {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1},
+
+ {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 3], "x": 3, "y": 2},
+ {"label": "S", "matrix": [2, 4], "x": 4, "y": 2},
+ {"label": "D", "matrix": [2, 5], "x": 5, "y": 2},
+ {"label": "F", "matrix": [2, 6], "x": 6, "y": 2},
+ {"label": "G", "matrix": [2, 7], "x": 7, "y": 2},
+
+ {"label": "H", "matrix": [7, 0], "x": 9, "y": 2},
+ {"label": "J", "matrix": [7, 1], "x": 10, "y": 2},
+ {"label": "K", "matrix": [7, 2], "x": 11, "y": 2},
+ {"label": "L", "matrix": [7, 3], "x": 12, "y": 2},
+ {"label": ";", "matrix": [7, 4], "x": 13, "y": 2},
+ {"label": "'", "matrix": [7, 5], "x": 14, "y": 2},
+ {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
+ {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2},
+
+ {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3},
+
+ {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3},
+ {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3},
+ {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3},
+ {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3},
+ {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3},
+
+ {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3},
+ {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3},
+ {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3},
+ {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3},
+ {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3},
+ {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3},
+ {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3},
+
+ {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4},
+
+ {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
+
+ {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25},
+ {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4},
+ {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4},
+ {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/jtallbean/split_65/rules.mk b/keyboards/handwired/jtallbean/split_65/rules.mk
deleted file mode 100644
index c644dd59ee1..00000000000
--- a/keyboards/handwired/jtallbean/split_65/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 = 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
-SPLIT_KEYBOARD = yes # Enable split keyboard support
diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json
deleted file mode 100644
index 6fcd1c12bb8..00000000000
--- a/keyboards/handwired/ks63/info.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "keyboard_name": "ks63",
- "manufacturer": "kleshwong",
- "url": "",
- "maintainer": "Klesh Wong",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3061",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
- "rows": ["B5", "B4", "E6", "D7", "C6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 7, "y": 0},
- {"matrix": [5, 1], "x": 8, "y": 0},
- {"matrix": [5, 2], "x": 9, "y": 0},
- {"matrix": [5, 3], "x": 10, "y": 0},
- {"matrix": [5, 4], "x": 11, "y": 0},
- {"matrix": [5, 5], "x": 12, "y": 0},
- {"matrix": [5, 7], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 1.5, "y": 1},
- {"matrix": [1, 3], "x": 2.5, "y": 1},
- {"matrix": [1, 4], "x": 3.5, "y": 1},
- {"matrix": [1, 5], "x": 4.5, "y": 1},
- {"matrix": [1, 6], "x": 5.5, "y": 1},
- {"matrix": [6, 0], "x": 6.5, "y": 1},
- {"matrix": [6, 1], "x": 7.5, "y": 1},
- {"matrix": [6, 2], "x": 8.5, "y": 1},
- {"matrix": [6, 3], "x": 9.5, "y": 1},
- {"matrix": [6, 4], "x": 10.5, "y": 1},
- {"matrix": [6, 5], "x": 11.5, "y": 1},
- {"matrix": [6, 6], "x": 12.5, "y": 1},
- {"matrix": [6, 7], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 1.75, "y": 2},
- {"matrix": [2, 3], "x": 2.75, "y": 2},
- {"matrix": [2, 4], "x": 3.75, "y": 2},
- {"matrix": [2, 5], "x": 4.75, "y": 2},
- {"matrix": [2, 6], "x": 5.75, "y": 2},
- {"matrix": [7, 0], "x": 6.75, "y": 2},
- {"matrix": [7, 1], "x": 7.75, "y": 2},
- {"matrix": [7, 2], "x": 8.75, "y": 2},
- {"matrix": [7, 3], "x": 9.75, "y": 2},
- {"matrix": [7, 4], "x": 10.75, "y": 2},
- {"matrix": [7, 5], "x": 11.75, "y": 2},
- {"matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [8, 0], "x": 7.25, "y": 3},
- {"matrix": [8, 1], "x": 8.25, "y": 3},
- {"matrix": [8, 2], "x": 9.25, "y": 3},
- {"matrix": [8, 3], "x": 10.25, "y": 3},
- {"matrix": [8, 4], "x": 11.25, "y": 3},
- {"matrix": [8, 6], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
- {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [9, 1], "x": 7.25, "y": 4, "w": 2.75},
- {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [9, 6], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/ks63/keyboard.json b/keyboards/handwired/ks63/keyboard.json
new file mode 100644
index 00000000000..542cd76811e
--- /dev/null
+++ b/keyboards/handwired/ks63/keyboard.json
@@ -0,0 +1,103 @@
+{
+ "keyboard_name": "ks63",
+ "manufacturer": "kleshwong",
+ "url": "",
+ "maintainer": "Klesh Wong",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3061",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["B5", "B4", "E6", "D7", "C6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "y": 0},
+ {"matrix": [5, 7], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [6, 0], "x": 6.5, "y": 1},
+ {"matrix": [6, 1], "x": 7.5, "y": 1},
+ {"matrix": [6, 2], "x": 8.5, "y": 1},
+ {"matrix": [6, 3], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 5], "x": 11.5, "y": 1},
+ {"matrix": [6, 6], "x": 12.5, "y": 1},
+ {"matrix": [6, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [7, 0], "x": 6.75, "y": 2},
+ {"matrix": [7, 1], "x": 7.75, "y": 2},
+ {"matrix": [7, 2], "x": 8.75, "y": 2},
+ {"matrix": [7, 3], "x": 9.75, "y": 2},
+ {"matrix": [7, 4], "x": 10.75, "y": 2},
+ {"matrix": [7, 5], "x": 11.75, "y": 2},
+ {"matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [8, 0], "x": 7.25, "y": 3},
+ {"matrix": [8, 1], "x": 8.25, "y": 3},
+ {"matrix": [8, 2], "x": 9.25, "y": 3},
+ {"matrix": [8, 3], "x": 10.25, "y": 3},
+ {"matrix": [8, 4], "x": 11.25, "y": 3},
+ {"matrix": [8, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/ks63/rules.mk b/keyboards/handwired/ks63/rules.mk
deleted file mode 100644
index 12dd064c625..00000000000
--- a/keyboards/handwired/ks63/rules.mk
+++ /dev/null
@@ -1,14 +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 = 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json
index 243f9a5d7bd..d7ad47355ab 100644
--- a/keyboards/handwired/lagrange/info.json
+++ b/keyboards/handwired/lagrange/info.json
@@ -14,11 +14,15 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"matrix_pins": {
"right": {
"cols": ["C7", "F7", "F6", "F5", "F4", "F1"],
"rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"]
}
+ },
+ "transport": {
+ "protocol": "custom"
}
},
"indicators": {
@@ -27,6 +31,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "unicode": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/lagrange/rules.mk b/keyboards/handwired/lagrange/rules.mk
index f4af87851c7..1f2175e9cbf 100644
--- a/keyboards/handwired/lagrange/rules.mk
+++ b/keyboards/handwired/lagrange/rules.mk
@@ -1,18 +1,2 @@
-# 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 = yes # 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
-UNICODE_ENABLE = yes
-SPLIT_KEYBOARD = yes
-SPLIT_TRANSPORT = custom
-
SRC += transport.c
SPI_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json
index 41342fc2ec6..b4bc53afc54 100644
--- a/keyboards/handwired/m40/5x5_macropad/info.json
+++ b/keyboards/handwired/m40/5x5_macropad/info.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ },
"layouts": {
"LAYOUT_ortho_5x5": {
"layout": [
diff --git a/keyboards/handwired/m40/5x5_macropad/rules.mk b/keyboards/handwired/m40/5x5_macropad/rules.mk
index fe66abc8493..4df55cd2206 100644
--- a/keyboards/handwired/m40/5x5_macropad/rules.mk
+++ b/keyboards/handwired/m40/5x5_macropad/rules.mk
@@ -1,16 +1,3 @@
-# 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 = 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
-
# Disable unsupported hardware
AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
\ No newline at end of file
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json
deleted file mode 100644
index 071da1a5879..00000000000
--- a/keyboards/handwired/macroboard/f401/info.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
- "rows": ["A4", "A3", "A2", "A1", "A0"]
- },
- "diode_direction": "COL2ROW",
- "ws2812": {
- "driver": "pwm"
- },
- "development_board": "blackpill_f401"
-}
diff --git a/keyboards/handwired/macroboard/f401/keyboard.json b/keyboards/handwired/macroboard/f401/keyboard.json
new file mode 100644
index 00000000000..d5e217b2f3d
--- /dev/null
+++ b/keyboards/handwired/macroboard/f401/keyboard.json
@@ -0,0 +1,23 @@
+{
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
+ "rows": ["A4", "A3", "A2", "A1", "A0"]
+ },
+ "diode_direction": "COL2ROW",
+ "ws2812": {
+ "driver": "pwm"
+ },
+ "development_board": "blackpill_f401",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ }
+}
diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk
deleted file mode 100644
index bc0cd6b97f6..00000000000
--- a/keyboards/handwired/macroboard/f401/rules.mk
+++ /dev/null
@@ -1,13 +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
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json
index ae1922c6e68..03a8aadc1b9 100644
--- a/keyboards/handwired/macroboard/f411/info.json
+++ b/keyboards/handwired/macroboard/f411/info.json
@@ -1,4 +1,9 @@
{
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
"matrix_pins": {
"cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
"rows": ["A15", "B3", "B4", "B5", "B7"]
@@ -7,5 +12,13 @@
"ws2812": {
"driver": "pwm"
},
- "development_board": "blackpill_f411"
+ "development_board": "blackpill_f411",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "audio": true
+ }
}
diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk
index cdf33bfea5b..72f75f4367e 100644
--- a/keyboards/handwired/macroboard/f411/rules.mk
+++ b/keyboards/handwired/macroboard/f411/rules.mk
@@ -1,14 +1 @@
-# 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 = yes # Audio output
AUDIO_DRIVER = pwm_hardware
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/info.json
index 8266e704bc6..5147d96ee02 100644
--- a/keyboards/handwired/meck_tkl/info.json
+++ b/keyboards/handwired/meck_tkl/info.json
@@ -8,6 +8,13 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "nkro": true
+ },
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk
index 6213285117b..cdf3900ff0d 100644
--- a/keyboards/handwired/meck_tkl/rules.mk
+++ b/keyboards/handwired/meck_tkl/rules.mk
@@ -1,15 +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 = yes # 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
AUDIO_SUPPORTED = no
BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
deleted file mode 100644
index eae71d95083..00000000000
--- a/keyboards/handwired/myskeeb/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
- "keyboard_name": "MySKeeb",
- "manufacturer": "DAG3",
- "url": "",
- "maintainer": "su8044",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x6060",
- "device_version": "1.0.0"
- },
- "matrix_pins": {
- "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"],
- "rows": ["C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D3",
- "matrix_pins": {
- "right": {
- "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "debounce": 0,
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
- {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
- {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
- {"x": 3.5, "y": 0, "matrix": [0, 3]},
- {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
- {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
- {"x": 6.5, "y": 1, "matrix": [0, 6]},
-
- {"x": 9.5, "y": 1, "matrix": [5, 0]},
- {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
- {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
- {"x": 12.5, "y": 0, "matrix": [5, 3]},
- {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
- {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
- {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
-
- {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
- {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
- {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
- {"x": 3.5, "y": 1, "matrix": [1, 3]},
- {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
- {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
- {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
-
- {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
- {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
- {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
- {"x": 12.5, "y": 1, "matrix": [6, 3]},
- {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
- {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
- {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
-
- {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
- {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
- {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
- {"x": 3.5, "y": 2, "matrix": [2, 3]},
- {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
- {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
-
- {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
- {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
- {"x": 12.5, "y": 2, "matrix": [7, 3]},
- {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
- {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
- {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
-
- {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
- {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
- {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
- {"x": 3.5, "y": 3, "matrix": [3, 3]},
- {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
- {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
- {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
-
- {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
- {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
- {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
- {"x": 12.5, "y": 3, "matrix": [8, 3]},
- {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
- {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
- {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
-
- {"x": 0.25, "y": 5, "matrix": [4, 0]},
- {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
- {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
- {"x": 3.5, "y": 4, "matrix": [4, 3]},
-
- {"x": 5, "y": 6, "matrix": [4, 4]},
- {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
- {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
-
- {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
- {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
- {"x": 11, "y": 6, "matrix": [9, 2]},
-
- {"x": 12.5, "y": 4, "matrix": [9, 3]},
- {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
- {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
- {"x": 15.75, "y": 5, "matrix": [9, 6]}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/myskeeb/keyboard.json b/keyboards/handwired/myskeeb/keyboard.json
new file mode 100644
index 00000000000..f2da286f194
--- /dev/null
+++ b/keyboards/handwired/myskeeb/keyboard.json
@@ -0,0 +1,121 @@
+{
+ "keyboard_name": "MySKeeb",
+ "manufacturer": "DAG3",
+ "url": "",
+ "maintainer": "su8044",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "1.0.0",
+ "no_startup_check": true
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "oled": true
+ },
+ "debounce": 0,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
+ {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
+ {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
+ {"x": 3.5, "y": 0, "matrix": [0, 3]},
+ {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
+ {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
+ {"x": 6.5, "y": 1, "matrix": [0, 6]},
+
+ {"x": 9.5, "y": 1, "matrix": [5, 0]},
+ {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
+ {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
+ {"x": 12.5, "y": 0, "matrix": [5, 3]},
+ {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
+ {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
+ {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
+
+ {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
+ {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
+ {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
+ {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
+
+ {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
+ {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
+ {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
+ {"x": 12.5, "y": 1, "matrix": [6, 3]},
+ {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
+ {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
+ {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
+
+ {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
+ {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
+ {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
+ {"x": 3.5, "y": 2, "matrix": [2, 3]},
+ {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
+ {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
+
+ {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
+ {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
+ {"x": 12.5, "y": 2, "matrix": [7, 3]},
+ {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
+ {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
+ {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
+
+ {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
+ {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
+ {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
+ {"x": 3.5, "y": 3, "matrix": [3, 3]},
+ {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
+ {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
+ {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
+
+ {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
+ {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
+ {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
+ {"x": 12.5, "y": 3, "matrix": [8, 3]},
+ {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
+ {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
+ {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
+
+ {"x": 0.25, "y": 5, "matrix": [4, 0]},
+ {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
+ {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
+ {"x": 3.5, "y": 4, "matrix": [4, 3]},
+
+ {"x": 5, "y": 6, "matrix": [4, 4]},
+ {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
+ {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
+
+ {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
+ {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
+ {"x": 11, "y": 6, "matrix": [9, 2]},
+
+ {"x": 12.5, "y": 4, "matrix": [9, 3]},
+ {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
+ {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
+ {"x": 15.75, "y": 5, "matrix": [9, 6]}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
deleted file mode 100644
index e09e2e2bbe9..00000000000
--- a/keyboards/handwired/myskeeb/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 WS2812 RGB underlight.
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes # Enables split keyboard support
-OLED_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json
deleted file mode 100644
index b5298dfae4d..00000000000
--- a/keyboards/handwired/not_so_minidox/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "keyboard_name": "Not So MiniDox",
- "manufacturer": "mtdjr",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "B2", "B3", "B1", "F7", "D4"],
- "rows": ["D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375},
- {"matrix": [0, 1], "x": 1, "y": 0.25},
- {"matrix": [0, 2], "x": 2, "y": 0.125},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.125},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
-
- {"matrix": [4, 5], "x": 8, "y": 0.25},
- {"matrix": [4, 4], "x": 9, "y": 0.125},
- {"matrix": [4, 3], "x": 10, "y": 0},
- {"matrix": [4, 2], "x": 11, "y": 0.125},
- {"matrix": [4, 1], "x": 12, "y": 0.25},
- {"matrix": [4, 0], "x": 13, "y": 0.375},
-
- {"matrix": [1, 0], "x": 0, "y": 1.375},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.125},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.125},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
-
- {"matrix": [5, 5], "x": 8, "y": 1.25},
- {"matrix": [5, 4], "x": 9, "y": 1.125},
- {"matrix": [5, 3], "x": 10, "y": 1},
- {"matrix": [5, 2], "x": 11, "y": 1.125},
- {"matrix": [5, 1], "x": 12, "y": 1.25},
- {"matrix": [5, 0], "x": 13, "y": 1.375},
-
- {"matrix": [2, 0], "x": 0, "y": 2.375},
- {"matrix": [2, 1], "x": 1, "y": 2.25},
- {"matrix": [2, 2], "x": 2, "y": 2.125},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.125},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
-
- {"matrix": [6, 5], "x": 8, "y": 2.25},
- {"matrix": [6, 4], "x": 9, "y": 2.125},
- {"matrix": [6, 3], "x": 10, "y": 2},
- {"matrix": [6, 2], "x": 11, "y": 2.125},
- {"matrix": [6, 1], "x": 12, "y": 2.25},
- {"matrix": [6, 0], "x": 13, "y": 2.375},
-
- {"matrix": [3, 3], "x": 3.5, "y": 4.75},
- {"matrix": [3, 4], "x": 4.5, "y": 4.75},
- {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 2},
-
- {"matrix": [7, 5], "x": 7.5, "y": 3.75, "h": 2},
- {"matrix": [7, 4], "x": 8.5, "y": 4.75},
- {"matrix": [7, 3], "x": 9.5, "y": 4.75}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/not_so_minidox/keyboard.json b/keyboards/handwired/not_so_minidox/keyboard.json
new file mode 100644
index 00000000000..b48eba771bd
--- /dev/null
+++ b/keyboards/handwired/not_so_minidox/keyboard.json
@@ -0,0 +1,85 @@
+{
+ "keyboard_name": "Not So MiniDox",
+ "manufacturer": "mtdjr",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "D4"],
+ "rows": ["D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [4, 5], "x": 8, "y": 0.25},
+ {"matrix": [4, 4], "x": 9, "y": 0.125},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0.125},
+ {"matrix": [4, 1], "x": 12, "y": 0.25},
+ {"matrix": [4, 0], "x": 13, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [5, 5], "x": 8, "y": 1.25},
+ {"matrix": [5, 4], "x": 9, "y": 1.125},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1.125},
+ {"matrix": [5, 1], "x": 12, "y": 1.25},
+ {"matrix": [5, 0], "x": 13, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"matrix": [6, 5], "x": 8, "y": 2.25},
+ {"matrix": [6, 4], "x": 9, "y": 2.125},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2.125},
+ {"matrix": [6, 1], "x": 12, "y": 2.25},
+ {"matrix": [6, 0], "x": 13, "y": 2.375},
+
+ {"matrix": [3, 3], "x": 3.5, "y": 4.75},
+ {"matrix": [3, 4], "x": 4.5, "y": 4.75},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 2},
+
+ {"matrix": [7, 5], "x": 7.5, "y": 3.75, "h": 2},
+ {"matrix": [7, 4], "x": 8.5, "y": 4.75},
+ {"matrix": [7, 3], "x": 9.5, "y": 4.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/not_so_minidox/rules.mk b/keyboards/handwired/not_so_minidox/rules.mk
deleted file mode 100644
index 8ea05b5f74a..00000000000
--- a/keyboards/handwired/not_so_minidox/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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json
deleted file mode 100644
index d36024c67cd..00000000000
--- a/keyboards/handwired/skakunm_dactyl/info.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "keyboard_name": "Dactyl Min (3x5_5)",
- "manufacturer": "skakunm",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["C6", "D7", "E6", "B4", "B5"],
- "rows": ["B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_3x5_5": {
- "layout": [
- {"matrix": [2, 4], "x": 0, "y": 0},
- {"matrix": [2, 3], "x": 1, "y": 0},
- {"matrix": [2, 2], "x": 2, "y": 0},
- {"matrix": [2, 1], "x": 3, "y": 0},
- {"matrix": [2, 0], "x": 4, "y": 0},
-
- {"matrix": [6, 0], "x": 9, "y": 0},
- {"matrix": [6, 1], "x": 10, "y": 0},
- {"matrix": [6, 2], "x": 11, "y": 0},
- {"matrix": [6, 3], "x": 12, "y": 0},
- {"matrix": [6, 4], "x": 13, "y": 0},
-
- {"matrix": [1, 4], "x": 0, "y": 1},
- {"matrix": [1, 3], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 1], "x": 3, "y": 1},
- {"matrix": [1, 0], "x": 4, "y": 1},
-
- {"matrix": [5, 0], "x": 9, "y": 1},
- {"matrix": [5, 1], "x": 10, "y": 1},
- {"matrix": [5, 2], "x": 11, "y": 1},
- {"matrix": [5, 3], "x": 12, "y": 1},
- {"matrix": [5, 4], "x": 13, "y": 1},
-
- {"matrix": [0, 4], "x": 0, "y": 2},
- {"matrix": [0, 3], "x": 1, "y": 2},
- {"matrix": [0, 2], "x": 2, "y": 2},
- {"matrix": [0, 1], "x": 3, "y": 2},
- {"matrix": [0, 0], "x": 4, "y": 2},
-
- {"matrix": [4, 0], "x": 9, "y": 2},
- {"matrix": [4, 1], "x": 10, "y": 2},
- {"matrix": [4, 2], "x": 11, "y": 2},
- {"matrix": [4, 3], "x": 12, "y": 2},
- {"matrix": [4, 4], "x": 13, "y": 2},
-
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 3], "x": 5, "y": 3},
-
- {"matrix": [7, 3], "x": 8, "y": 3},
- {"matrix": [7, 4], "x": 9, "y": 3},
-
- {"matrix": [3, 0], "x": 4, "y": 4},
- {"matrix": [3, 1], "x": 5, "y": 4},
- {"matrix": [3, 2], "x": 6, "y": 4},
- {"matrix": [7, 2], "x": 7, "y": 4},
- {"matrix": [7, 1], "x": 8, "y": 4},
- {"matrix": [7, 0], "x": 9, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/skakunm_dactyl/keyboard.json b/keyboards/handwired/skakunm_dactyl/keyboard.json
new file mode 100644
index 00000000000..91ee5b1fb6c
--- /dev/null
+++ b/keyboards/handwired/skakunm_dactyl/keyboard.json
@@ -0,0 +1,84 @@
+{
+ "keyboard_name": "Dactyl Min (3x5_5)",
+ "manufacturer": "skakunm",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5"],
+ "rows": ["B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_3x5_5": {
+ "layout": [
+ {"matrix": [2, 4], "x": 0, "y": 0},
+ {"matrix": [2, 3], "x": 1, "y": 0},
+ {"matrix": [2, 2], "x": 2, "y": 0},
+ {"matrix": [2, 1], "x": 3, "y": 0},
+ {"matrix": [2, 0], "x": 4, "y": 0},
+
+ {"matrix": [6, 0], "x": 9, "y": 0},
+ {"matrix": [6, 1], "x": 10, "y": 0},
+ {"matrix": [6, 2], "x": 11, "y": 0},
+ {"matrix": [6, 3], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+
+ {"matrix": [1, 4], "x": 0, "y": 1},
+ {"matrix": [1, 3], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 0], "x": 4, "y": 1},
+
+ {"matrix": [5, 0], "x": 9, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 4], "x": 13, "y": 1},
+
+ {"matrix": [0, 4], "x": 0, "y": 2},
+ {"matrix": [0, 3], "x": 1, "y": 2},
+ {"matrix": [0, 2], "x": 2, "y": 2},
+ {"matrix": [0, 1], "x": 3, "y": 2},
+ {"matrix": [0, 0], "x": 4, "y": 2},
+
+ {"matrix": [4, 0], "x": 9, "y": 2},
+ {"matrix": [4, 1], "x": 10, "y": 2},
+ {"matrix": [4, 2], "x": 11, "y": 2},
+ {"matrix": [4, 3], "x": 12, "y": 2},
+ {"matrix": [4, 4], "x": 13, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+
+ {"matrix": [7, 3], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+
+ {"matrix": [3, 0], "x": 4, "y": 4},
+ {"matrix": [3, 1], "x": 5, "y": 4},
+ {"matrix": [3, 2], "x": 6, "y": 4},
+ {"matrix": [7, 2], "x": 7, "y": 4},
+ {"matrix": [7, 1], "x": 8, "y": 4},
+ {"matrix": [7, 0], "x": 9, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/skakunm_dactyl/rules.mk b/keyboards/handwired/skakunm_dactyl/rules.mk
deleted file mode 100644
index 7f1fc659ccb..00000000000
--- a/keyboards/handwired/skakunm_dactyl/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json
deleted file mode 100644
index ea41cb3ac17..00000000000
--- a/keyboards/handwired/split65/promicro/info.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D4", "C6", "D7", "E6", "B4"],
- "io_delay": 5
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [5, 7], "x": 8, "y": 0},
- {"matrix": [5, 6], "x": 9, "y": 0},
- {"matrix": [5, 5], "x": 10, "y": 0},
- {"matrix": [5, 4], "x": 11, "y": 0},
- {"matrix": [5, 3], "x": 12, "y": 0},
- {"matrix": [5, 2], "x": 13, "y": 0},
- {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
- {"matrix": [5, 0], "x": 16, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
-
- {"matrix": [6, 7], "x": 7.5, "y": 1},
- {"matrix": [6, 6], "x": 8.5, "y": 1},
- {"matrix": [6, 5], "x": 9.5, "y": 1},
- {"matrix": [6, 4], "x": 10.5, "y": 1},
- {"matrix": [6, 3], "x": 11.5, "y": 1},
- {"matrix": [6, 2], "x": 12.5, "y": 1},
- {"matrix": [6, 1], "x": 13.5, "y": 1},
- {"matrix": [6, 0], "x": 16, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [9, 7], "x": 7.75, "y": 2},
- {"matrix": [7, 7], "x": 8.75, "y": 2},
- {"matrix": [7, 6], "x": 9.75, "y": 2},
- {"matrix": [7, 5], "x": 10.75, "y": 2},
- {"matrix": [7, 4], "x": 11.75, "y": 2},
- {"matrix": [7, 3], "x": 12.75, "y": 2},
- {"matrix": [7, 2], "x": 13.75, "y": 2},
- {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
- {"matrix": [7, 0], "x": 16, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
-
- {"matrix": [8, 7], "x": 8.25, "y": 3},
- {"matrix": [8, 6], "x": 9.25, "y": 3},
- {"matrix": [8, 5], "x": 10.25, "y": 3},
- {"matrix": [8, 4], "x": 11.25, "y": 3},
- {"matrix": [8, 3], "x": 12.25, "y": 3},
- {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
- {"matrix": [8, 1], "x": 15, "y": 3},
- {"matrix": [8, 0], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
-
- {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
- {"matrix": [9, 5], "x": 10.25, "y": 4},
- {"matrix": [9, 4], "x": 11.25, "y": 4},
- {"matrix": [9, 3], "x": 12.25, "y": 4},
-
- {"matrix": [9, 2], "x": 14, "y": 4},
- {"matrix": [9, 1], "x": 15, "y": 4},
- {"matrix": [9, 0], "x": 16, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/split65/promicro/keyboard.json b/keyboards/handwired/split65/promicro/keyboard.json
new file mode 100644
index 00000000000..5efdd93629f
--- /dev/null
+++ b/keyboards/handwired/split65/promicro/keyboard.json
@@ -0,0 +1,109 @@
+{
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false,
+ "oled": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"],
+ "io_delay": 5
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 7], "x": 8, "y": 0},
+ {"matrix": [5, 6], "x": 9, "y": 0},
+ {"matrix": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 1], "x": 14, "y": 0, "w": 2},
+ {"matrix": [5, 0], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 7], "x": 7.5, "y": 1},
+ {"matrix": [6, 6], "x": 8.5, "y": 1},
+ {"matrix": [6, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 4], "x": 10.5, "y": 1},
+ {"matrix": [6, 3], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 12.5, "y": 1},
+ {"matrix": [6, 1], "x": 13.5, "y": 1},
+ {"matrix": [6, 0], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [9, 7], "x": 7.75, "y": 2},
+ {"matrix": [7, 7], "x": 8.75, "y": 2},
+ {"matrix": [7, 6], "x": 9.75, "y": 2},
+ {"matrix": [7, 5], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [7, 3], "x": 12.75, "y": 2},
+ {"matrix": [7, 2], "x": 13.75, "y": 2},
+ {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [7, 0], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 7], "x": 8.25, "y": 3},
+ {"matrix": [8, 6], "x": 9.25, "y": 3},
+ {"matrix": [8, 5], "x": 10.25, "y": 3},
+ {"matrix": [8, 4], "x": 11.25, "y": 3},
+ {"matrix": [8, 3], "x": 12.25, "y": 3},
+ {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 1], "x": 15, "y": 3},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
+
+ {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25},
+ {"matrix": [9, 5], "x": 10.25, "y": 4},
+ {"matrix": [9, 4], "x": 11.25, "y": 4},
+ {"matrix": [9, 3], "x": 12.25, "y": 4},
+
+ {"matrix": [9, 2], "x": 14, "y": 4},
+ {"matrix": [9, 1], "x": 15, "y": 4},
+ {"matrix": [9, 0], "x": 16, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/split65/promicro/rules.mk b/keyboards/handwired/split65/promicro/rules.mk
deleted file mode 100644
index 3bc7f499ecd..00000000000
--- a/keyboards/handwired/split65/promicro/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-OLED_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json
index f7e58fa6cef..16ecc0bae87 100644
--- a/keyboards/handwired/split65/stm32/info.json
+++ b/keyboards/handwired/split65/stm32/info.json
@@ -6,6 +6,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "A9"
},
"development_board": "proton_c",
diff --git a/keyboards/handwired/split65/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk
index 5033bd1e21f..94186bf8c72 100644
--- a/keyboards/handwired/split65/stm32/rules.mk
+++ b/keyboards/handwired/split65/stm32/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output
OLED_ENABLE = yes
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/info.json
deleted file mode 100644
index dfc1198c588..00000000000
--- a/keyboards/handwired/split89/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
- "keyboard_name": "split89",
- "manufacturer": "jurassic73",
- "url": "https://github.com/jurassic73/split89",
- "maintainer": "jurassic73",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
- "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0",
- "matrix_pins": {
- "right": {
- "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
- "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label": "Esc", "matrix": [0, 4], "x": 0, "y": 0},
- {"label": "F1", "matrix": [0, 5], "x": 2, "y": 0},
- {"label": "F2", "matrix": [0, 6], "x": 3, "y": 0},
- {"label": "F3", "matrix": [0, 7], "x": 4, "y": 0},
- {"label": "F4", "matrix": [0, 8], "x": 5, "y": 0},
- {"label": "F5", "matrix": [0, 9], "x": 6, "y": 0},
- {"label": "F6", "matrix": [6, 0], "x": 10.25, "y": 0},
- {"label": "F7", "matrix": [6, 1], "x": 11.25, "y": 0},
- {"label": "F8", "matrix": [6, 2], "x": 12.25, "y": 0},
- {"label": "F9", "matrix": [6, 3], "x": 13.75, "y": 0},
- {"label": "F10", "matrix": [6, 4], "x": 14.75, "y": 0},
- {"label": "F11", "matrix": [6, 5], "x": 15.75, "y": 0},
- {"label": "F12", "matrix": [6, 6], "x": 16.75, "y": 0},
- {"label": "PrtSc", "matrix": [6, 7], "x": 18, "y": 0},
- {"label": "Scroll Lock", "matrix": [6, 8], "x": 19, "y": 0},
- {"label": "Pause", "matrix": [6, 9], "x": 20, "y": 0},
- {"label": "~", "matrix": [2, 4], "x": 0, "y": 1.5},
- {"label": "1!", "matrix": [1, 4], "x": 1, "y": 1.5},
- {"label": "2@", "matrix": [1, 5], "x": 2, "y": 1.5},
- {"label": "3#", "matrix": [1, 6], "x": 3, "y": 1.5},
- {"label": "4$", "matrix": [1, 7], "x": 4, "y": 1.5},
- {"label": "5%", "matrix": [1, 8], "x": 5, "y": 1.5},
- {"label": "6^", "matrix": [1, 9], "x": 6, "y": 1.5},
- {"label": "7&", "matrix": [7, 0], "x": 9.75, "y": 1.5},
- {"label": "8*", "matrix": [7, 1], "x": 10.75, "y": 1.5},
- {"label": "9(", "matrix": [7, 2], "x": 11.75, "y": 1.5},
- {"label": "0)", "matrix": [7, 3], "x": 12.75, "y": 1.5},
- {"label": "-_", "matrix": [7, 4], "x": 13.75, "y": 1.5},
- {"label": "=+", "matrix": [7, 5], "x": 14.75, "y": 1.5},
- {"label": "Backspace", "matrix": [7, 6], "x": 15.75, "y": 1.5, "w": 2},
- {"label": "Insert", "matrix": [7, 7], "x": 18, "y": 1.5},
- {"label": "Home", "matrix": [7, 8], "x": 19, "y": 1.5},
- {"label": "PgUp", "matrix": [7, 9], "x": 20, "y": 1.5},
- {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5},
- {"label": "Q", "matrix": [2, 5], "x": 1.5, "y": 2.5},
- {"label": "W", "matrix": [2, 6], "x": 2.5, "y": 2.5},
- {"label": "E", "matrix": [2, 7], "x": 3.5, "y": 2.5},
- {"label": "R", "matrix": [2, 8], "x": 4.5, "y": 2.5},
- {"label": "T", "matrix": [2, 9], "x": 5.5, "y": 2.5},
- {"label": "Y", "matrix": [9, 0], "x": 9.25, "y": 2.5},
- {"label": "U", "matrix": [8, 0], "x": 10.25, "y": 2.5},
- {"label": "I", "matrix": [8, 1], "x": 11.25, "y": 2.5},
- {"label": "O", "matrix": [8, 2], "x": 12.25, "y": 2.5},
- {"label": "P", "matrix": [8, 3], "x": 13.25, "y": 2.5},
- {"label": "{", "matrix": [8, 4], "x": 14.25, "y": 2.5},
- {"label": "}", "matrix": [8, 5], "x": 15.25, "y": 2.5},
- {"label": "|", "matrix": [8, 6], "x": 16.25, "y": 2.5, "w": 1.5},
- {"label": "Delete", "matrix": [8, 7], "x": 18, "y": 2.5},
- {"label": "End", "matrix": [8, 8], "x": 19, "y": 2.5},
- {"label": "PgDn", "matrix": [8, 9], "x": 20, "y": 2.5},
- {"label": "Caps Lock", "matrix": [4, 4], "x": 0, "y": 3.5, "w": 1.75},
- {"label": "A", "matrix": [3, 5], "x": 1.75, "y": 3.5},
- {"label": "S", "matrix": [3, 6], "x": 2.75, "y": 3.5},
- {"label": "D", "matrix": [3, 7], "x": 3.75, "y": 3.5},
- {"label": "F", "matrix": [3, 8], "x": 4.75, "y": 3.5},
- {"label": "G", "matrix": [3, 9], "x": 5.75, "y": 3.5},
- {"label": "H", "matrix": [10, 0], "x": 9.5, "y": 3.5},
- {"label": "J", "matrix": [9, 1], "x": 10.5, "y": 3.5},
- {"label": "K", "matrix": [9, 2], "x": 11.5, "y": 3.5},
- {"label": "L", "matrix": [9, 3], "x": 12.5, "y": 3.5},
- {"label": ":", "matrix": [9, 4], "x": 13.5, "y": 3.5},
- {"label": "\"", "matrix": [9, 5], "x": 14.5, "y": 3.5},
- {"label": "Enter", "matrix": [9, 6], "x": 15.5, "y": 3.5, "w": 2.25},
- {"label": "Shift", "matrix": [5, 4], "x": 0, "y": 4.5, "w": 2.25},
- {"label": "Z", "matrix": [4, 5], "x": 2.25, "y": 4.5},
- {"label": "X", "matrix": [4, 6], "x": 3.25, "y": 4.5},
- {"label": "C", "matrix": [4, 7], "x": 4.25, "y": 4.5},
- {"label": "V", "matrix": [4, 8], "x": 5.25, "y": 4.5},
- {"label": "B", "matrix": [4, 9], "x": 6.25, "y": 4.5},
- {"label": "N", "matrix": [11, 0], "x": 10, "y": 4.5},
- {"label": "M", "matrix": [10, 1], "x": 11, "y": 4.5},
- {"label": "<", "matrix": [10, 2], "x": 12, "y": 4.5},
- {"label": ">", "matrix": [10, 3], "x": 13, "y": 4.5},
- {"label": "?", "matrix": [10, 4], "x": 14, "y": 4.5},
- {"label": "Shift", "matrix": [10, 6], "x": 15, "y": 4.5, "w": 2.75},
- {"label": "\u2191", "matrix": [10, 8], "x": 19, "y": 4.5},
- {"label": "Ctrl", "matrix": [5, 5], "x": 0, "y": 5.5, "w": 1.25},
- {"label": "Fn", "matrix": [5, 6], "x": 1.25, "y": 5.5, "w": 1.25},
- {"label": "Win", "matrix": [5, 7], "x": 2.5, "y": 5.5, "w": 1.25},
- {"label": "Alt", "matrix": [5, 8], "x": 3.75, "y": 5.5, "w": 1.25},
- {"label": "Space", "matrix": [5, 9], "x": 5, "y": 5.5, "w": 2.25},
- {"label": "Space", "matrix": [11, 1], "x": 10, "y": 5.5, "w": 2.75},
- {"label": "Alt", "matrix": [11, 3], "x": 12.75, "y": 5.5, "w": 1.25},
- {"label": "Win", "matrix": [11, 4], "x": 14, "y": 5.5, "w": 1.25},
- {"label": "Menu", "matrix": [11, 5], "x": 15.25, "y": 5.5, "w": 1.25},
- {"label": "Ctrl", "matrix": [11, 6], "x": 16.5, "y": 5.5, "w": 1.25},
- {"label": "\u2190", "matrix": [11, 7], "x": 18, "y": 5.5},
- {"label": "\u2193", "matrix": [11, 8], "x": 19, "y": 5.5},
- {"label": "\u2192", "matrix": [11, 9], "x": 20, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/handwired/split89/keyboard.json b/keyboards/handwired/split89/keyboard.json
new file mode 100644
index 00000000000..d30105844af
--- /dev/null
+++ b/keyboards/handwired/split89/keyboard.json
@@ -0,0 +1,131 @@
+{
+ "keyboard_name": "split89",
+ "manufacturer": "jurassic73",
+ "url": "https://github.com/jurassic73/split89",
+ "maintainer": "jurassic73",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
+ "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
+ "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 4], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 5], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 6], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 7], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 8], "x": 5, "y": 0},
+ {"label": "F5", "matrix": [0, 9], "x": 6, "y": 0},
+ {"label": "F6", "matrix": [6, 0], "x": 10.25, "y": 0},
+ {"label": "F7", "matrix": [6, 1], "x": 11.25, "y": 0},
+ {"label": "F8", "matrix": [6, 2], "x": 12.25, "y": 0},
+ {"label": "F9", "matrix": [6, 3], "x": 13.75, "y": 0},
+ {"label": "F10", "matrix": [6, 4], "x": 14.75, "y": 0},
+ {"label": "F11", "matrix": [6, 5], "x": 15.75, "y": 0},
+ {"label": "F12", "matrix": [6, 6], "x": 16.75, "y": 0},
+ {"label": "PrtSc", "matrix": [6, 7], "x": 18, "y": 0},
+ {"label": "Scroll Lock", "matrix": [6, 8], "x": 19, "y": 0},
+ {"label": "Pause", "matrix": [6, 9], "x": 20, "y": 0},
+ {"label": "~", "matrix": [2, 4], "x": 0, "y": 1.5},
+ {"label": "1!", "matrix": [1, 4], "x": 1, "y": 1.5},
+ {"label": "2@", "matrix": [1, 5], "x": 2, "y": 1.5},
+ {"label": "3#", "matrix": [1, 6], "x": 3, "y": 1.5},
+ {"label": "4$", "matrix": [1, 7], "x": 4, "y": 1.5},
+ {"label": "5%", "matrix": [1, 8], "x": 5, "y": 1.5},
+ {"label": "6^", "matrix": [1, 9], "x": 6, "y": 1.5},
+ {"label": "7&", "matrix": [7, 0], "x": 9.75, "y": 1.5},
+ {"label": "8*", "matrix": [7, 1], "x": 10.75, "y": 1.5},
+ {"label": "9(", "matrix": [7, 2], "x": 11.75, "y": 1.5},
+ {"label": "0)", "matrix": [7, 3], "x": 12.75, "y": 1.5},
+ {"label": "-_", "matrix": [7, 4], "x": 13.75, "y": 1.5},
+ {"label": "=+", "matrix": [7, 5], "x": 14.75, "y": 1.5},
+ {"label": "Backspace", "matrix": [7, 6], "x": 15.75, "y": 1.5, "w": 2},
+ {"label": "Insert", "matrix": [7, 7], "x": 18, "y": 1.5},
+ {"label": "Home", "matrix": [7, 8], "x": 19, "y": 1.5},
+ {"label": "PgUp", "matrix": [7, 9], "x": 20, "y": 1.5},
+ {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [2, 5], "x": 1.5, "y": 2.5},
+ {"label": "W", "matrix": [2, 6], "x": 2.5, "y": 2.5},
+ {"label": "E", "matrix": [2, 7], "x": 3.5, "y": 2.5},
+ {"label": "R", "matrix": [2, 8], "x": 4.5, "y": 2.5},
+ {"label": "T", "matrix": [2, 9], "x": 5.5, "y": 2.5},
+ {"label": "Y", "matrix": [9, 0], "x": 9.25, "y": 2.5},
+ {"label": "U", "matrix": [8, 0], "x": 10.25, "y": 2.5},
+ {"label": "I", "matrix": [8, 1], "x": 11.25, "y": 2.5},
+ {"label": "O", "matrix": [8, 2], "x": 12.25, "y": 2.5},
+ {"label": "P", "matrix": [8, 3], "x": 13.25, "y": 2.5},
+ {"label": "{", "matrix": [8, 4], "x": 14.25, "y": 2.5},
+ {"label": "}", "matrix": [8, 5], "x": 15.25, "y": 2.5},
+ {"label": "|", "matrix": [8, 6], "x": 16.25, "y": 2.5, "w": 1.5},
+ {"label": "Delete", "matrix": [8, 7], "x": 18, "y": 2.5},
+ {"label": "End", "matrix": [8, 8], "x": 19, "y": 2.5},
+ {"label": "PgDn", "matrix": [8, 9], "x": 20, "y": 2.5},
+ {"label": "Caps Lock", "matrix": [4, 4], "x": 0, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [3, 5], "x": 1.75, "y": 3.5},
+ {"label": "S", "matrix": [3, 6], "x": 2.75, "y": 3.5},
+ {"label": "D", "matrix": [3, 7], "x": 3.75, "y": 3.5},
+ {"label": "F", "matrix": [3, 8], "x": 4.75, "y": 3.5},
+ {"label": "G", "matrix": [3, 9], "x": 5.75, "y": 3.5},
+ {"label": "H", "matrix": [10, 0], "x": 9.5, "y": 3.5},
+ {"label": "J", "matrix": [9, 1], "x": 10.5, "y": 3.5},
+ {"label": "K", "matrix": [9, 2], "x": 11.5, "y": 3.5},
+ {"label": "L", "matrix": [9, 3], "x": 12.5, "y": 3.5},
+ {"label": ":", "matrix": [9, 4], "x": 13.5, "y": 3.5},
+ {"label": "\"", "matrix": [9, 5], "x": 14.5, "y": 3.5},
+ {"label": "Enter", "matrix": [9, 6], "x": 15.5, "y": 3.5, "w": 2.25},
+ {"label": "Shift", "matrix": [5, 4], "x": 0, "y": 4.5, "w": 2.25},
+ {"label": "Z", "matrix": [4, 5], "x": 2.25, "y": 4.5},
+ {"label": "X", "matrix": [4, 6], "x": 3.25, "y": 4.5},
+ {"label": "C", "matrix": [4, 7], "x": 4.25, "y": 4.5},
+ {"label": "V", "matrix": [4, 8], "x": 5.25, "y": 4.5},
+ {"label": "B", "matrix": [4, 9], "x": 6.25, "y": 4.5},
+ {"label": "N", "matrix": [11, 0], "x": 10, "y": 4.5},
+ {"label": "M", "matrix": [10, 1], "x": 11, "y": 4.5},
+ {"label": "<", "matrix": [10, 2], "x": 12, "y": 4.5},
+ {"label": ">", "matrix": [10, 3], "x": 13, "y": 4.5},
+ {"label": "?", "matrix": [10, 4], "x": 14, "y": 4.5},
+ {"label": "Shift", "matrix": [10, 6], "x": 15, "y": 4.5, "w": 2.75},
+ {"label": "\u2191", "matrix": [10, 8], "x": 19, "y": 4.5},
+ {"label": "Ctrl", "matrix": [5, 5], "x": 0, "y": 5.5, "w": 1.25},
+ {"label": "Fn", "matrix": [5, 6], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"label": "Win", "matrix": [5, 7], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 8], "x": 3.75, "y": 5.5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 9], "x": 5, "y": 5.5, "w": 2.25},
+ {"label": "Space", "matrix": [11, 1], "x": 10, "y": 5.5, "w": 2.75},
+ {"label": "Alt", "matrix": [11, 3], "x": 12.75, "y": 5.5, "w": 1.25},
+ {"label": "Win", "matrix": [11, 4], "x": 14, "y": 5.5, "w": 1.25},
+ {"label": "Menu", "matrix": [11, 5], "x": 15.25, "y": 5.5, "w": 1.25},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 16.5, "y": 5.5, "w": 1.25},
+ {"label": "\u2190", "matrix": [11, 7], "x": 18, "y": 5.5},
+ {"label": "\u2193", "matrix": [11, 8], "x": 19, "y": 5.5},
+ {"label": "\u2192", "matrix": [11, 9], "x": 20, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/split89/rules.mk b/keyboards/handwired/split89/rules.mk
deleted file mode 100644
index 8ea05b5f74a..00000000000
--- a/keyboards/handwired/split89/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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json
index 73ffb66e9b4..07cac23aad5 100644
--- a/keyboards/handwired/splittest/info.json
+++ b/keyboards/handwired/splittest/info.json
@@ -8,6 +8,9 @@
"pid": "0x1111",
"device_version": "1.0.0"
},
+ "split": {
+ "enabled": true
+ },
"rgblight": {
"led_count": 12,
"split_count": [6, 6],
diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk
index cc924d61d83..8d00fcc579f 100644
--- a/keyboards/handwired/splittest/rules.mk
+++ b/keyboards/handwired/splittest/rules.mk
@@ -10,6 +10,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = handwired/splittest/promicro
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index 321202383f6..aa01e763eb4 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -18,6 +18,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D3",
"bootmagic": {
"matrix": [4, 5]
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
index aabe18457a7..0b23bdc61ff 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
@@ -15,5 +15,3 @@ RGB_MATRIX_ENABLE = no
POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = yes
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index eaaf00bbbd9..c9fe6e89cff 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -5,6 +5,7 @@
"device_version": "0.0.1"
},
"split": {
+ "enabled": true,
"bootmagic": {
"matrix": [6, 5]
}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
index a689be3dd5a..220a361a4cc 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
@@ -16,6 +16,4 @@ POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = yes
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = handwired/tractyl_manuform/5x6_right/teensy2pp
diff --git a/keyboards/handwired/unk/rev1/keyboard.json b/keyboards/handwired/unk/rev1/keyboard.json
index 171ae7bb027..fc1cfc90b72 100644
--- a/keyboards/handwired/unk/rev1/keyboard.json
+++ b/keyboards/handwired/unk/rev1/keyboard.json
@@ -20,6 +20,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"matrix_pins": {
"right": {
diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk
index c8a36bee0f2..a03f28dbf5f 100644
--- a/keyboards/handwired/unk/rules.mk
+++ b/keyboards/handwired/unk/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = handwired/unk/rev1
diff --git a/keyboards/handwired/xealous/rev1/keyboard.json b/keyboards/handwired/xealous/rev1/keyboard.json
index b8b45e5ee14..001cd82074c 100644
--- a/keyboards/handwired/xealous/rev1/keyboard.json
+++ b/keyboards/handwired/xealous/rev1/keyboard.json
@@ -17,6 +17,9 @@
"rows": ["B5", "B4", "E6", "D7", "D4"]
},
"diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
index aff4db8cfd7..aa77674920d 100644
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = yes # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes # Use shared split_common code
SRC += matrix.c
diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/info.json
index 6fa33228df8..5e0ec6f11e2 100644
--- a/keyboards/hardwareabstraction/handwire/info.json
+++ b/keyboards/hardwareabstraction/handwire/info.json
@@ -10,7 +10,13 @@
"console": false,
"extrakey": true,
"mousekey": true,
- "nkro": true
+ "nkro": true,
+ "haptic": true,
+ "oled": true,
+ "wpm": true
+ },
+ "build": {
+ "lto": true
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
diff --git a/keyboards/hardwareabstraction/handwire/rules.mk b/keyboards/hardwareabstraction/handwire/rules.mk
index 8a33a553313..a521203b326 100644
--- a/keyboards/hardwareabstraction/handwire/rules.mk
+++ b/keyboards/hardwareabstraction/handwire/rules.mk
@@ -1,7 +1 @@
-LTO_ENABLE = yes
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
-
-OLED_ENABLE = yes
-
-WPM_ENABLE = yes
diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/info.json
index 070a69f6917..fef514c539f 100644
--- a/keyboards/hazel/bad_wings/info.json
+++ b/keyboards/hazel/bad_wings/info.json
@@ -18,7 +18,10 @@
"features": {
"bootmagic": true,
"deferred_exec": true,
- "nkro": false
+ "nkro": false,
+ "pointing_device": true,
+ "tri_layer": true,
+ "caps_word": true
},
"community_layouts": ["split_3x5_3"],
"layouts": {
diff --git a/keyboards/hazel/bad_wings/rules.mk b/keyboards/hazel/bad_wings/rules.mk
index 47a188155fe..a49017527d7 100644
--- a/keyboards/hazel/bad_wings/rules.mk
+++ b/keyboards/hazel/bad_wings/rules.mk
@@ -1,10 +1,6 @@
-TRI_LAYER_ENABLE = yes
-CAPS_WORD_ENABLE = yes
-
SRC += matrix.c
SPI_DRIVER_REQUIRED = yes
CUSTOM_MATRIX = lite
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
-POINTING_DEVICE_ENABLE = yes
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json
index 953cc2ea101..d4fabc756e4 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.2"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"tapping": {
diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk
index efa7ae4be57..e18b8fb0c45 100644
--- a/keyboards/helix/pico/rules.mk
+++ b/keyboards/helix/pico/rules.mk
@@ -1,5 +1,3 @@
-SPLIT_KEYBOARD = yes
-
# Helix Spacific Build Options default values
LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
diff --git a/keyboards/helix/pico/sc/rules.mk b/keyboards/helix/pico/sc/rules.mk
index 4ed0672a708..066fffb74af 100644
--- a/keyboards/helix/pico/sc/rules.mk
+++ b/keyboards/helix/pico/sc/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index aac3cc9dbb1..fd829782c02 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"transport": {
"sync": {
diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk
index 7897a5b1e66..83029d1e0b7 100644
--- a/keyboards/helix/rev2/keymaps/default/rules.mk
+++ b/keyboards/helix/rev2/keymaps/default/rules.mk
@@ -1,5 +1,3 @@
-SPLIT_KEYBOARD = yes
-
LTO_ENABLE = yes # if firmware size over limit, try this option
# Helix Spacific Build Options
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
index 4ca86c4f99e..b4f8e27de4d 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
@@ -1,5 +1,4 @@
LTO_ENABLE = no # if firmware size over limit, try this option
-SPLIT_KEYBOARD = yes
# Helix Spacific Build Options
# you can uncomment and edit follows 7 Variables
diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk
index 98df1f45e82..5aa9439f4c1 100644
--- a/keyboards/helix/rev2/keymaps/led_test/rules.mk
+++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk
@@ -5,7 +5,6 @@
# See TOP/keyboards/helix/rules.mk for a list of options that can be set.
# See TOP/docs/config_options.md for more information.
#
-SPLIT_KEYBOARD = yes
LTO_ENABLE = no # if firmware size over limit, try this option
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
index 03396029a3d..e827ae111f1 100644
--- a/keyboards/helix/rev2/rules.mk
+++ b/keyboards/helix/rev2/rules.mk
@@ -1,7 +1,5 @@
KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk
-SPLIT_KEYBOARD = yes
-
# Helix Spacific Build Options default values
OLED_ENABLE = yes # OLED_ENABLE
LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
diff --git a/keyboards/helix/rev2/sc/rules.mk b/keyboards/helix/rev2/sc/rules.mk
index 4ed0672a708..066fffb74af 100644
--- a/keyboards/helix/rev2/sc/rules.mk
+++ b/keyboards/helix/rev2/sc/rules.mk
@@ -1,2 +1 @@
-SPLIT_KEYBOARD = yes
LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index a1752d01236..ce7bcde3e03 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -26,6 +26,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk
index a46f9d9c59f..01251cd7807 100644
--- a/keyboards/helix/rev3_4rows/rules.mk
+++ b/keyboards/helix/rev3_4rows/rules.mk
@@ -1,6 +1,5 @@
EXTRAKEY_ENABLE = yes # Audio control and System control
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-SPLIT_KEYBOARD = yes
RGB_MATRIX_ENABLE = no
OLED_ENABLE = yes
ENCODER_ENABLE = yes
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index 57d4e11dfe5..e867f033262 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -92,6 +92,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk
index 7cd934ebc4e..d1972faa1b3 100644
--- a/keyboards/helix/rev3_5rows/rules.mk
+++ b/keyboards/helix/rev3_5rows/rules.mk
@@ -1,6 +1,5 @@
EXTRAKEY_ENABLE = yes # Audio control and System control
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-SPLIT_KEYBOARD = yes
RGB_MATRIX_ENABLE = no
OLED_ENABLE = yes
ENCODER_ENABLE = yes
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json
index 589cf98dde4..d745f21d20b 100644
--- a/keyboards/hhkb/jp/info.json
+++ b/keyboards/hhkb/jp/info.json
@@ -10,6 +10,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
"layouts": {
"LAYOUT_jp": {
"layout": [
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index 5c659643418..9e74e1cfb9a 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/rules.mk
@@ -1,14 +1,7 @@
# 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
CUSTOM_MATRIX = yes # Custom matrix file for the HHKB
-NKRO_ENABLE = no # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
# project specific files
SRC = matrix.c
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json
index 24cd750e09c..a5725d6afaa 100644
--- a/keyboards/hhkb/yang/info.json
+++ b/keyboards/hhkb/yang/info.json
@@ -16,6 +16,12 @@
},
"processor": "atmega32u4",
"bootloader": "lufa-ms",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ },
"debounce": 0,
"community_layouts": ["60_hhkb"],
"layouts": {
diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk
index 99f77d0c162..d8acce0a36b 100644
--- a/keyboards/hhkb/yang/rules.mk
+++ b/keyboards/hhkb/yang/rules.mk
@@ -1,16 +1,6 @@
# MCU frequency
F_CPU = 8000000
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # USB Nkey Rollover
-
# Custom matrix file for the HHKB
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
deleted file mode 100644
index ee43e96bdd0..00000000000
--- a/keyboards/hidtech/bastyl/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
- "keyboard_name": "Bastyl",
- "manufacturer": "HID Technologies",
- "url": "https://www.hidtech.ca/?product=bastyl-black",
- "maintainer": "HID-Technologies",
- "usb": {
- "vid": "0xA8F7",
- "pid": "0x1827",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
- "rows": ["D7", "B5", "F7", "F6", "B6"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "soft_serial_pin": "D0"
- },
- "ws2812": {
- "pin": "D2"
- },
- "rgblight": {
- "led_count": 38,
- "split": true,
- "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
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [5, 5], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0},
- {"matrix": [5, 3], "x": 13, "y": 0},
- {"matrix": [5, 2], "x": 14, "y": 0},
- {"matrix": [5, 1], "x": 15, "y": 0},
- {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1},
- {"matrix": [6, 3], "x": 13, "y": 1},
- {"matrix": [6, 2], "x": 14, "y": 1},
- {"matrix": [6, 1], "x": 15, "y": 1},
- {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2},
- {"matrix": [7, 3], "x": 13, "y": 2},
- {"matrix": [7, 2], "x": 14, "y": 2},
- {"matrix": [7, 1], "x": 15, "y": 2},
- {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 3], "x": 13, "y": 3},
- {"matrix": [8, 2], "x": 14, "y": 3},
- {"matrix": [8, 1], "x": 15, "y": 3},
- {"matrix": [8, 0], "x": 16, "y": 3},
-
- {"matrix": [4, 3], "x": 5, "y": 4},
- {"matrix": [4, 4], "x": 6, "y": 4},
- {"matrix": [4, 1], "x": 7, "y": 4},
-
- {"matrix": [9, 1], "x": 9, "y": 4},
- {"matrix": [9, 4], "x": 10, "y": 4},
- {"matrix": [9, 3], "x": 11, "y": 4},
-
- {"matrix": [4, 5], "x": 6, "y": 5},
- {"matrix": [4, 2], "x": 7, "y": 5},
-
- {"matrix": [9, 2], "x": 9, "y": 5},
- {"matrix": [9, 5], "x": 10, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/hidtech/bastyl/keyboard.json b/keyboards/hidtech/bastyl/keyboard.json
new file mode 100644
index 00000000000..5c3a9fcfcff
--- /dev/null
+++ b/keyboards/hidtech/bastyl/keyboard.json
@@ -0,0 +1,125 @@
+{
+ "keyboard_name": "Bastyl",
+ "manufacturer": "HID Technologies",
+ "url": "https://www.hidtech.ca/?product=bastyl-black",
+ "maintainer": "HID-Technologies",
+ "usb": {
+ "vid": "0xA8F7",
+ "pid": "0x1827",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
+ "rows": ["D7", "B5", "F7", "F6", "B6"]
+ },
+ "diode_direction": "ROW2COL",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "ws2812": {
+ "pin": "D2"
+ },
+ "rgblight": {
+ "led_count": 38,
+ "split": true,
+ "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
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 5], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 2], "x": 14, "y": 0},
+ {"matrix": [5, 1], "x": 15, "y": 0},
+ {"matrix": [5, 0], "x": 16, "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": [6, 5], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 2], "x": 14, "y": 1},
+ {"matrix": [6, 1], "x": 15, "y": 1},
+ {"matrix": [6, 0], "x": 16, "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": [7, 5], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 2], "x": 14, "y": 2},
+ {"matrix": [7, 1], "x": 15, "y": 2},
+ {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 2], "x": 14, "y": 3},
+ {"matrix": [8, 1], "x": 15, "y": 3},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+
+ {"matrix": [4, 3], "x": 5, "y": 4},
+ {"matrix": [4, 4], "x": 6, "y": 4},
+ {"matrix": [4, 1], "x": 7, "y": 4},
+
+ {"matrix": [9, 1], "x": 9, "y": 4},
+ {"matrix": [9, 4], "x": 10, "y": 4},
+ {"matrix": [9, 3], "x": 11, "y": 4},
+
+ {"matrix": [4, 5], "x": 6, "y": 5},
+ {"matrix": [4, 2], "x": 7, "y": 5},
+
+ {"matrix": [9, 2], "x": 9, "y": 5},
+ {"matrix": [9, 5], "x": 10, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/hidtech/bastyl/rules.mk b/keyboards/hidtech/bastyl/rules.mk
deleted file mode 100644
index 323b24ba201..00000000000
--- a/keyboards/hidtech/bastyl/rules.mk
+++ /dev/null
@@ -1,13 +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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json
index 7512debabdf..7cb7150f3f2 100644
--- a/keyboards/hillside/46/0_1/info.json
+++ b/keyboards/hillside/46/0_1/info.json
@@ -16,12 +16,16 @@
{"pin_a": "F5", "pin_b": "F4"}
]
},
+ "build": {
+ "lto": true
+ },
"features": {
"encoder": true,
"extrakey": true,
"rgblight": true
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"encoder": {
"right": {
diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk
index 3c12e55b581..89c84d8be9d 100644
--- a/keyboards/hillside/46/0_1/rules.mk
+++ b/keyboards/hillside/46/0_1/rules.mk
@@ -1,6 +1,3 @@
-SPLIT_KEYBOARD = yes # Use shared split_common code
-LTO_ENABLE = yes # Use link time optimization for smaller firmware
-
# If you add a haptic board,
# enable it and set its driver here or in your keymap folder
# The Pimoroni board's driver is DRV2605L
diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json
index b6007f1f729..b640bc0cbf2 100644
--- a/keyboards/hillside/48/0_1/info.json
+++ b/keyboards/hillside/48/0_1/info.json
@@ -16,12 +16,16 @@
{"pin_a": "F5", "pin_b": "F4"}
]
},
+ "build": {
+ "lto": true
+ },
"features": {
"encoder": true,
"extrakey": true,
"rgblight": true
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"encoder": {
"right": {
diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk
index 3c12e55b581..89c84d8be9d 100644
--- a/keyboards/hillside/48/0_1/rules.mk
+++ b/keyboards/hillside/48/0_1/rules.mk
@@ -1,6 +1,3 @@
-SPLIT_KEYBOARD = yes # Use shared split_common code
-LTO_ENABLE = yes # Use link time optimization for smaller firmware
-
# If you add a haptic board,
# enable it and set its driver here or in your keymap folder
# The Pimoroni board's driver is DRV2605L
diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json
index 63bbf3b2577..0949fa9bb8e 100644
--- a/keyboards/hillside/52/0_1/info.json
+++ b/keyboards/hillside/52/0_1/info.json
@@ -16,12 +16,16 @@
{"pin_a": "F5", "pin_b": "F4"}
]
},
+ "build": {
+ "lto": true
+ },
"features": {
"encoder": true,
"extrakey": true,
"rgblight": true
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"encoder": {
"right": {
diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk
index 3c12e55b581..89c84d8be9d 100644
--- a/keyboards/hillside/52/0_1/rules.mk
+++ b/keyboards/hillside/52/0_1/rules.mk
@@ -1,6 +1,3 @@
-SPLIT_KEYBOARD = yes # Use shared split_common code
-LTO_ENABLE = yes # Use link time optimization for smaller firmware
-
# If you add a haptic board,
# enable it and set its driver here or in your keymap folder
# The Pimoroni board's driver is DRV2605L
diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json
index ca92b3f4a52..ab36bfaea09 100644
--- a/keyboards/hineybush/hbcp/info.json
+++ b/keyboards/hineybush/hbcp/info.json
@@ -36,6 +36,16 @@
},
"processor": "at90usb1286",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/hineybush/hbcp/rules.mk b/keyboards/hineybush/hbcp/rules.mk
index f60d6afa1e2..30ce5d293b7 100644
--- a/keyboards/hineybush/hbcp/rules.mk
+++ b/keyboards/hineybush/hbcp/rules.mk
@@ -1,14 +1,2 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
index 6eb5cbd80ec..6bbfa86e124 100644
--- a/keyboards/horrortroll/handwired_k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -48,6 +48,15 @@
"backing_size": 2048
}
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "oled": true,
+ "wpm": true
+ },
"community_layouts": ["tkl_ansi"],
"layouts": {
"LAYOUT_tkl_ansi": {
diff --git a/keyboards/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
index 6d6ec253db3..b2ab6eed6df 100644
--- a/keyboards/horrortroll/handwired_k552/rules.mk
+++ b/keyboards/horrortroll/handwired_k552/rules.mk
@@ -12,23 +12,3 @@ BOARD = STM32_F103_STM32DUINO
BOOTLOADER_TYPE = stm32duino
DFU_ARGS = -d 1EAF:0003 -a 2 -R
DFU_SUFFIX_ARGS = -v 1EAF -p 0003
-
-# 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 enabled
-RGB_MATRIX_ENABLE = yes
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json
index 7b0b1c394b3..6303fb70bba 100644
--- a/keyboards/horrortroll/lemon40/info.json
+++ b/keyboards/horrortroll/lemon40/info.json
@@ -32,6 +32,18 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "oled": true,
+ "wpm": true
+ },
+ "build": {
+ "lto": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/horrortroll/lemon40/rules.mk b/keyboards/horrortroll/lemon40/rules.mk
index 9ac59719d8e..89d3a12a0b6 100644
--- a/keyboards/horrortroll/lemon40/rules.mk
+++ b/keyboards/horrortroll/lemon40/rules.mk
@@ -1,21 +1 @@
SRC += lib/bongocat.c
-
-# 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
-
-# OLED enabled
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-
-# Additional thing to reduce compiled size
-LTO_ENABLE = yes
diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json
index 8184588e5d7..5d2c3ec5acd 100644
--- a/keyboards/hotdox/info.json
+++ b/keyboards/hotdox/info.json
@@ -12,6 +12,15 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "nkro": true,
+ "backlight": true,
+ "unicode": true
+ },
"tapping": {
"toggle": 1
},
diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk
index 8e11eeabe08..f5dfc77dd19 100644
--- a/keyboards/hotdox/rules.mk
+++ b/keyboards/hotdox/rules.mk
@@ -1,17 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDone
-UNICODE_ENABLE = yes # Unicode
-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 = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-SWAP_HANDS_ENABLE = no # Disable Onehand
-RGBLIGHT_ENABLE = no
# project specific files
SRC = matrix.c \
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json
index f9d77c3513a..63fef233840 100644
--- a/keyboards/hs60/v1/info.json
+++ b/keyboards/hs60/v1/info.json
@@ -68,6 +68,14 @@
},
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "raw": true
+ },
"community_layouts": ["60_ansi", "60_iso"],
"layouts": {
"LAYOUT_60_iso": {
diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk
index 7aa0a5ae51d..4af34f6e5bf 100644
--- a/keyboards/hs60/v1/rules.mk
+++ b/keyboards/hs60/v1/rules.mk
@@ -3,20 +3,6 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
-RAW_ENABLE = yes
-
# Experimental features for zealcmd please do no enable
#RAW_ENABLE = yes
#USE_KEYMAPS_IN_EEPROM = yes
diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/info.json
index 0debcea8d1f..e0781ef54b5 100644
--- a/keyboards/hs60/v2/ansi/info.json
+++ b/keyboards/hs60/v2/ansi/info.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"board": "QMK_PROTON_C",
"community_layouts": ["60_ansi"],
"layouts": {
diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk
index 96e559f742e..611bb888bac 100644
--- a/keyboards/hs60/v2/ansi/rules.mk
+++ b/keyboards/hs60/v2/ansi/rules.mk
@@ -3,18 +3,6 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-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
-AUDIO_ENABLE = no # Audio output
-
CIE1931_CURVE = yes
# project specific files
diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/info.json
index 5323fe20f01..d9bc040e23c 100644
--- a/keyboards/hs60/v2/hhkb/info.json
+++ b/keyboards/hs60/v2/hhkb/info.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"board": "QMK_PROTON_C",
"layouts": {
"LAYOUT_60_hhkb": {
diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk
index 96e559f742e..611bb888bac 100644
--- a/keyboards/hs60/v2/hhkb/rules.mk
+++ b/keyboards/hs60/v2/hhkb/rules.mk
@@ -3,18 +3,6 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-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
-AUDIO_ENABLE = no # Audio output
-
CIE1931_CURVE = yes
# project specific files
diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/info.json
index c422ae2d727..a51dac05fa2 100644
--- a/keyboards/hs60/v2/iso/info.json
+++ b/keyboards/hs60/v2/iso/info.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"board": "QMK_PROTON_C",
"community_layouts": ["60_iso"],
"layouts": {
diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk
index 96e559f742e..611bb888bac 100644
--- a/keyboards/hs60/v2/iso/rules.mk
+++ b/keyboards/hs60/v2/iso/rules.mk
@@ -3,18 +3,6 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-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
-AUDIO_ENABLE = no # Audio output
-
CIE1931_CURVE = yes
# project specific files
diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
index 081dd8ddd5d..862b6323b02 100644
--- a/keyboards/ibnuda/squiggle/rev1/info.json
+++ b/keyboards/ibnuda/squiggle/rev1/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/ibnuda/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk
index ff66487bad9..2382d570350 100644
--- a/keyboards/ibnuda/squiggle/rev1/rules.mk
+++ b/keyboards/ibnuda/squiggle/rev1/rules.mk
@@ -10,5 +10,3 @@ 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index d2d1e73943a..51bf7a5f126 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -38,6 +38,9 @@
"rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"]
},
"diode_direction": "ROW2COL",
+ "split": {
+ "enabled": true
+ },
"processor": "MK20DX256",
"bootloader": "kiibohd",
"board": "IC_TEENSY_3_1",
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index 35f459fab5f..48b26c704ee 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
@@ -233,8 +233,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_DOWN, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, KC_KP_ENTER,
KC_NO,KC_AMPR,KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_PLUS, KC_NO,
KC_TRNS,KC_DOT, KC_0, KC_KP_EQUAL, KC_NO,
- BL_OFF, KC_TRNS,
- BL_ON,
+ LM_OFF, KC_TRNS,
+ LM_ON,
KC_NO, KC_NO, LT(HALFSYMB, KC_ENT)
),
/* Keymap 6: Mirrored Symbol Layer
diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk
index 4f1b0c01881..da68a7f25d1 100644
--- a/keyboards/input_club/ergodox_infinity/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/rules.mk
@@ -13,7 +13,6 @@ SLEEP_LED_ENABLE = yes
RGBLIGHT_ENABLE = no
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
ST7565_ENABLE = yes
diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk
index 947cf020389..a0c271ea25c 100644
--- a/keyboards/jian/handwired/rules.mk
+++ b/keyboards/jian/handwired/rules.mk
@@ -1,6 +1,5 @@
# Build Options
# change yes to no to disable
#
-SPLIT_KEYBOARD = no
BACKLIGHT_ENABLE = no
RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/nsrev2/rules.mk b/keyboards/jian/nsrev2/rules.mk
index 3d0af8ae989..a05436d218b 100644
--- a/keyboards/jian/nsrev2/rules.mk
+++ b/keyboards/jian/nsrev2/rules.mk
@@ -2,6 +2,5 @@
# change yes to no to disable
#
CONSOLE_ENABLE = no
-SPLIT_KEYBOARD = no
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
index 68a6efe47b1..3cfc0266670 100644
--- a/keyboards/jian/rev1/info.json
+++ b/keyboards/jian/rev1/info.json
@@ -3,6 +3,9 @@
"usb": {
"device_version": "1.0.0"
},
+ "split": {
+ "enabled": true
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D3", "D2", "E6", "B4"]
diff --git a/keyboards/jian/rev1/rules.mk b/keyboards/jian/rev1/rules.mk
index 33588c1755e..bd3228c26eb 100644
--- a/keyboards/jian/rev1/rules.mk
+++ b/keyboards/jian/rev1/rules.mk
@@ -2,7 +2,6 @@
# change yes to no to disable
#
CONSOLE_ENABLE = no
-SPLIT_KEYBOARD = yes
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
index cfcfc8e2fa4..ebd015c9a4a 100644
--- a/keyboards/jian/rev2/info.json
+++ b/keyboards/jian/rev2/info.json
@@ -38,6 +38,7 @@
"esc_output": "D3"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D1"
},
"processor": "atmega32u4",
diff --git a/keyboards/jian/rev2/rules.mk b/keyboards/jian/rev2/rules.mk
index 8e6da2d84f0..e8415063bc2 100644
--- a/keyboards/jian/rev2/rules.mk
+++ b/keyboards/jian/rev2/rules.mk
@@ -2,6 +2,5 @@
# change yes to no to disable
#
CONSOLE_ENABLE = no
-SPLIT_KEYBOARD = yes
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index 0332657ffc6..061ac2cc7c6 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D1"
},
"processor": "atmega32u4",
diff --git a/keyboards/jiran/rules.mk b/keyboards/jiran/rules.mk
index b4c74a089dc..d1450315061 100644
--- a/keyboards/jiran/rules.mk
+++ b/keyboards/jiran/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD = yes
DEFAULT_FOLDER = jiran/rev1
diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json
index f76b9c0e7d9..fedab8fd08a 100644
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/rev1/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"transport": {
"sync": {
diff --git a/keyboards/jorne/rules.mk b/keyboards/jorne/rules.mk
index 60e4f7b0dee..fb1b47d1065 100644
--- a/keyboards/jorne/rules.mk
+++ b/keyboards/jorne/rules.mk
@@ -9,7 +9,6 @@ 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
-SPLIT_KEYBOARD = yes # Split common
LTO_ENABLE = yes
DEFAULT_FOLDER = jorne/rev1
diff --git a/keyboards/kagizaraya/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/info.json
deleted file mode 100644
index 9b7f3104a0c..00000000000
--- a/keyboards/kagizaraya/miniaxe/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
- "keyboard_name": "MiniAxe",
- "manufacturer": "ENDO Katsuhiro",
- "url": "",
- "maintainer": "ka2hiro",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3939",
- "device_version": "0.0.1"
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 6,
- "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": {
- "pin": "F4"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "matrix_pins": {
- "direct": [
- ["F1", "E6", "B0", "B2", "B3"],
- ["F5", "F0", "B1", "B7", "D2"],
- ["F6", "F7", "C7", "D5", "D3"],
- ["B5", "C6", "B6", null, null]
- ]
- },
- "community_layouts": ["split_3x5_3"],
- "layout_aliases": {
- "LAYOUT": "LAYOUT_split_3x5_3"
- },
- "layouts": {
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]},
- {"x": 1, "y": 0, "matrix": [0, 1]},
- {"x": 2, "y": 0, "matrix": [0, 2]},
- {"x": 3, "y": 0, "matrix": [0, 3]},
- {"x": 4, "y": 0, "matrix": [0, 4]},
-
- {"x": 6, "y": 0, "matrix": [4, 0]},
- {"x": 7, "y": 0, "matrix": [4, 1]},
- {"x": 8, "y": 0, "matrix": [4, 2]},
- {"x": 9, "y": 0, "matrix": [4, 3]},
- {"x": 10, "y": 0, "matrix": [4, 4]},
-
- {"x": 0, "y": 1, "matrix": [1, 0]},
- {"x": 1, "y": 1, "matrix": [1, 1]},
- {"x": 2, "y": 1, "matrix": [1, 2]},
- {"x": 3, "y": 1, "matrix": [1, 3]},
- {"x": 4, "y": 1, "matrix": [1, 4]},
-
- {"x": 6, "y": 1, "matrix": [5, 0]},
- {"x": 7, "y": 1, "matrix": [5, 1]},
- {"x": 8, "y": 1, "matrix": [5, 2]},
- {"x": 9, "y": 1, "matrix": [5, 3]},
- {"x": 10, "y": 1, "matrix": [5, 4]},
-
- {"x": 0, "y": 2, "matrix": [2, 0]},
- {"x": 1, "y": 2, "matrix": [2, 1]},
- {"x": 2, "y": 2, "matrix": [2, 2]},
- {"x": 3, "y": 2, "matrix": [2, 3]},
- {"x": 4, "y": 2, "matrix": [2, 4]},
-
- {"x": 6, "y": 2, "matrix": [6, 0]},
- {"x": 7, "y": 2, "matrix": [6, 1]},
- {"x": 8, "y": 2, "matrix": [6, 2]},
- {"x": 9, "y": 2, "matrix": [6, 3]},
- {"x": 10, "y": 2, "matrix": [6, 4]},
-
- {"x": 2, "y": 3, "matrix": [3, 0]},
- {"x": 3, "y": 3, "matrix": [3, 1]},
- {"x": 4, "y": 3, "matrix": [3, 2]},
-
- {"x": 6, "y": 3, "matrix": [7, 0]},
- {"x": 7, "y": 3, "matrix": [7, 1]},
- {"x": 8, "y": 3, "matrix": [7, 2]}
- ]
- }
- }
-}
diff --git a/keyboards/kagizaraya/miniaxe/keyboard.json b/keyboards/kagizaraya/miniaxe/keyboard.json
new file mode 100644
index 00000000000..fa9f4d79dfc
--- /dev/null
+++ b/keyboards/kagizaraya/miniaxe/keyboard.json
@@ -0,0 +1,106 @@
+{
+ "keyboard_name": "MiniAxe",
+ "manufacturer": "ENDO Katsuhiro",
+ "url": "",
+ "maintainer": "ka2hiro",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3939",
+ "device_version": "0.0.1"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 6,
+ "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": {
+ "pin": "F4"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "direct": [
+ ["F1", "E6", "B0", "B2", "B3"],
+ ["F5", "F0", "B1", "B7", "D2"],
+ ["F6", "F7", "C7", "D5", "D3"],
+ ["B5", "C6", "B6", null, null]
+ ]
+ },
+ "community_layouts": ["split_3x5_3"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_3"
+ },
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0, "matrix": [0, 3]},
+ {"x": 4, "y": 0, "matrix": [0, 4]},
+
+ {"x": 6, "y": 0, "matrix": [4, 0]},
+ {"x": 7, "y": 0, "matrix": [4, 1]},
+ {"x": 8, "y": 0, "matrix": [4, 2]},
+ {"x": 9, "y": 0, "matrix": [4, 3]},
+ {"x": 10, "y": 0, "matrix": [4, 4]},
+
+ {"x": 0, "y": 1, "matrix": [1, 0]},
+ {"x": 1, "y": 1, "matrix": [1, 1]},
+ {"x": 2, "y": 1, "matrix": [1, 2]},
+ {"x": 3, "y": 1, "matrix": [1, 3]},
+ {"x": 4, "y": 1, "matrix": [1, 4]},
+
+ {"x": 6, "y": 1, "matrix": [5, 0]},
+ {"x": 7, "y": 1, "matrix": [5, 1]},
+ {"x": 8, "y": 1, "matrix": [5, 2]},
+ {"x": 9, "y": 1, "matrix": [5, 3]},
+ {"x": 10, "y": 1, "matrix": [5, 4]},
+
+ {"x": 0, "y": 2, "matrix": [2, 0]},
+ {"x": 1, "y": 2, "matrix": [2, 1]},
+ {"x": 2, "y": 2, "matrix": [2, 2]},
+ {"x": 3, "y": 2, "matrix": [2, 3]},
+ {"x": 4, "y": 2, "matrix": [2, 4]},
+
+ {"x": 6, "y": 2, "matrix": [6, 0]},
+ {"x": 7, "y": 2, "matrix": [6, 1]},
+ {"x": 8, "y": 2, "matrix": [6, 2]},
+ {"x": 9, "y": 2, "matrix": [6, 3]},
+ {"x": 10, "y": 2, "matrix": [6, 4]},
+
+ {"x": 2, "y": 3, "matrix": [3, 0]},
+ {"x": 3, "y": 3, "matrix": [3, 1]},
+ {"x": 4, "y": 3, "matrix": [3, 2]},
+
+ {"x": 6, "y": 3, "matrix": [7, 0]},
+ {"x": 7, "y": 3, "matrix": [7, 1]},
+ {"x": 8, "y": 3, "matrix": [7, 2]}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kagizaraya/miniaxe/rules.mk b/keyboards/kagizaraya/miniaxe/rules.mk
deleted file mode 100644
index ee687e87af2..00000000000
--- a/keyboards/kagizaraya/miniaxe/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-DEBUG_ENABLE = no
-SPLIT_KEYBOARD = yes # Use shared split_common code
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
index 6603e790c45..0900eee5a6d 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/info.json
@@ -17,6 +17,7 @@
"pin": "B7"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
diff --git a/keyboards/kagizaraya/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk
index aa7fc332fe5..4b976051f32 100644
--- a/keyboards/kagizaraya/scythe/rules.mk
+++ b/keyboards/kagizaraya/scythe/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes # Use shared split_common
RGBLIGHT_SPLIT = yes
diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
deleted file mode 100644
index ac7732e7ca5..00000000000
--- a/keyboards/kakunpc/rabbit_capture_plan/info.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
- "keyboard_name": "rabbit_capture_plan",
- "manufacturer": "kakunpc",
- "url": "https://kakunpc.booth.pm/",
- "maintainer": "kakunpc",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEB59",
- "device_version": "0.0.1"
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 69,
- "max_brightness": 200,
- "sleep": true,
- "split_count": [32, 37],
- "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
- }
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0.41, "y": 0},
- {"matrix": [0, 1], "x": 1.41, "y": 0},
- {"matrix": [0, 2], "x": 2.72, "y": 0},
- {"matrix": [0, 3], "x": 3.72, "y": 0},
- {"matrix": [0, 4], "x": 4.72, "y": 0},
- {"matrix": [0, 5], "x": 5.72, "y": 0},
- {"matrix": [0, 6], "x": 6.72, "y": 0},
-
- {"matrix": [5, 0], "x": 9.62, "y": 0},
- {"matrix": [5, 1], "x": 10.62, "y": 0},
- {"matrix": [5, 2], "x": 11.62, "y": 0},
- {"matrix": [5, 3], "x": 12.62, "y": 0},
- {"matrix": [5, 4], "x": 14.07, "y": 0},
- {"matrix": [5, 5], "x": 15.07, "y": 0},
- {"matrix": [5, 6], "x": 16.07, "y": 0},
- {"matrix": [5, 7], "x": 17.07, "y": 0},
-
- {"matrix": [1, 0], "x": 0.28, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.78, "y": 1},
- {"matrix": [1, 2], "x": 3.22, "y": 1},
- {"matrix": [1, 3], "x": 4.22, "y": 1},
- {"matrix": [1, 4], "x": 5.22, "y": 1},
- {"matrix": [1, 5], "x": 6.22, "y": 1},
- {"matrix": [1, 6], "x": 7.22, "y": 1},
-
- {"matrix": [6, 0], "x": 9.12, "y": 1},
- {"matrix": [6, 1], "x": 10.12, "y": 1},
- {"matrix": [6, 2], "x": 11.12, "y": 1},
- {"matrix": [6, 3], "x": 12.12, "y": 1},
- {"matrix": [6, 4], "x": 13.72, "y": 1},
- {"matrix": [6, 5], "x": 14.72, "y": 1},
- {"matrix": [6, 6], "x": 15.72, "y": 1},
- {"matrix": [6, 7], "x": 16.72, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0.14, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.89, "y": 2},
- {"matrix": [2, 2], "x": 3.47, "y": 2},
- {"matrix": [2, 3], "x": 4.47, "y": 2},
- {"matrix": [2, 4], "x": 5.47, "y": 2},
- {"matrix": [2, 5], "x": 6.47, "y": 2},
- {"matrix": [4, 5], "x": 7.47, "y": 2},
-
- {"matrix": [7, 0], "x": 9.37, "y": 2},
- {"matrix": [7, 1], "x": 10.37, "y": 2},
- {"matrix": [7, 2], "x": 11.37, "y": 2},
- {"matrix": [7, 3], "x": 12.37, "y": 2},
- {"matrix": [7, 4], "x": 14.09, "y": 2},
- {"matrix": [7, 5], "x": 15.09, "y": 2},
- {"matrix": [7, 6], "x": 16.09, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.97, "y": 3},
- {"matrix": [3, 3], "x": 4.97, "y": 3},
- {"matrix": [3, 4], "x": 5.97, "y": 3},
- {"matrix": [3, 5], "x": 6.97, "y": 3},
-
- {"matrix": [8, 0], "x": 8.87, "y": 3},
- {"matrix": [8, 1], "x": 9.87, "y": 3},
- {"matrix": [8, 2], "x": 10.87, "y": 3},
- {"matrix": [8, 3], "x": 11.87, "y": 3},
- {"matrix": [8, 4], "x": 13.72, "y": 3},
- {"matrix": [8, 5], "x": 14.72, "y": 3},
- {"matrix": [8, 6], "x": 15.72, "y": 3},
- {"matrix": [8, 7], "x": 16.72, "y": 3},
-
- {"matrix": [9, 0], "x": 18, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 4.47, "y": 4},
- {"matrix": [4, 3], "x": 5.47, "y": 4, "w": 2},
- {"matrix": [4, 4], "x": 7.47, "y": 4},
-
- {"matrix": [9, 1], "x": 9.35, "y": 4, "w": 2.75},
- {"matrix": [9, 2], "x": 12.1, "y": 4},
-
- {"matrix": [9, 3], "x": 17, "y": 4.25},
- {"matrix": [9, 4], "x": 18, "y": 4.25},
- {"matrix": [9, 5], "x": 19, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/kakunpc/rabbit_capture_plan/keyboard.json b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json
new file mode 100644
index 00000000000..7667e5e41b1
--- /dev/null
+++ b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json
@@ -0,0 +1,140 @@
+{
+ "keyboard_name": "rabbit_capture_plan",
+ "manufacturer": "kakunpc",
+ "url": "https://kakunpc.booth.pm/",
+ "maintainer": "kakunpc",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEB59",
+ "device_version": "0.0.1"
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 69,
+ "max_brightness": 200,
+ "sleep": true,
+ "split_count": [32, 37],
+ "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
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.41, "y": 0},
+ {"matrix": [0, 1], "x": 1.41, "y": 0},
+ {"matrix": [0, 2], "x": 2.72, "y": 0},
+ {"matrix": [0, 3], "x": 3.72, "y": 0},
+ {"matrix": [0, 4], "x": 4.72, "y": 0},
+ {"matrix": [0, 5], "x": 5.72, "y": 0},
+ {"matrix": [0, 6], "x": 6.72, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.62, "y": 0},
+ {"matrix": [5, 1], "x": 10.62, "y": 0},
+ {"matrix": [5, 2], "x": 11.62, "y": 0},
+ {"matrix": [5, 3], "x": 12.62, "y": 0},
+ {"matrix": [5, 4], "x": 14.07, "y": 0},
+ {"matrix": [5, 5], "x": 15.07, "y": 0},
+ {"matrix": [5, 6], "x": 16.07, "y": 0},
+ {"matrix": [5, 7], "x": 17.07, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.28, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.78, "y": 1},
+ {"matrix": [1, 2], "x": 3.22, "y": 1},
+ {"matrix": [1, 3], "x": 4.22, "y": 1},
+ {"matrix": [1, 4], "x": 5.22, "y": 1},
+ {"matrix": [1, 5], "x": 6.22, "y": 1},
+ {"matrix": [1, 6], "x": 7.22, "y": 1},
+
+ {"matrix": [6, 0], "x": 9.12, "y": 1},
+ {"matrix": [6, 1], "x": 10.12, "y": 1},
+ {"matrix": [6, 2], "x": 11.12, "y": 1},
+ {"matrix": [6, 3], "x": 12.12, "y": 1},
+ {"matrix": [6, 4], "x": 13.72, "y": 1},
+ {"matrix": [6, 5], "x": 14.72, "y": 1},
+ {"matrix": [6, 6], "x": 15.72, "y": 1},
+ {"matrix": [6, 7], "x": 16.72, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.14, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.89, "y": 2},
+ {"matrix": [2, 2], "x": 3.47, "y": 2},
+ {"matrix": [2, 3], "x": 4.47, "y": 2},
+ {"matrix": [2, 4], "x": 5.47, "y": 2},
+ {"matrix": [2, 5], "x": 6.47, "y": 2},
+ {"matrix": [4, 5], "x": 7.47, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.37, "y": 2},
+ {"matrix": [7, 1], "x": 10.37, "y": 2},
+ {"matrix": [7, 2], "x": 11.37, "y": 2},
+ {"matrix": [7, 3], "x": 12.37, "y": 2},
+ {"matrix": [7, 4], "x": 14.09, "y": 2},
+ {"matrix": [7, 5], "x": 15.09, "y": 2},
+ {"matrix": [7, 6], "x": 16.09, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.97, "y": 3},
+ {"matrix": [3, 3], "x": 4.97, "y": 3},
+ {"matrix": [3, 4], "x": 5.97, "y": 3},
+ {"matrix": [3, 5], "x": 6.97, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.87, "y": 3},
+ {"matrix": [8, 1], "x": 9.87, "y": 3},
+ {"matrix": [8, 2], "x": 10.87, "y": 3},
+ {"matrix": [8, 3], "x": 11.87, "y": 3},
+ {"matrix": [8, 4], "x": 13.72, "y": 3},
+ {"matrix": [8, 5], "x": 14.72, "y": 3},
+ {"matrix": [8, 6], "x": 15.72, "y": 3},
+ {"matrix": [8, 7], "x": 16.72, "y": 3},
+
+ {"matrix": [9, 0], "x": 18, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4.47, "y": 4},
+ {"matrix": [4, 3], "x": 5.47, "y": 4, "w": 2},
+ {"matrix": [4, 4], "x": 7.47, "y": 4},
+
+ {"matrix": [9, 1], "x": 9.35, "y": 4, "w": 2.75},
+ {"matrix": [9, 2], "x": 12.1, "y": 4},
+
+ {"matrix": [9, 3], "x": 17, "y": 4.25},
+ {"matrix": [9, 4], "x": 18, "y": 4.25},
+ {"matrix": [9, 5], "x": 19, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kakunpc/rabbit_capture_plan/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/rules.mk
deleted file mode 100644
index 18499a95838..00000000000
--- a/keyboards/kakunpc/rabbit_capture_plan/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
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = no
diff --git a/keyboards/kakunpc/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk
index 80475ea69aa..f777eaf8613 100644
--- a/keyboards/kakunpc/suihankey/rules.mk
+++ b/keyboards/kakunpc/suihankey/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes
-SPLIT_KEYBOARD = no
DEFAULT_FOLDER = kakunpc/suihankey/rev1
diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json
index 8f624aeb6cf..c186263123b 100644
--- a/keyboards/kakunpc/suihankey/split/info.json
+++ b/keyboards/kakunpc/suihankey/split/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/kakunpc/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk
index 6da41b20b82..08f9eb20bd9 100644
--- a/keyboards/kakunpc/suihankey/split/rules.mk
+++ b/keyboards/kakunpc/suihankey/split/rules.mk
@@ -1,4 +1,3 @@
OLED_ENABLE = no
-SPLIT_KEYBOARD = yes
DEFAULT_FOLDER = kakunpc/suihankey/split/rev1
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index 0d95b99e294..dbbfde0e2a4 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -60,6 +60,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"transport": {
"sync": {
diff --git a/keyboards/kapl/rules.mk b/keyboards/kapl/rules.mk
index e243d257030..586557a9637 100644
--- a/keyboards/kapl/rules.mk
+++ b/keyboards/kapl/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD = yes # Split common
DEFAULT_FOLDER = kapl/rev1
diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json
index b1b1cc98551..0e32ab834bd 100644
--- a/keyboards/kb58/info.json
+++ b/keyboards/kb58/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"matrix_pins": {
"right": {
diff --git a/keyboards/kb58/rules.mk b/keyboards/kb58/rules.mk
index d8ff9ad313d..164c05712b1 100644
--- a/keyboards/kb58/rules.mk
+++ b/keyboards/kb58/rules.mk
@@ -10,5 +10,3 @@ 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
-
-SPLIT_KEYBOARD = yes # Enables split keyboard support
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
deleted file mode 100644
index 9285255f36f..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
- "keyboard_name": "kbd67mkiirgb v2",
- "usb": {
- "pid": "0x1225",
- "device_version": "0.0.2"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true
- },
- "default": {
- "animation": "cycle_all"
- },
- "driver": "is31fl3731",
- "led_flush_limit": 26,
- "led_process_limit": 4,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
- "rows": ["F0", "F1", "F4", "E6", "C6"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "layouts": {
- "LAYOUT_65_ansi_blocker": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json
new file mode 100644
index 00000000000..561c4df2ac0
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json
@@ -0,0 +1,136 @@
+{
+ "keyboard_name": "kbd67mkiirgb v2",
+ "usb": {
+ "pid": "0x1225",
+ "device_version": "0.0.2"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3731",
+ "led_flush_limit": 26,
+ "led_process_limit": 4,
+ "sleep": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+ "rows": ["F0", "F1", "F4", "E6", "C6"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
deleted file mode 100644
index 502113e3b85..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/v2/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 # Audio output
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json
deleted file mode 100644
index 7b64cae8934..00000000000
--- a/keyboards/kbdfans/maja/info.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
- "keyboard_name": "Maja",
- "manufacturer": "KBDFans",
- "url": "",
- "maintainer": "DZTECH",
- "usb": {
- "vid": "0x4B42",
- "pid": "0x6068",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true
- },
- "default": {
- "animation": "cycle_all"
- },
- "driver": "is31fl3731",
- "led_flush_limit": 26,
- "led_process_limit": 4,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
- "rows": ["F0", "B6", "B5", "B4", "D7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0.75, "y": 0.25},
- {"matrix": [0, 1], "x": 1.75, "y": 0.25},
- {"matrix": [0, 2], "x": 2.75, "y": 0},
- {"matrix": [0, 3], "x": 3.75, "y": 0.25},
- {"matrix": [0, 4], "x": 4.75, "y": 0.25},
- {"matrix": [0, 5], "x": 5.75, "y": 0.25},
- {"matrix": [0, 6], "x": 6.75, "y": 0.25},
-
- {"matrix": [0, 7], "x": 8.75, "y": 0.25},
- {"matrix": [0, 8], "x": 9.75, "y": 0.25},
- {"matrix": [0, 9], "x": 10.75, "y": 0.25},
- {"matrix": [0, 10], "x": 11.75, "y": 0.25},
- {"matrix": [0, 11], "x": 12.75, "y": 0},
- {"matrix": [0, 12], "x": 13.75, "y": 0.25},
- {"matrix": [0, 13], "x": 14.75, "y": 0.25, "w": 2},
-
- {"matrix": [0, 14], "x": 17.75, "y": 0.25},
-
- {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
- {"matrix": [1, 1], "x": 2, "y": 1.25},
- {"matrix": [1, 2], "x": 3, "y": 1.25},
- {"matrix": [1, 3], "x": 4, "y": 1.25},
- {"matrix": [1, 4], "x": 5, "y": 1.25},
- {"matrix": [1, 5], "x": 6, "y": 1.25},
-
- {"matrix": [1, 6], "x": 8.5, "y": 1.25},
- {"matrix": [1, 7], "x": 9.5, "y": 1.25},
- {"matrix": [1, 8], "x": 10.5, "y": 1.25},
- {"matrix": [1, 9], "x": 11.5, "y": 1.25},
- {"matrix": [1, 10], "x": 12.5, "y": 1.25},
- {"matrix": [1, 11], "x": 13.5, "y": 1.25},
- {"matrix": [1, 12], "x": 14.5, "y": 1.25},
- {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5},
-
- {"matrix": [1, 14], "x": 17.75, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
- {"matrix": [2, 1], "x": 2, "y": 2.25},
- {"matrix": [2, 2], "x": 3, "y": 2.25},
- {"matrix": [2, 3], "x": 4, "y": 2.25},
- {"matrix": [2, 4], "x": 5, "y": 2.25},
- {"matrix": [2, 5], "x": 6, "y": 2.25},
-
- {"matrix": [2, 6], "x": 9, "y": 2.25},
- {"matrix": [2, 7], "x": 10, "y": 2.25},
- {"matrix": [2, 8], "x": 11, "y": 2.25},
- {"matrix": [2, 9], "x": 12, "y": 2.25},
- {"matrix": [2, 10], "x": 13, "y": 2.25},
- {"matrix": [2, 11], "x": 14, "y": 2.25},
- {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25},
-
- {"matrix": [2, 14], "x": 17.75, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3.25},
- {"matrix": [3, 2], "x": 3.25, "y": 3.25},
- {"matrix": [3, 3], "x": 4.25, "y": 3.25},
- {"matrix": [3, 4], "x": 5.25, "y": 3.25},
- {"matrix": [3, 5], "x": 6.25, "y": 3.25},
- {"matrix": [3, 6], "x": 8.25, "y": 3.25},
- {"matrix": [3, 7], "x": 9.25, "y": 3.25},
- {"matrix": [3, 8], "x": 10.25, "y": 3.25},
- {"matrix": [3, 9], "x": 11.25, "y": 3.25},
- {"matrix": [3, 10], "x": 12.25, "y": 3.25},
- {"matrix": [3, 11], "x": 13.25, "y": 3.25},
- {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25},
-
- {"matrix": [3, 13], "x": 16.75, "y": 3.5},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
- {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5},
- {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2},
- {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25},
-
- {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75},
- {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5},
-
- {"matrix": [4, 12], "x": 15.75, "y": 4.5},
- {"matrix": [4, 13], "x": 16.75, "y": 4.5},
- {"matrix": [4, 14], "x": 17.75, "y": 4.5}
- ]
- }
- }
-}
diff --git a/keyboards/kbdfans/maja/keyboard.json b/keyboards/kbdfans/maja/keyboard.json
new file mode 100644
index 00000000000..c307f78637a
--- /dev/null
+++ b/keyboards/kbdfans/maja/keyboard.json
@@ -0,0 +1,151 @@
+{
+ "keyboard_name": "Maja",
+ "manufacturer": "KBDFans",
+ "url": "",
+ "maintainer": "DZTECH",
+ "usb": {
+ "vid": "0x4B42",
+ "pid": "0x6068",
+ "device_version": "0.0.1"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3731",
+ "led_flush_limit": 26,
+ "led_process_limit": 4,
+ "sleep": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
+ "rows": ["F0", "B6", "B5", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+ {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+ {"matrix": [0, 2], "x": 2.75, "y": 0},
+ {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+ {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+ {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+ {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+
+ {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+ {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+ {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+ {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+ {"matrix": [0, 11], "x": 12.75, "y": 0},
+ {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+ {"matrix": [0, 13], "x": 14.75, "y": 0.25, "w": 2},
+
+ {"matrix": [0, 14], "x": 17.75, "y": 0.25},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 1], "x": 2, "y": 1.25},
+ {"matrix": [1, 2], "x": 3, "y": 1.25},
+ {"matrix": [1, 3], "x": 4, "y": 1.25},
+ {"matrix": [1, 4], "x": 5, "y": 1.25},
+ {"matrix": [1, 5], "x": 6, "y": 1.25},
+
+ {"matrix": [1, 6], "x": 8.5, "y": 1.25},
+ {"matrix": [1, 7], "x": 9.5, "y": 1.25},
+ {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+ {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+ {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+ {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+ {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+ {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 17.75, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 2, "y": 2.25},
+ {"matrix": [2, 2], "x": 3, "y": 2.25},
+ {"matrix": [2, 3], "x": 4, "y": 2.25},
+ {"matrix": [2, 4], "x": 5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6, "y": 2.25},
+
+ {"matrix": [2, 6], "x": 9, "y": 2.25},
+ {"matrix": [2, 7], "x": 10, "y": 2.25},
+ {"matrix": [2, 8], "x": 11, "y": 2.25},
+ {"matrix": [2, 9], "x": 12, "y": 2.25},
+ {"matrix": [2, 10], "x": 13, "y": 2.25},
+ {"matrix": [2, 11], "x": 14, "y": 2.25},
+ {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 17.75, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+ {"matrix": [3, 6], "x": 8.25, "y": 3.25},
+ {"matrix": [3, 7], "x": 9.25, "y": 3.25},
+ {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+ {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+ {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+ {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 13], "x": 16.75, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2},
+ {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 15.75, "y": 4.5},
+ {"matrix": [4, 13], "x": 16.75, "y": 4.5},
+ {"matrix": [4, 14], "x": 17.75, "y": 4.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk
deleted file mode 100755
index a59c9aa4cf9..00000000000
--- a/keyboards/kbdfans/maja/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 # Audio output
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/info.json
deleted file mode 100644
index 197f26870b8..00000000000
--- a/keyboards/kbdfans/maja_soldered/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
- "keyboard_name": "Maja Soldered",
- "manufacturer": "KBDFans",
- "url": "",
- "maintainer": "DZTECH",
- "usb": {
- "vid": "0x4B42",
- "pid": "0x6069",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
- "rows": ["F0", "B6", "D6", "B4", "D7"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B5"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0.75, "y": 0.25},
- {"matrix": [0, 1], "x": 1.75, "y": 0.25},
- {"matrix": [0, 2], "x": 2.75, "y": 0},
- {"matrix": [0, 3], "x": 3.75, "y": 0.25},
- {"matrix": [0, 4], "x": 4.75, "y": 0.25},
- {"matrix": [0, 5], "x": 5.75, "y": 0.25},
- {"matrix": [0, 6], "x": 6.75, "y": 0.25},
-
- {"matrix": [0, 7], "x": 8.75, "y": 0.25},
- {"matrix": [0, 8], "x": 9.75, "y": 0.25},
- {"matrix": [0, 9], "x": 10.75, "y": 0.25},
- {"matrix": [0, 10], "x": 11.75, "y": 0.25},
- {"matrix": [0, 11], "x": 12.75, "y": 0},
- {"matrix": [0, 12], "x": 13.75, "y": 0.25},
- {"matrix": [0, 13], "x": 14.75, "y": 0.25},
- {"matrix": [3, 14], "x": 15.75, "y": 0.25},
-
- {"matrix": [0, 14], "x": 17.75, "y": 0.25},
-
- {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
- {"matrix": [1, 1], "x": 2, "y": 1.25},
- {"matrix": [1, 2], "x": 3, "y": 1.25},
- {"matrix": [1, 3], "x": 4, "y": 1.25},
- {"matrix": [1, 4], "x": 5, "y": 1.25},
- {"matrix": [1, 5], "x": 6, "y": 1.25},
-
- {"matrix": [1, 6], "x": 8.5, "y": 1.25},
- {"matrix": [1, 7], "x": 9.5, "y": 1.25},
- {"matrix": [1, 8], "x": 10.5, "y": 1.25},
- {"matrix": [1, 9], "x": 11.5, "y": 1.25},
- {"matrix": [1, 10], "x": 12.5, "y": 1.25},
- {"matrix": [1, 11], "x": 13.5, "y": 1.25},
- {"matrix": [1, 12], "x": 14.5, "y": 1.25},
- {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5},
-
- {"matrix": [1, 14], "x": 17.75, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
- {"matrix": [2, 1], "x": 2, "y": 2.25},
- {"matrix": [2, 2], "x": 3, "y": 2.25},
- {"matrix": [2, 3], "x": 4, "y": 2.25},
- {"matrix": [2, 4], "x": 5, "y": 2.25},
- {"matrix": [2, 5], "x": 6, "y": 2.25},
-
- {"matrix": [2, 6], "x": 9, "y": 2.25},
- {"matrix": [2, 7], "x": 10, "y": 2.25},
- {"matrix": [2, 8], "x": 11, "y": 2.25},
- {"matrix": [2, 9], "x": 12, "y": 2.25},
- {"matrix": [2, 10], "x": 13, "y": 2.25},
- {"matrix": [2, 11], "x": 14, "y": 2.25},
- {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25},
-
- {"matrix": [2, 14], "x": 17.75, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3.25},
- {"matrix": [3, 2], "x": 3.25, "y": 3.25},
- {"matrix": [3, 3], "x": 4.25, "y": 3.25},
- {"matrix": [3, 4], "x": 5.25, "y": 3.25},
- {"matrix": [3, 5], "x": 6.25, "y": 3.25},
-
- {"matrix": [3, 6], "x": 8.25, "y": 3.25},
- {"matrix": [3, 7], "x": 9.25, "y": 3.25},
- {"matrix": [3, 8], "x": 10.25, "y": 3.25},
- {"matrix": [3, 9], "x": 11.25, "y": 3.25},
- {"matrix": [3, 10], "x": 12.25, "y": 3.25},
- {"matrix": [3, 11], "x": 13.25, "y": 3.25},
- {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25},
-
- {"matrix": [3, 13], "x": 16.75, "y": 3.5},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
- {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5},
- {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2},
- {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25},
-
- {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75},
- {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5},
-
- {"matrix": [4, 12], "x": 15.75, "y": 4.5},
- {"matrix": [4, 13], "x": 16.75, "y": 4.5},
- {"matrix": [4, 14], "x": 17.75, "y": 4.5}
- ]
- }
- }
-}
diff --git a/keyboards/kbdfans/maja_soldered/keyboard.json b/keyboards/kbdfans/maja_soldered/keyboard.json
new file mode 100644
index 00000000000..f9ae338ae73
--- /dev/null
+++ b/keyboards/kbdfans/maja_soldered/keyboard.json
@@ -0,0 +1,119 @@
+{
+ "keyboard_name": "Maja Soldered",
+ "manufacturer": "KBDFans",
+ "url": "",
+ "maintainer": "DZTECH",
+ "usb": {
+ "vid": "0x4B42",
+ "pid": "0x6069",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
+ "rows": ["F0", "B6", "D6", "B4", "D7"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B5"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+ {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+ {"matrix": [0, 2], "x": 2.75, "y": 0},
+ {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+ {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+ {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+ {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+
+ {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+ {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+ {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+ {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+ {"matrix": [0, 11], "x": 12.75, "y": 0},
+ {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+ {"matrix": [0, 13], "x": 14.75, "y": 0.25},
+ {"matrix": [3, 14], "x": 15.75, "y": 0.25},
+
+ {"matrix": [0, 14], "x": 17.75, "y": 0.25},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 1], "x": 2, "y": 1.25},
+ {"matrix": [1, 2], "x": 3, "y": 1.25},
+ {"matrix": [1, 3], "x": 4, "y": 1.25},
+ {"matrix": [1, 4], "x": 5, "y": 1.25},
+ {"matrix": [1, 5], "x": 6, "y": 1.25},
+
+ {"matrix": [1, 6], "x": 8.5, "y": 1.25},
+ {"matrix": [1, 7], "x": 9.5, "y": 1.25},
+ {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+ {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+ {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+ {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+ {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+ {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 17.75, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 2, "y": 2.25},
+ {"matrix": [2, 2], "x": 3, "y": 2.25},
+ {"matrix": [2, 3], "x": 4, "y": 2.25},
+ {"matrix": [2, 4], "x": 5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6, "y": 2.25},
+
+ {"matrix": [2, 6], "x": 9, "y": 2.25},
+ {"matrix": [2, 7], "x": 10, "y": 2.25},
+ {"matrix": [2, 8], "x": 11, "y": 2.25},
+ {"matrix": [2, 9], "x": 12, "y": 2.25},
+ {"matrix": [2, 10], "x": 13, "y": 2.25},
+ {"matrix": [2, 11], "x": 14, "y": 2.25},
+ {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 17.75, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+
+ {"matrix": [3, 6], "x": 8.25, "y": 3.25},
+ {"matrix": [3, 7], "x": 9.25, "y": 3.25},
+ {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+ {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+ {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+ {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+ {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 13], "x": 16.75, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2},
+ {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 15.75, "y": 4.5},
+ {"matrix": [4, 13], "x": 16.75, "y": 4.5},
+ {"matrix": [4, 14], "x": 17.75, "y": 4.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kbdfans/maja_soldered/rules.mk b/keyboards/kbdfans/maja_soldered/rules.mk
deleted file mode 100755
index 901d395d65a..00000000000
--- a/keyboards/kbdfans/maja_soldered/rules.mk
+++ /dev/null
@@ -1,11 +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 = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
deleted file mode 100644
index 5738ac69530..00000000000
--- a/keyboards/keebio/bfo9000/info.json
+++ /dev/null
@@ -1,147 +0,0 @@
-{
- "keyboard_name": "BFO-9000",
- "manufacturer": "Keebio",
- "url": "https://keeb.io",
- "maintainer": "Keebio",
- "usb": {
- "vid": "0xCB10",
- "pid": "0x1169",
- "device_version": "1.0.0"
- },
- "matrix_pins": {
- "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
- "rows": ["D3", "D2", "D4", "C6", "D7", "E6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 20,
- "split_count": [10, 10]
- },
- "ws2812": {
- "pin": "B4"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [6, 0], "x": 10, "y": 0},
- {"matrix": [6, 1], "x": 11, "y": 0},
- {"matrix": [6, 2], "x": 12, "y": 0},
- {"matrix": [6, 3], "x": 13, "y": 0},
- {"matrix": [6, 4], "x": 14, "y": 0},
- {"matrix": [6, 5], "x": 15, "y": 0},
- {"matrix": [6, 6], "x": 16, "y": 0},
- {"matrix": [6, 7], "x": 17, "y": 0},
- {"matrix": [6, 8], "x": 18, "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": [7, 0], "x": 10, "y": 1},
- {"matrix": [7, 1], "x": 11, "y": 1},
- {"matrix": [7, 2], "x": 12, "y": 1},
- {"matrix": [7, 3], "x": 13, "y": 1},
- {"matrix": [7, 4], "x": 14, "y": 1},
- {"matrix": [7, 5], "x": 15, "y": 1},
- {"matrix": [7, 6], "x": 16, "y": 1},
- {"matrix": [7, 7], "x": 17, "y": 1},
- {"matrix": [7, 8], "x": 18, "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": [8, 0], "x": 10, "y": 2},
- {"matrix": [8, 1], "x": 11, "y": 2},
- {"matrix": [8, 2], "x": 12, "y": 2},
- {"matrix": [8, 3], "x": 13, "y": 2},
- {"matrix": [8, 4], "x": 14, "y": 2},
- {"matrix": [8, 5], "x": 15, "y": 2},
- {"matrix": [8, 6], "x": 16, "y": 2},
- {"matrix": [8, 7], "x": 17, "y": 2},
- {"matrix": [8, 8], "x": 18, "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": [9, 0], "x": 10, "y": 3},
- {"matrix": [9, 1], "x": 11, "y": 3},
- {"matrix": [9, 2], "x": 12, "y": 3},
- {"matrix": [9, 3], "x": 13, "y": 3},
- {"matrix": [9, 4], "x": 14, "y": 3},
- {"matrix": [9, 5], "x": 15, "y": 3},
- {"matrix": [9, 6], "x": 16, "y": 3},
- {"matrix": [9, 7], "x": 17, "y": 3},
- {"matrix": [9, 8], "x": 18, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "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, 8], "x": 8, "y": 4},
- {"matrix": [10, 0], "x": 10, "y": 4},
- {"matrix": [10, 1], "x": 11, "y": 4},
- {"matrix": [10, 2], "x": 12, "y": 4},
- {"matrix": [10, 3], "x": 13, "y": 4},
- {"matrix": [10, 4], "x": 14, "y": 4},
- {"matrix": [10, 5], "x": 15, "y": 4},
- {"matrix": [10, 6], "x": 16, "y": 4},
- {"matrix": [10, 7], "x": 17, "y": 4},
- {"matrix": [10, 8], "x": 18, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5},
- {"matrix": [5, 1], "x": 1, "y": 5},
- {"matrix": [5, 2], "x": 2, "y": 5},
- {"matrix": [5, 3], "x": 3, "y": 5},
- {"matrix": [5, 4], "x": 4, "y": 5},
- {"matrix": [5, 5], "x": 5, "y": 5},
- {"matrix": [5, 6], "x": 6, "y": 5},
- {"matrix": [5, 7], "x": 7, "y": 5},
- {"matrix": [5, 8], "x": 8, "y": 5},
- {"matrix": [11, 0], "x": 10, "y": 5},
- {"matrix": [11, 1], "x": 11, "y": 5},
- {"matrix": [11, 2], "x": 12, "y": 5},
- {"matrix": [11, 3], "x": 13, "y": 5},
- {"matrix": [11, 4], "x": 14, "y": 5},
- {"matrix": [11, 5], "x": 15, "y": 5},
- {"matrix": [11, 6], "x": 16, "y": 5},
- {"matrix": [11, 7], "x": 17, "y": 5},
- {"matrix": [11, 8], "x": 18, "y": 5}
- ]
- }
- }
- }
diff --git a/keyboards/keebio/bfo9000/keyboard.json b/keyboards/keebio/bfo9000/keyboard.json
new file mode 100644
index 00000000000..86fd59a5986
--- /dev/null
+++ b/keyboards/keebio/bfo9000/keyboard.json
@@ -0,0 +1,156 @@
+{
+ "keyboard_name": "BFO-9000",
+ "manufacturer": "Keebio",
+ "url": "https://keeb.io",
+ "maintainer": "Keebio",
+ "usb": {
+ "vid": "0xCB10",
+ "pid": "0x1169",
+ "device_version": "1.0.0"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D3", "D2", "D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 20,
+ "split_count": [10, 10]
+ },
+ "ws2812": {
+ "pin": "B4"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [6, 0], "x": 10, "y": 0},
+ {"matrix": [6, 1], "x": 11, "y": 0},
+ {"matrix": [6, 2], "x": 12, "y": 0},
+ {"matrix": [6, 3], "x": 13, "y": 0},
+ {"matrix": [6, 4], "x": 14, "y": 0},
+ {"matrix": [6, 5], "x": 15, "y": 0},
+ {"matrix": [6, 6], "x": 16, "y": 0},
+ {"matrix": [6, 7], "x": 17, "y": 0},
+ {"matrix": [6, 8], "x": 18, "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": [7, 0], "x": 10, "y": 1},
+ {"matrix": [7, 1], "x": 11, "y": 1},
+ {"matrix": [7, 2], "x": 12, "y": 1},
+ {"matrix": [7, 3], "x": 13, "y": 1},
+ {"matrix": [7, 4], "x": 14, "y": 1},
+ {"matrix": [7, 5], "x": 15, "y": 1},
+ {"matrix": [7, 6], "x": 16, "y": 1},
+ {"matrix": [7, 7], "x": 17, "y": 1},
+ {"matrix": [7, 8], "x": 18, "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": [8, 0], "x": 10, "y": 2},
+ {"matrix": [8, 1], "x": 11, "y": 2},
+ {"matrix": [8, 2], "x": 12, "y": 2},
+ {"matrix": [8, 3], "x": 13, "y": 2},
+ {"matrix": [8, 4], "x": 14, "y": 2},
+ {"matrix": [8, 5], "x": 15, "y": 2},
+ {"matrix": [8, 6], "x": 16, "y": 2},
+ {"matrix": [8, 7], "x": 17, "y": 2},
+ {"matrix": [8, 8], "x": 18, "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": [9, 0], "x": 10, "y": 3},
+ {"matrix": [9, 1], "x": 11, "y": 3},
+ {"matrix": [9, 2], "x": 12, "y": 3},
+ {"matrix": [9, 3], "x": 13, "y": 3},
+ {"matrix": [9, 4], "x": 14, "y": 3},
+ {"matrix": [9, 5], "x": 15, "y": 3},
+ {"matrix": [9, 6], "x": 16, "y": 3},
+ {"matrix": [9, 7], "x": 17, "y": 3},
+ {"matrix": [9, 8], "x": 18, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "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, 8], "x": 8, "y": 4},
+ {"matrix": [10, 0], "x": 10, "y": 4},
+ {"matrix": [10, 1], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 12, "y": 4},
+ {"matrix": [10, 3], "x": 13, "y": 4},
+ {"matrix": [10, 4], "x": 14, "y": 4},
+ {"matrix": [10, 5], "x": 15, "y": 4},
+ {"matrix": [10, 6], "x": 16, "y": 4},
+ {"matrix": [10, 7], "x": 17, "y": 4},
+ {"matrix": [10, 8], "x": 18, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+ {"matrix": [5, 4], "x": 4, "y": 5},
+ {"matrix": [5, 5], "x": 5, "y": 5},
+ {"matrix": [5, 6], "x": 6, "y": 5},
+ {"matrix": [5, 7], "x": 7, "y": 5},
+ {"matrix": [5, 8], "x": 8, "y": 5},
+ {"matrix": [11, 0], "x": 10, "y": 5},
+ {"matrix": [11, 1], "x": 11, "y": 5},
+ {"matrix": [11, 2], "x": 12, "y": 5},
+ {"matrix": [11, 3], "x": 13, "y": 5},
+ {"matrix": [11, 4], "x": 14, "y": 5},
+ {"matrix": [11, 5], "x": 15, "y": 5},
+ {"matrix": [11, 6], "x": 16, "y": 5},
+ {"matrix": [11, 7], "x": 17, "y": 5},
+ {"matrix": [11, 8], "x": 18, "y": 5}
+ ]
+ }
+ }
+ }
diff --git a/keyboards/keebio/bfo9000/rules.mk b/keyboards/keebio/bfo9000/rules.mk
deleted file mode 100644
index 743a54659e1..00000000000
--- a/keyboards/keebio/bfo9000/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
index e826f34e329..cc3fe50636b 100644
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -22,6 +22,7 @@
"pin": "B5"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
diff --git a/keyboards/keebio/foldkb/rules.mk b/keyboards/keebio/foldkb/rules.mk
index 744acea63fe..b9c01e0aff0 100644
--- a/keyboards/keebio/foldkb/rules.mk
+++ b/keyboards/keebio/foldkb/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes
-SPLIT_KEYBOARD = yes
DEFAULT_FOLDER = keebio/foldkb/rev1
diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json
deleted file mode 100644
index 8631fd58411..00000000000
--- a/keyboards/keebio/fourier/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- "keyboard_name": "Fourier",
- "manufacturer": "Keebio",
- "url": "https://keeb.io",
- "maintainer": "nooges",
- "usb": {
- "vid": "0xCB10",
- "pid": "0x1247",
- "device_version": "1.0.0"
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["F4", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "qmk_lufa_bootloader": {
- "esc_input": "F4",
- "esc_output": "F5",
- "led": "B0",
- "speaker": "C6"
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 14,
- "split_count": [7, 7],
- "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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [4, 0], "x": 7, "y": 0},
- {"matrix": [4, 1], "x": 8, "y": 0},
- {"matrix": [4, 2], "x": 9, "y": 0},
- {"matrix": [4, 3], "x": 10, "y": 0},
- {"matrix": [4, 4], "x": 11, "y": 0},
- {"matrix": [4, 5], "x": 12, "y": 0},
- {"matrix": [4, 6], "x": 13, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
-
- {"matrix": [5, 0], "x": 7.25, "y": 1},
- {"matrix": [5, 1], "x": 8.25, "y": 1},
- {"matrix": [5, 2], "x": 9.25, "y": 1},
- {"matrix": [5, 3], "x": 10.25, "y": 1},
- {"matrix": [5, 4], "x": 11.25, "y": 1},
- {"matrix": [5, 6], "x": 12.25, "y": 1, "w": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [6, 0], "x": 7.75, "y": 2},
- {"matrix": [6, 2], "x": 8.75, "y": 2},
- {"matrix": [6, 3], "x": 9.75, "y": 2},
- {"matrix": [6, 4], "x": 10.75, "y": 2},
- {"matrix": [6, 5], "x": 11.75, "y": 2},
- {"matrix": [6, 6], "x": 12.75, "y": 2, "w": 1.25},
-
- {"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.25},
-
- {"matrix": [7, 0], "x": 7.25, "y": 3, "w": 2.25},
- {"matrix": [7, 3], "x": 9.5, "y": 3},
- {"matrix": [7, 4], "x": 10.5, "y": 3, "w": 1.25},
- {"matrix": [7, 5], "x": 11.75, "y": 3},
- {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/keebio/fourier/keyboard.json b/keyboards/keebio/fourier/keyboard.json
new file mode 100644
index 00000000000..a1dab05c567
--- /dev/null
+++ b/keyboards/keebio/fourier/keyboard.json
@@ -0,0 +1,116 @@
+{
+ "keyboard_name": "Fourier",
+ "manufacturer": "Keebio",
+ "url": "https://keeb.io",
+ "maintainer": "nooges",
+ "usb": {
+ "vid": "0xCB10",
+ "pid": "0x1247",
+ "device_version": "1.0.0"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["F4", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "qmk_lufa_bootloader": {
+ "esc_input": "F4",
+ "esc_output": "F5",
+ "led": "B0",
+ "speaker": "C6"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 14,
+ "split_count": [7, 7],
+ "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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "y": 0},
+ {"matrix": [4, 6], "x": 13, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+
+ {"matrix": [5, 0], "x": 7.25, "y": 1},
+ {"matrix": [5, 1], "x": 8.25, "y": 1},
+ {"matrix": [5, 2], "x": 9.25, "y": 1},
+ {"matrix": [5, 3], "x": 10.25, "y": 1},
+ {"matrix": [5, 4], "x": 11.25, "y": 1},
+ {"matrix": [5, 6], "x": 12.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [6, 0], "x": 7.75, "y": 2},
+ {"matrix": [6, 2], "x": 8.75, "y": 2},
+ {"matrix": [6, 3], "x": 9.75, "y": 2},
+ {"matrix": [6, 4], "x": 10.75, "y": 2},
+ {"matrix": [6, 5], "x": 11.75, "y": 2},
+ {"matrix": [6, 6], "x": 12.75, "y": 2, "w": 1.25},
+
+ {"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.25},
+
+ {"matrix": [7, 0], "x": 7.25, "y": 3, "w": 2.25},
+ {"matrix": [7, 3], "x": 9.5, "y": 3},
+ {"matrix": [7, 4], "x": 10.5, "y": 3, "w": 1.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3},
+ {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keebio/fourier/rules.mk b/keyboards/keebio/fourier/rules.mk
deleted file mode 100644
index ff93a339143..00000000000
--- a/keyboards/keebio/fourier/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json
deleted file mode 100644
index f5efce863a8..00000000000
--- a/keyboards/keebio/iris/rev1/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
- "keyboard_name": "Iris Rev. 1",
- "usb": {
- "pid": "0x1256",
- "device_version": "1.0.0"
- },
- "matrix_pins": {
- "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D7", "E6", "B4", "B5", "D4"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "driver": "timer",
- "pin": "D2",
- "levels": 5
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375},
- {"matrix": [0, 1], "x": 1, "y": 0.375},
- {"matrix": [0, 2], "x": 2, "y": 0.125},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.125},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
-
- {"matrix": [5, 5], "x": 9, "y": 0.25},
- {"matrix": [5, 4], "x": 10, "y": 0.125},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 2], "x": 12, "y": 0.125},
- {"matrix": [5, 1], "x": 13, "y": 0.375},
- {"matrix": [5, 0], "x": 14, "y": 0.375},
-
- {"matrix": [1, 0], "x": 0, "y": 1.375},
- {"matrix": [1, 1], "x": 1, "y": 1.375},
- {"matrix": [1, 2], "x": 2, "y": 1.125},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.125},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
-
- {"matrix": [6, 5], "x": 9, "y": 1.25},
- {"matrix": [6, 4], "x": 10, "y": 1.125},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1.125},
- {"matrix": [6, 1], "x": 13, "y": 1.375},
- {"matrix": [6, 0], "x": 14, "y": 1.375},
-
- {"matrix": [2, 0], "x": 0, "y": 2.375},
- {"matrix": [2, 1], "x": 1, "y": 2.375},
- {"matrix": [2, 2], "x": 2, "y": 2.125},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.125},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
-
- {"matrix": [7, 5], "x": 9, "y": 2.25},
- {"matrix": [7, 4], "x": 10, "y": 2.125},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 2], "x": 12, "y": 2.125},
- {"matrix": [7, 1], "x": 13, "y": 2.375},
- {"matrix": [7, 0], "x": 14, "y": 2.375},
-
- {"matrix": [3, 0], "x": 0, "y": 3.375},
- {"matrix": [3, 1], "x": 1, "y": 3.375},
- {"matrix": [3, 2], "x": 2, "y": 3.125},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3.125},
- {"matrix": [3, 5], "x": 5, "y": 3.25},
- {"matrix": [4, 2], "x": 6.15, "y": 3.75},
-
- {"matrix": [9, 2], "x": 7.85, "y": 3.75},
- {"matrix": [8, 5], "x": 9, "y": 3.25},
- {"matrix": [8, 4], "x": 10, "y": 3.125},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 2], "x": 12, "y": 3.125},
- {"matrix": [8, 1], "x": 13, "y": 3.375},
- {"matrix": [8, 0], "x": 14, "y": 3.375},
-
- {"matrix": [4, 3], "x": 3.5, "y": 4.25},
- {"matrix": [4, 4], "x": 4.5, "y": 4.375},
- {"matrix": [4, 5], "x": 5.6, "y": 4.75},
-
- {"matrix": [9, 5], "x": 8.4, "y": 4.75},
- {"matrix": [9, 4], "x": 9.5, "y": 4.375},
- {"matrix": [9, 3], "x": 10.5, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/keebio/iris/rev1/keyboard.json b/keyboards/keebio/iris/rev1/keyboard.json
new file mode 100644
index 00000000000..c6b69c36778
--- /dev/null
+++ b/keyboards/keebio/iris/rev1/keyboard.json
@@ -0,0 +1,122 @@
+{
+ "keyboard_name": "Iris Rev. 1",
+ "usb": {
+ "pid": "0x1256",
+ "device_version": "1.0.0"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D7", "E6", "B4", "B5", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "driver": "timer",
+ "pin": "D2",
+ "levels": 5
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [5, 5], "x": 9, "y": 0.25},
+ {"matrix": [5, 4], "x": 10, "y": 0.125},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0.125},
+ {"matrix": [5, 1], "x": 13, "y": 0.375},
+ {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [6, 5], "x": 9, "y": 1.25},
+ {"matrix": [6, 4], "x": 10, "y": 1.125},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1.125},
+ {"matrix": [6, 1], "x": 13, "y": 1.375},
+ {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"matrix": [7, 5], "x": 9, "y": 2.25},
+ {"matrix": [7, 4], "x": 10, "y": 2.125},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2.125},
+ {"matrix": [7, 1], "x": 13, "y": 2.375},
+ {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [4, 2], "x": 6.15, "y": 3.75},
+
+ {"matrix": [9, 2], "x": 7.85, "y": 3.75},
+ {"matrix": [8, 5], "x": 9, "y": 3.25},
+ {"matrix": [8, 4], "x": 10, "y": 3.125},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3.125},
+ {"matrix": [8, 1], "x": 13, "y": 3.375},
+ {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+ {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.375},
+ {"matrix": [4, 5], "x": 5.6, "y": 4.75},
+
+ {"matrix": [9, 5], "x": 8.4, "y": 4.75},
+ {"matrix": [9, 4], "x": 9.5, "y": 4.375},
+ {"matrix": [9, 3], "x": 10.5, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keebio/iris/rev1/rules.mk b/keyboards/keebio/iris/rev1/rules.mk
deleted file mode 100644
index 12e5a0674bb..00000000000
--- a/keyboards/keebio/iris/rev1/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json
deleted file mode 100644
index fb5db92913a..00000000000
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
- "keyboard_name": "Iris Rev. 1",
- "usb": {
- "pid": "0x1256",
- "device_version": "1.1.0"
- },
- "matrix_pins": {
- "cols": ["F6", "F7", "B1", "B3", "B2", "F4"],
- "rows": ["D7", "E6", "B4", "B5", "D4"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B6",
- "levels": 5
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375},
- {"matrix": [0, 1], "x": 1, "y": 0.375},
- {"matrix": [0, 2], "x": 2, "y": 0.125},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.125},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
-
- {"matrix": [5, 5], "x": 9, "y": 0.25},
- {"matrix": [5, 4], "x": 10, "y": 0.125},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 2], "x": 12, "y": 0.125},
- {"matrix": [5, 1], "x": 13, "y": 0.375},
- {"matrix": [5, 0], "x": 14, "y": 0.375},
-
- {"matrix": [1, 0], "x": 0, "y": 1.375},
- {"matrix": [1, 1], "x": 1, "y": 1.375},
- {"matrix": [1, 2], "x": 2, "y": 1.125},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.125},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
-
- {"matrix": [6, 5], "x": 9, "y": 1.25},
- {"matrix": [6, 4], "x": 10, "y": 1.125},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1.125},
- {"matrix": [6, 1], "x": 13, "y": 1.375},
- {"matrix": [6, 0], "x": 14, "y": 1.375},
-
- {"matrix": [2, 0], "x": 0, "y": 2.375},
- {"matrix": [2, 1], "x": 1, "y": 2.375},
- {"matrix": [2, 2], "x": 2, "y": 2.125},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.125},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
-
- {"matrix": [7, 5], "x": 9, "y": 2.25},
- {"matrix": [7, 4], "x": 10, "y": 2.125},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 2], "x": 12, "y": 2.125},
- {"matrix": [7, 1], "x": 13, "y": 2.375},
- {"matrix": [7, 0], "x": 14, "y": 2.375},
-
- {"matrix": [3, 0], "x": 0, "y": 3.375},
- {"matrix": [3, 1], "x": 1, "y": 3.375},
- {"matrix": [3, 2], "x": 2, "y": 3.125},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3.125},
- {"matrix": [3, 5], "x": 5, "y": 3.25},
- {"matrix": [4, 2], "x": 6.15, "y": 3.75},
-
- {"matrix": [9, 2], "x": 7.85, "y": 3.75},
- {"matrix": [8, 5], "x": 9, "y": 3.25},
- {"matrix": [8, 4], "x": 10, "y": 3.125},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 2], "x": 12, "y": 3.125},
- {"matrix": [8, 1], "x": 13, "y": 3.375},
- {"matrix": [8, 0], "x": 14, "y": 3.375},
-
- {"matrix": [4, 3], "x": 3.5, "y": 4.25},
- {"matrix": [4, 4], "x": 4.5, "y": 4.375},
- {"matrix": [4, 5], "x": 5.6, "y": 4.75},
-
- {"matrix": [9, 5], "x": 8.4, "y": 4.75},
- {"matrix": [9, 4], "x": 9.5, "y": 4.375},
- {"matrix": [9, 3], "x": 10.5, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/keebio/iris/rev1_led/keyboard.json b/keyboards/keebio/iris/rev1_led/keyboard.json
new file mode 100644
index 00000000000..70500da27e9
--- /dev/null
+++ b/keyboards/keebio/iris/rev1_led/keyboard.json
@@ -0,0 +1,121 @@
+{
+ "keyboard_name": "Iris Rev. 1",
+ "usb": {
+ "pid": "0x1256",
+ "device_version": "1.1.0"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "F4"],
+ "rows": ["D7", "E6", "B4", "B5", "D4"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B6",
+ "levels": 5
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [5, 5], "x": 9, "y": 0.25},
+ {"matrix": [5, 4], "x": 10, "y": 0.125},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0.125},
+ {"matrix": [5, 1], "x": 13, "y": 0.375},
+ {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [6, 5], "x": 9, "y": 1.25},
+ {"matrix": [6, 4], "x": 10, "y": 1.125},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1.125},
+ {"matrix": [6, 1], "x": 13, "y": 1.375},
+ {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"matrix": [7, 5], "x": 9, "y": 2.25},
+ {"matrix": [7, 4], "x": 10, "y": 2.125},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2.125},
+ {"matrix": [7, 1], "x": 13, "y": 2.375},
+ {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [4, 2], "x": 6.15, "y": 3.75},
+
+ {"matrix": [9, 2], "x": 7.85, "y": 3.75},
+ {"matrix": [8, 5], "x": 9, "y": 3.25},
+ {"matrix": [8, 4], "x": 10, "y": 3.125},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3.125},
+ {"matrix": [8, 1], "x": 13, "y": 3.375},
+ {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+ {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.375},
+ {"matrix": [4, 5], "x": 5.6, "y": 4.75},
+
+ {"matrix": [9, 5], "x": 8.4, "y": 4.75},
+ {"matrix": [9, 4], "x": 9.5, "y": 4.375},
+ {"matrix": [9, 3], "x": 10.5, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keebio/iris/rev1_led/rules.mk b/keyboards/keebio/iris/rev1_led/rules.mk
deleted file mode 100644
index 12e5a0674bb..00000000000
--- a/keyboards/keebio/iris/rev1_led/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json
index aa41d0ebffa..bbd6f97cf4a 100644
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -14,6 +14,7 @@
"levels": 5
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
diff --git a/keyboards/keebio/iris/rev2/rules.mk b/keyboards/keebio/iris/rev2/rules.mk
index 286733cc508..d7e69407a24 100644
--- a/keyboards/keebio/iris/rev2/rules.mk
+++ b/keyboards/keebio/iris/rev2/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json
index 39bf9dcfb5c..5014519408f 100644
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -44,6 +44,7 @@
"speaker": "C6"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/iris/rev3/rules.mk b/keyboards/keebio/iris/rev3/rules.mk
index 44c1c1fac3f..6f0bda4dcc0 100644
--- a/keyboards/keebio/iris/rev3/rules.mk
+++ b/keyboards/keebio/iris/rev3/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
ENCODER_ENABLE = yes
LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json
index cc01dab3ec6..6faf28ea447 100644
--- a/keyboards/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -44,6 +44,7 @@
"speaker": "C6"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"encoder": {
"right": {
diff --git a/keyboards/keebio/iris/rev4/rules.mk b/keyboards/keebio/iris/rev4/rules.mk
index 02da189f9ea..55a08a2117b 100644
--- a/keyboards/keebio/iris/rev4/rules.mk
+++ b/keyboards/keebio/iris/rev4/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
ENCODER_ENABLE = yes
LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json
deleted file mode 100644
index 4bb4554f7c0..00000000000
--- a/keyboards/keebio/iris/rev5/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
- "keyboard_name": "Iris Rev. 5a",
- "usb": {
- "pid": "0x5356",
- "device_version": "5.1.0"
- },
- "matrix_pins": {
- "cols": ["F1", "F4", "D3", "D2", "B7", "D4"],
- "rows": ["B1", "F0", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B2", "pin_b": "B3"}
- ]
- },
- "backlight": {
- "pin": "B5",
- "levels": 5,
- "default": {
- "brightness": 3
- }
- },
- "rgblight": {
- "led_count": 12,
- "split_count": [6, 6],
- "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
- },
- "default": {
- "val": 128
- }
- },
- "ws2812": {
- "pin": "D6"
- },
- "qmk_lufa_bootloader": {
- "esc_input": "B1",
- "esc_output": "F1",
- "led": "B0",
- "speaker": "C6"
- },
- "split": {
- "soft_serial_pin": "D0",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "F7", "pin_b": "F6"}
- ]
- }
- },
- "matrix_pins": {
- "right": {
- "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
- "rows": ["B1", "B2", "D2", "F1", "F4"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375},
- {"matrix": [0, 1], "x": 1, "y": 0.375},
- {"matrix": [0, 2], "x": 2, "y": 0.125},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.125},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
-
- {"matrix": [5, 5], "x": 9, "y": 0.25},
- {"matrix": [5, 4], "x": 10, "y": 0.125},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 2], "x": 12, "y": 0.125},
- {"matrix": [5, 1], "x": 13, "y": 0.375},
- {"matrix": [5, 0], "x": 14, "y": 0.375},
-
- {"matrix": [1, 0], "x": 0, "y": 1.375},
- {"matrix": [1, 1], "x": 1, "y": 1.375},
- {"matrix": [1, 2], "x": 2, "y": 1.125},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.125},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
-
- {"matrix": [6, 5], "x": 9, "y": 1.25},
- {"matrix": [6, 4], "x": 10, "y": 1.125},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1.125},
- {"matrix": [6, 1], "x": 13, "y": 1.375},
- {"matrix": [6, 0], "x": 14, "y": 1.375},
-
- {"matrix": [2, 0], "x": 0, "y": 2.375},
- {"matrix": [2, 1], "x": 1, "y": 2.375},
- {"matrix": [2, 2], "x": 2, "y": 2.125},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.125},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
-
- {"matrix": [7, 5], "x": 9, "y": 2.25},
- {"matrix": [7, 4], "x": 10, "y": 2.125},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 2], "x": 12, "y": 2.125},
- {"matrix": [7, 1], "x": 13, "y": 2.375},
- {"matrix": [7, 0], "x": 14, "y": 2.375},
-
- {"matrix": [3, 0], "x": 0, "y": 3.375},
- {"matrix": [3, 1], "x": 1, "y": 3.375},
- {"matrix": [3, 2], "x": 2, "y": 3.125},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3.125},
- {"matrix": [3, 5], "x": 5, "y": 3.25},
- {"matrix": [4, 5], "x": 6.15, "y": 3.75},
-
- {"matrix": [9, 5], "x": 7.85, "y": 3.75},
- {"matrix": [8, 5], "x": 9, "y": 3.25},
- {"matrix": [8, 4], "x": 10, "y": 3.125},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 2], "x": 12, "y": 3.125},
- {"matrix": [8, 1], "x": 13, "y": 3.375},
- {"matrix": [8, 0], "x": 14, "y": 3.375},
-
- {"matrix": [4, 2], "x": 3.5, "y": 4.25},
- {"matrix": [4, 3], "x": 4.5, "y": 4.375},
- {"matrix": [4, 4], "x": 5.6, "y": 4.75},
-
- {"matrix": [9, 4], "x": 8.4, "y": 4.75},
- {"matrix": [9, 3], "x": 9.5, "y": 4.375},
- {"matrix": [9, 2], "x": 10.5, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/keebio/iris/rev5/keyboard.json b/keyboards/keebio/iris/rev5/keyboard.json
new file mode 100644
index 00000000000..a1f97a78311
--- /dev/null
+++ b/keyboards/keebio/iris/rev5/keyboard.json
@@ -0,0 +1,153 @@
+{
+ "keyboard_name": "Iris Rev. 5a",
+ "usb": {
+ "pid": "0x5356",
+ "device_version": "5.1.0"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F1", "F4", "D3", "D2", "B7", "D4"],
+ "rows": ["B1", "F0", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "B3"}
+ ]
+ },
+ "backlight": {
+ "pin": "B5",
+ "levels": 5,
+ "default": {
+ "brightness": 3
+ }
+ },
+ "rgblight": {
+ "led_count": 12,
+ "split_count": [6, 6],
+ "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
+ },
+ "default": {
+ "val": 128
+ }
+ },
+ "ws2812": {
+ "pin": "D6"
+ },
+ "qmk_lufa_bootloader": {
+ "esc_input": "B1",
+ "esc_output": "F1",
+ "led": "B0",
+ "speaker": "C6"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "F7", "pin_b": "F6"}
+ ]
+ }
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["D4", "D7", "D3", "B7", "F0", "B3"],
+ "rows": ["B1", "B2", "D2", "F1", "F4"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [5, 5], "x": 9, "y": 0.25},
+ {"matrix": [5, 4], "x": 10, "y": 0.125},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0.125},
+ {"matrix": [5, 1], "x": 13, "y": 0.375},
+ {"matrix": [5, 0], "x": 14, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [6, 5], "x": 9, "y": 1.25},
+ {"matrix": [6, 4], "x": 10, "y": 1.125},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1.125},
+ {"matrix": [6, 1], "x": 13, "y": 1.375},
+ {"matrix": [6, 0], "x": 14, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"matrix": [7, 5], "x": 9, "y": 2.25},
+ {"matrix": [7, 4], "x": 10, "y": 2.125},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2.125},
+ {"matrix": [7, 1], "x": 13, "y": 2.375},
+ {"matrix": [7, 0], "x": 14, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [4, 5], "x": 6.15, "y": 3.75},
+
+ {"matrix": [9, 5], "x": 7.85, "y": 3.75},
+ {"matrix": [8, 5], "x": 9, "y": 3.25},
+ {"matrix": [8, 4], "x": 10, "y": 3.125},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3.125},
+ {"matrix": [8, 1], "x": 13, "y": 3.375},
+ {"matrix": [8, 0], "x": 14, "y": 3.375},
+
+ {"matrix": [4, 2], "x": 3.5, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4.375},
+ {"matrix": [4, 4], "x": 5.6, "y": 4.75},
+
+ {"matrix": [9, 4], "x": 8.4, "y": 4.75},
+ {"matrix": [9, 3], "x": 9.5, "y": 4.375},
+ {"matrix": [9, 2], "x": 10.5, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keebio/iris/rev5/rules.mk b/keyboards/keebio/iris/rev5/rules.mk
deleted file mode 100644
index 8859d8f69ca..00000000000
--- a/keyboards/keebio/iris/rev5/rules.mk
+++ /dev/null
@@ -1,14 +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
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json
index 8563ba64ab7..837bb4e0d06 100644
--- a/keyboards/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -84,6 +84,7 @@
}
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"matrix_pins": {
"right": {
diff --git a/keyboards/keebio/iris/rev6/rules.mk b/keyboards/keebio/iris/rev6/rules.mk
index 5cdaba9bcec..69d1764838d 100644
--- a/keyboards/keebio/iris/rev6/rules.mk
+++ b/keyboards/keebio/iris/rev6/rules.mk
@@ -10,7 +10,6 @@ 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
-SPLIT_KEYBOARD = yes
ENCODER_ENABLE = yes
RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json
index a7b81f9224b..a3f25202ce3 100644
--- a/keyboards/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -83,6 +83,7 @@
}
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"matrix_pins": {
"right": {
diff --git a/keyboards/keebio/iris/rev7/rules.mk b/keyboards/keebio/iris/rev7/rules.mk
index 5cdaba9bcec..69d1764838d 100644
--- a/keyboards/keebio/iris/rev7/rules.mk
+++ b/keyboards/keebio/iris/rev7/rules.mk
@@ -10,7 +10,6 @@ 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
-SPLIT_KEYBOARD = yes
ENCODER_ENABLE = yes
RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index da7fbfb40f5..939a7723485 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -42,6 +42,7 @@
"pin": "E6"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"encoder": {
"right": {
diff --git a/keyboards/keebio/kbo5000/rules.mk b/keyboards/keebio/kbo5000/rules.mk
index 68661bd7dcf..c6a1e8d0d17 100644
--- a/keyboards/keebio/kbo5000/rules.mk
+++ b/keyboards/keebio/kbo5000/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
LTO_ENABLE = yes
-SPLIT_KEYBOARD = yes
DEFAULT_FOLDER = keebio/kbo5000/rev1
diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json
index d7cbab9f451..29ae8be8cb5 100644
--- a/keyboards/keebio/levinson/info.json
+++ b/keyboards/keebio/levinson/info.json
@@ -6,6 +6,9 @@
"usb": {
"vid": "0xCB10"
},
+ "split": {
+ "enabled": true
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x12"]
diff --git a/keyboards/keebio/levinson/rules.mk b/keyboards/keebio/levinson/rules.mk
index 249f8878816..eab321ff014 100644
--- a/keyboards/keebio/levinson/rules.mk
+++ b/keyboards/keebio/levinson/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = keebio/levinson/rev2
diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/info.json
deleted file mode 100644
index cd729aa87b7..00000000000
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
- "keyboard_name": "Nyquist Rev. 1",
- "usb": {
- "pid": "0x1156",
- "device_version": "1.0.0"
- },
- "matrix_pins": {
- "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D4", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 12,
- "split_count": [6, 6]
- },
- "ws2812": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_ortho_5x12"
- },
- "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": [4, 5], "x": 7, "y": 0},
- {"matrix": [4, 4], "x": 8, "y": 0},
- {"matrix": [4, 3], "x": 9, "y": 0},
- {"matrix": [4, 2], "x": 10, "y": 0},
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [4, 0], "x": 12, "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": [5, 5], "x": 7, "y": 1},
- {"matrix": [5, 4], "x": 8, "y": 1},
- {"matrix": [5, 3], "x": 9, "y": 1},
- {"matrix": [5, 2], "x": 10, "y": 1},
- {"matrix": [5, 1], "x": 11, "y": 1},
- {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2},
- {"matrix": [6, 4], "x": 8, "y": 2},
- {"matrix": [6, 3], "x": 9, "y": 2},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 1], "x": 11, "y": 2},
- {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 3},
- {"matrix": [7, 4], "x": 8, "y": 3},
- {"matrix": [7, 3], "x": 9, "y": 3},
- {"matrix": [7, 2], "x": 10, "y": 3},
- {"matrix": [7, 1], "x": 11, "y": 3},
- {"matrix": [7, 0], "x": 12, "y": 3}
- ]
- },
- "LAYOUT_ortho_5x12": {
- "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": [5, 5], "x": 7, "y": 0},
- {"matrix": [5, 4], "x": 8, "y": 0},
- {"matrix": [5, 3], "x": 9, "y": 0},
- {"matrix": [5, 2], "x": 10, "y": 0},
- {"matrix": [5, 1], "x": 11, "y": 0},
- {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 1},
- {"matrix": [6, 4], "x": 8, "y": 1},
- {"matrix": [6, 3], "x": 9, "y": 1},
- {"matrix": [6, 2], "x": 10, "y": 1},
- {"matrix": [6, 1], "x": 11, "y": 1},
- {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 2},
- {"matrix": [7, 4], "x": 8, "y": 2},
- {"matrix": [7, 3], "x": 9, "y": 2},
- {"matrix": [7, 2], "x": 10, "y": 2},
- {"matrix": [7, 1], "x": 11, "y": 2},
- {"matrix": [7, 0], "x": 12, "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": [8, 5], "x": 7, "y": 3},
- {"matrix": [8, 4], "x": 8, "y": 3},
- {"matrix": [8, 3], "x": 9, "y": 3},
- {"matrix": [8, 2], "x": 10, "y": 3},
- {"matrix": [8, 1], "x": 11, "y": 3},
- {"matrix": [8, 0], "x": 12, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
-
- {"matrix": [9, 5], "x": 7, "y": 4},
- {"matrix": [9, 4], "x": 8, "y": 4},
- {"matrix": [9, 3], "x": 9, "y": 4},
- {"matrix": [9, 2], "x": 10, "y": 4},
- {"matrix": [9, 1], "x": 11, "y": 4},
- {"matrix": [9, 0], "x": 12, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/keebio/nyquist/rev1/keyboard.json b/keyboards/keebio/nyquist/rev1/keyboard.json
new file mode 100644
index 00000000000..717b49e9713
--- /dev/null
+++ b/keyboards/keebio/nyquist/rev1/keyboard.json
@@ -0,0 +1,170 @@
+{
+ "keyboard_name": "Nyquist Rev. 1",
+ "usb": {
+ "pid": "0x1156",
+ "device_version": "1.0.0"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 12,
+ "split_count": [6, 6]
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_5x12"
+ },
+ "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": [4, 5], "x": 7, "y": 0},
+ {"matrix": [4, 4], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [4, 0], "x": 12, "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": [5, 5], "x": 7, "y": 1},
+ {"matrix": [5, 4], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1},
+ {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2},
+ {"matrix": [6, 4], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2},
+ {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 3},
+ {"matrix": [7, 4], "x": 8, "y": 3},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 0], "x": 12, "y": 3}
+ ]
+ },
+ "LAYOUT_ortho_5x12": {
+ "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": [5, 5], "x": 7, "y": 0},
+ {"matrix": [5, 4], "x": 8, "y": 0},
+ {"matrix": [5, 3], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 1},
+ {"matrix": [6, 4], "x": 8, "y": 1},
+ {"matrix": [6, 3], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 2},
+ {"matrix": [7, 4], "x": 8, "y": 2},
+ {"matrix": [7, 3], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 0], "x": 12, "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": [8, 5], "x": 7, "y": 3},
+ {"matrix": [8, 4], "x": 8, "y": 3},
+ {"matrix": [8, 3], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 1], "x": 11, "y": 3},
+ {"matrix": [8, 0], "x": 12, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [9, 5], "x": 7, "y": 4},
+ {"matrix": [9, 4], "x": 8, "y": 4},
+ {"matrix": [9, 3], "x": 9, "y": 4},
+ {"matrix": [9, 2], "x": 10, "y": 4},
+ {"matrix": [9, 1], "x": 11, "y": 4},
+ {"matrix": [9, 0], "x": 12, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keebio/nyquist/rev1/rules.mk b/keyboards/keebio/nyquist/rev1/rules.mk
deleted file mode 100644
index 714a247e2bd..00000000000
--- a/keyboards/keebio/nyquist/rev1/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/info.json
deleted file mode 100644
index f6b80cb9460..00000000000
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
- "keyboard_name": "Nyquist Rev. 2",
- "usb": {
- "pid": "0x2156",
- "device_version": "2.0.0"
- },
- "matrix_pins": {
- "cols": ["D2", "F5", "F6", "F7", "B1", "B3"],
- "rows": ["D4", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B6",
- "levels": 7
- },
- "rgblight": {
- "led_count": 12,
- "split_count": [6, 6]
- },
- "ws2812": {
- "pin": "D3"
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_ortho_5x12"
- },
- "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": [4, 5], "x": 7, "y": 0},
- {"matrix": [4, 4], "x": 8, "y": 0},
- {"matrix": [4, 3], "x": 9, "y": 0},
- {"matrix": [4, 2], "x": 10, "y": 0},
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [4, 0], "x": 12, "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": [5, 5], "x": 7, "y": 1},
- {"matrix": [5, 4], "x": 8, "y": 1},
- {"matrix": [5, 3], "x": 9, "y": 1},
- {"matrix": [5, 2], "x": 10, "y": 1},
- {"matrix": [5, 1], "x": 11, "y": 1},
- {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2},
- {"matrix": [6, 4], "x": 8, "y": 2},
- {"matrix": [6, 3], "x": 9, "y": 2},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 1], "x": 11, "y": 2},
- {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 3},
- {"matrix": [7, 4], "x": 8, "y": 3},
- {"matrix": [7, 3], "x": 9, "y": 3},
- {"matrix": [7, 2], "x": 10, "y": 3},
- {"matrix": [7, 1], "x": 11, "y": 3},
- {"matrix": [7, 0], "x": 12, "y": 3}
- ]
- },
- "LAYOUT_ortho_5x12": {
- "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": [5, 5], "x": 7, "y": 0},
- {"matrix": [5, 4], "x": 8, "y": 0},
- {"matrix": [5, 3], "x": 9, "y": 0},
- {"matrix": [5, 2], "x": 10, "y": 0},
- {"matrix": [5, 1], "x": 11, "y": 0},
- {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 1},
- {"matrix": [6, 4], "x": 8, "y": 1},
- {"matrix": [6, 3], "x": 9, "y": 1},
- {"matrix": [6, 2], "x": 10, "y": 1},
- {"matrix": [6, 1], "x": 11, "y": 1},
- {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 2},
- {"matrix": [7, 4], "x": 8, "y": 2},
- {"matrix": [7, 3], "x": 9, "y": 2},
- {"matrix": [7, 2], "x": 10, "y": 2},
- {"matrix": [7, 1], "x": 11, "y": 2},
- {"matrix": [7, 0], "x": 12, "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": [8, 5], "x": 7, "y": 3},
- {"matrix": [8, 4], "x": 8, "y": 3},
- {"matrix": [8, 3], "x": 9, "y": 3},
- {"matrix": [8, 2], "x": 10, "y": 3},
- {"matrix": [8, 1], "x": 11, "y": 3},
- {"matrix": [8, 0], "x": 12, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
-
- {"matrix": [9, 5], "x": 7, "y": 4},
- {"matrix": [9, 4], "x": 8, "y": 4},
- {"matrix": [9, 3], "x": 9, "y": 4},
- {"matrix": [9, 2], "x": 10, "y": 4},
- {"matrix": [9, 1], "x": 11, "y": 4},
- {"matrix": [9, 0], "x": 12, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/keebio/nyquist/rev2/keyboard.json b/keyboards/keebio/nyquist/rev2/keyboard.json
new file mode 100644
index 00000000000..435cdd189fc
--- /dev/null
+++ b/keyboards/keebio/nyquist/rev2/keyboard.json
@@ -0,0 +1,176 @@
+{
+ "keyboard_name": "Nyquist Rev. 2",
+ "usb": {
+ "pid": "0x2156",
+ "device_version": "2.0.0"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["D2", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B6",
+ "levels": 7
+ },
+ "rgblight": {
+ "led_count": 12,
+ "split_count": [6, 6]
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_5x12"
+ },
+ "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": [4, 5], "x": 7, "y": 0},
+ {"matrix": [4, 4], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [4, 0], "x": 12, "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": [5, 5], "x": 7, "y": 1},
+ {"matrix": [5, 4], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1},
+ {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2},
+ {"matrix": [6, 4], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2},
+ {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 3},
+ {"matrix": [7, 4], "x": 8, "y": 3},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 0], "x": 12, "y": 3}
+ ]
+ },
+ "LAYOUT_ortho_5x12": {
+ "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": [5, 5], "x": 7, "y": 0},
+ {"matrix": [5, 4], "x": 8, "y": 0},
+ {"matrix": [5, 3], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 1},
+ {"matrix": [6, 4], "x": 8, "y": 1},
+ {"matrix": [6, 3], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 0], "x": 12, "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": [7, 5], "x": 7, "y": 2},
+ {"matrix": [7, 4], "x": 8, "y": 2},
+ {"matrix": [7, 3], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 0], "x": 12, "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": [8, 5], "x": 7, "y": 3},
+ {"matrix": [8, 4], "x": 8, "y": 3},
+ {"matrix": [8, 3], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 1], "x": 11, "y": 3},
+ {"matrix": [8, 0], "x": 12, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [9, 5], "x": 7, "y": 4},
+ {"matrix": [9, 4], "x": 8, "y": 4},
+ {"matrix": [9, 3], "x": 9, "y": 4},
+ {"matrix": [9, 2], "x": 10, "y": 4},
+ {"matrix": [9, 1], "x": 11, "y": 4},
+ {"matrix": [9, 0], "x": 12, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keebio/nyquist/rev2/rules.mk b/keyboards/keebio/nyquist/rev2/rules.mk
deleted file mode 100644
index 83432f0b5e6..00000000000
--- a/keyboards/keebio/nyquist/rev2/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/info.json
deleted file mode 100644
index 9b3cc6d15aa..00000000000
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
- "keyboard_name": "Nyquist Rev. 3",
- "usb": {
- "pid": "0x3156",
- "device_version": "3.0.0"
- },
- "matrix_pins": {
- "cols": ["F1", "F4", "B7", "D2", "D3", "D4"],
- "rows": ["F0", "F5", "D7", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B5",
- "levels": 7
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 12,
- "split_count": [6, 6],
- "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": {
- "pin": "B4"
- },
- "processor": "atmega32u4",
- "bootloader": "qmk-dfu",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_ortho_5x12"
- },
- "layouts": {
- "LAYOUT_ortho_5x12": {
- "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": [5, 0], "x": 7, "y": 0},
- {"matrix": [5, 1], "x": 8, "y": 0},
- {"matrix": [5, 2], "x": 9, "y": 0},
- {"matrix": [5, 3], "x": 10, "y": 0},
- {"matrix": [5, 4], "x": 11, "y": 0},
- {"matrix": [5, 5], "x": 12, "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": [6, 0], "x": 7, "y": 1},
- {"matrix": [6, 1], "x": 8, "y": 1},
- {"matrix": [6, 2], "x": 9, "y": 1},
- {"matrix": [6, 3], "x": 10, "y": 1},
- {"matrix": [6, 4], "x": 11, "y": 1},
- {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
- {"matrix": [7, 1], "x": 8, "y": 2},
- {"matrix": [7, 2], "x": 9, "y": 2},
- {"matrix": [7, 3], "x": 10, "y": 2},
- {"matrix": [7, 4], "x": 11, "y": 2},
- {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
- {"matrix": [8, 1], "x": 8, "y": 3},
- {"matrix": [8, 2], "x": 9, "y": 3},
- {"matrix": [8, 3], "x": 10, "y": 3},
- {"matrix": [8, 4], "x": 11, "y": 3},
- {"matrix": [8, 5], "x": 12, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
-
- {"matrix": [9, 0], "x": 7, "y": 4},
- {"matrix": [9, 1], "x": 8, "y": 4},
- {"matrix": [9, 2], "x": 9, "y": 4},
- {"matrix": [9, 3], "x": 10, "y": 4},
- {"matrix": [9, 4], "x": 11, "y": 4},
- {"matrix": [9, 5], "x": 12, "y": 4}
- ]
- },
- "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": [5, 0], "x": 7, "y": 0},
- {"matrix": [5, 1], "x": 8, "y": 0},
- {"matrix": [5, 2], "x": 9, "y": 0},
- {"matrix": [5, 3], "x": 10, "y": 0},
- {"matrix": [5, 4], "x": 11, "y": 0},
- {"matrix": [5, 5], "x": 12, "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": [6, 0], "x": 7, "y": 1},
- {"matrix": [6, 1], "x": 8, "y": 1},
- {"matrix": [6, 2], "x": 9, "y": 1},
- {"matrix": [6, 3], "x": 10, "y": 1},
- {"matrix": [6, 4], "x": 11, "y": 1},
- {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
- {"matrix": [7, 1], "x": 8, "y": 2},
- {"matrix": [7, 2], "x": 9, "y": 2},
- {"matrix": [7, 3], "x": 10, "y": 2},
- {"matrix": [7, 4], "x": 11, "y": 2},
- {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
- {"matrix": [8, 1], "x": 8, "y": 3},
- {"matrix": [8, 2], "x": 9, "y": 3},
- {"matrix": [8, 3], "x": 10, "y": 3},
- {"matrix": [8, 4], "x": 11, "y": 3},
- {"matrix": [8, 5], "x": 12, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/keebio/nyquist/rev3/keyboard.json b/keyboards/keebio/nyquist/rev3/keyboard.json
new file mode 100644
index 00000000000..80e5a10a17a
--- /dev/null
+++ b/keyboards/keebio/nyquist/rev3/keyboard.json
@@ -0,0 +1,188 @@
+{
+ "keyboard_name": "Nyquist Rev. 3",
+ "usb": {
+ "pid": "0x3156",
+ "device_version": "3.0.0"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F1", "F4", "B7", "D2", "D3", "D4"],
+ "rows": ["F0", "F5", "D7", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B5",
+ "levels": 7
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 12,
+ "split_count": [6, 6],
+ "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": {
+ "pin": "B4"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_5x12"
+ },
+ "layouts": {
+ "LAYOUT_ortho_5x12": {
+ "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": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "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": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
+ {"matrix": [7, 1], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
+ {"matrix": [8, 1], "x": 8, "y": 3},
+ {"matrix": [8, 2], "x": 9, "y": 3},
+ {"matrix": [8, 3], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 5], "x": 12, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [9, 0], "x": 7, "y": 4},
+ {"matrix": [9, 1], "x": 8, "y": 4},
+ {"matrix": [9, 2], "x": 9, "y": 4},
+ {"matrix": [9, 3], "x": 10, "y": 4},
+ {"matrix": [9, 4], "x": 11, "y": 4},
+ {"matrix": [9, 5], "x": 12, "y": 4}
+ ]
+ },
+ "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": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "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": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "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": [7, 0], "x": 7, "y": 2},
+ {"matrix": [7, 1], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "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": [8, 0], "x": 7, "y": 3},
+ {"matrix": [8, 1], "x": 8, "y": 3},
+ {"matrix": [8, 2], "x": 9, "y": 3},
+ {"matrix": [8, 3], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 5], "x": 12, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keebio/nyquist/rev3/rules.mk b/keyboards/keebio/nyquist/rev3/rules.mk
deleted file mode 100644
index 83432f0b5e6..00000000000
--- a/keyboards/keebio/nyquist/rev3/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/keebio/quefrency/info.json b/keyboards/keebio/quefrency/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/keebio/quefrency/info.json
@@ -0,0 +1,5 @@
+{
+ "split": {
+ "enabled": true
+ }
+}
diff --git a/keyboards/keebio/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk
index cd165afef28..33c64f3d654 100644
--- a/keyboards/keebio/quefrency/rules.mk
+++ b/keyboards/keebio/quefrency/rules.mk
@@ -8,7 +8,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = keebio/quefrency/rev1
LTO_ENABLE = yes
diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json
index 55fcae83873..22a5de3b931 100644
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@@ -38,6 +38,7 @@
"pin": "D3"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/keebio/rorschach/rules.mk b/keyboards/keebio/rorschach/rules.mk
index baf3beba146..59170f1516a 100644
--- a/keyboards/keebio/rorschach/rules.mk
+++ b/keyboards/keebio/rorschach/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = keebio/rorschach/rev1
diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json
index 1fadcce126f..8b1063ea98c 100644
--- a/keyboards/keebio/viterbi/info.json
+++ b/keyboards/keebio/viterbi/info.json
@@ -5,6 +5,9 @@
"usb": {
"vid": "0xCB10"
},
+ "split": {
+ "enabled": true
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_5x14"]
diff --git a/keyboards/keebio/viterbi/rules.mk b/keyboards/keebio/viterbi/rules.mk
index 2008e63b003..5192d5ba728 100644
--- a/keyboards/keebio/viterbi/rules.mk
+++ b/keyboards/keebio/viterbi/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = keebio/viterbi/rev2
diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c
index a829c118922..93dab79e7a1 100644
--- a/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_tkl_ansi(
- KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP,
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_tkl_ansi(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[WIN_BASE] = LAYOUT_tkl_ansi(
- KC_ESC, 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_PSCR, _______, BL_STEP,
+ KC_ESC, 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_PSCR, _______, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_tkl_ansi(
- _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG,
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c
index e17d67eb718..f819b4fc031 100644
--- a/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c
@@ -26,7 +26,7 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_tkl_ansi(
- KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, BL_STEP,
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_tkl_ansi(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[WIN_BASE] = LAYOUT_tkl_ansi(
- KC_ESC, 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_PSCR, KC_CRTA, BL_STEP,
+ KC_ESC, 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_PSCR, KC_CRTA, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@@ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_tkl_ansi(
- _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG,
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c
index a829c118922..93dab79e7a1 100644
--- a/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_tkl_ansi(
- KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP,
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_tkl_ansi(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[WIN_BASE] = LAYOUT_tkl_ansi(
- KC_ESC, 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_PSCR, _______, BL_STEP,
+ KC_ESC, 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_PSCR, _______, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_tkl_ansi(
- _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG,
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
diff --git a/keyboards/keychron/c1_pro/ansi/white/white.c b/keyboards/keychron/c1_pro/ansi/white/white.c
index 2b41845c9b5..9009225b3b2 100644
--- a/keyboards/keychron/c1_pro/ansi/white/white.c
+++ b/keyboards/keychron/c1_pro/ansi/white/white.c
@@ -128,7 +128,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
return false;
}
switch (keycode) {
- case BL_TOGG:
+ case LM_TOGG:
if (record->event.pressed) {
switch (led_matrix_get_flags()) {
case LED_FLAG_ALL: {
diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c
index 70934e122e3..b8c26b19397 100644
--- a/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT(
- KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP,
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
[MAC_FN] = LAYOUT(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
[WIN_BASE] = LAYOUT(
- KC_ESC, 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_PSCR, KC_NO, BL_STEP,
+ KC_ESC, 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_PSCR, KC_NO, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
[WIN_FN] = LAYOUT(
- _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG,
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
};
diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c
index 09002c3d7a4..c99b5bc4916 100644
--- a/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c
@@ -26,7 +26,7 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT(
- KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, BL_STEP,
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
@@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
[MAC_FN] = LAYOUT(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
[WIN_BASE] = LAYOUT(
- KC_ESC, 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_PSCR, KC_CRTA, BL_STEP,
+ KC_ESC, 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_PSCR, KC_CRTA, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
@@ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
[WIN_FN] = LAYOUT(
- _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG,
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
};
diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c
index 547521e099b..a162e3d3a5e 100644
--- a/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT(
- KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP,
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
@@ -36,15 +36,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
[MAC_FN] = LAYOUT(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
[WIN_BASE] = LAYOUT(
- KC_ESC, 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_PSCR, KC_NO, BL_STEP,
+ KC_ESC, 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_PSCR, KC_NO, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
@@ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
[WIN_FN] = LAYOUT(
- _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG,
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
};
diff --git a/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c
index 00dc1c07793..1ee03394298 100644
--- a/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ enum layers{
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_75_ansi(
- KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, BL_STEP,
+ KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_75_ansi(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[WIN_BASE] = LAYOUT_75_ansi(
- KC_ESC, 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_PSCR, KC_DEL, BL_STEP,
+ KC_ESC, 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_PSCR, KC_DEL, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_75_ansi(
- _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG,
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
diff --git a/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c
index baced4f97c7..cf080071764 100644
--- a/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c
@@ -28,7 +28,7 @@ enum layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_75_ansi(
- KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, BL_STEP,
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
@@ -36,15 +36,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_75_ansi(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[WIN_BASE] = LAYOUT_75_ansi(
- KC_ESC, 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_PSCR, KC_DEL, BL_STEP,
+ KC_ESC, 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_PSCR, KC_DEL, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
@@ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_75_ansi(
- _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG,
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
diff --git a/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c
index 10d2e08aef3..a515205b3a0 100644
--- a/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c
@@ -30,7 +30,7 @@ enum layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_75_ansi(
- KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, BL_STEP,
+ KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
@@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[MAC_FN] = LAYOUT_75_ansi(
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[WIN_BASE] = LAYOUT_75_ansi(
- KC_ESC, 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_PSCR, KC_DEL, BL_STEP,
+ KC_ESC, 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_PSCR, KC_DEL, LM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME,
@@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[WIN_FN] = LAYOUT_75_ansi(
- _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG,
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
diff --git a/keyboards/keychron/s1/s1.c b/keyboards/keychron/s1/s1.c
index 2f1b905505f..51bc0596c4a 100644
--- a/keyboards/keychron/s1/s1.c
+++ b/keyboards/keychron/s1/s1.c
@@ -78,7 +78,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (!process_record_user(keycode, record)) { return false; }
switch (keycode) {
#ifdef LED_MATRIX_ENABLE
- case BL_TOGG:
+ case LM_TOGG:
if (record->event.pressed) {
switch (led_matrix_get_flags()) {
case LED_FLAG_ALL: {
diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json
deleted file mode 100644
index 3e47764d5eb..00000000000
--- a/keyboards/keyprez/bison/info.json
+++ /dev/null
@@ -1,351 +0,0 @@
-{
- "keyboard_name": "bison",
- "manufacturer": "csandven",
- "url": "",
- "maintainer": "Christian Sandven",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D3", "E6", "B2", "B4", "D4", "F6", "F5", "F4"],
- "rows": ["D2", "F7", "B1", "B3", "D7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B6", "pin_b": "B5"}
- ]
- },
- "split": {
- "soft_serial_pin": "D0",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "B5", "pin_b": "B6"}
- ]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 7], "x": 0, "y": 0},
- {"matrix": [0, 6], "x": 1, "y": 0},
- {"matrix": [0, 5], "x": 2, "y": 0},
- {"matrix": [0, 4], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
- {"matrix": [0, 1], "x": 6, "y": 0},
- {"matrix": [0, 0], "x": 7, "y": 0},
-
- {"matrix": [5, 0], "x": 10, "y": 0},
- {"matrix": [5, 1], "x": 11, "y": 0},
- {"matrix": [5, 2], "x": 12, "y": 0},
- {"matrix": [5, 3], "x": 13, "y": 0},
- {"matrix": [5, 4], "x": 14, "y": 0},
- {"matrix": [5, 5], "x": 15, "y": 0},
- {"matrix": [5, 6], "x": 16, "y": 0},
- {"matrix": [5, 7], "x": 17, "y": 0},
-
- {"matrix": [1, 7], "x": 0, "y": 1},
- {"matrix": [1, 6], "x": 1, "y": 1},
- {"matrix": [1, 5], "x": 2, "y": 1},
- {"matrix": [1, 4], "x": 3, "y": 1},
- {"matrix": [1, 3], "x": 4, "y": 1},
- {"matrix": [1, 2], "x": 5, "y": 1},
- {"matrix": [1, 1], "x": 6, "y": 1},
- {"matrix": [1, 0], "x": 7, "y": 1},
-
- {"matrix": [6, 0], "x": 10, "y": 1},
- {"matrix": [6, 1], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1},
- {"matrix": [6, 3], "x": 13, "y": 1},
- {"matrix": [6, 4], "x": 14, "y": 1},
- {"matrix": [6, 5], "x": 15, "y": 1},
- {"matrix": [6, 6], "x": 16, "y": 1},
- {"matrix": [6, 7], "x": 17, "y": 1},
-
- {"matrix": [2, 7], "x": 0, "y": 2},
- {"matrix": [2, 6], "x": 1, "y": 2},
- {"matrix": [2, 5], "x": 2, "y": 2},
- {"matrix": [2, 4], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 2], "x": 5, "y": 2},
- {"matrix": [2, 1], "x": 6, "y": 2},
- {"matrix": [2, 0], "x": 7, "y": 2},
-
- {"matrix": [7, 0], "x": 10, "y": 2},
- {"matrix": [7, 1], "x": 11, "y": 2},
- {"matrix": [7, 2], "x": 12, "y": 2},
- {"matrix": [7, 3], "x": 13, "y": 2},
- {"matrix": [7, 4], "x": 14, "y": 2},
- {"matrix": [7, 5], "x": 15, "y": 2},
- {"matrix": [7, 6], "x": 16, "y": 2},
- {"matrix": [7, 7], "x": 17, "y": 2},
-
- {"matrix": [3, 7], "x": 0, "y": 3},
- {"matrix": [3, 6], "x": 1, "y": 3},
- {"matrix": [3, 5], "x": 2, "y": 3},
- {"matrix": [3, 4], "x": 3, "y": 3},
- {"matrix": [3, 3], "x": 4, "y": 3},
- {"matrix": [3, 2], "x": 5, "y": 3},
- {"matrix": [3, 1], "x": 6, "y": 3},
- {"matrix": [3, 0], "x": 7, "y": 3},
- {"matrix": [4, 4], "x": 8, "y": 3},
-
- {"matrix": [9, 4], "x": 9, "y": 3},
- {"matrix": [8, 0], "x": 10, "y": 3},
- {"matrix": [8, 1], "x": 11, "y": 3},
- {"matrix": [8, 2], "x": 12, "y": 3},
- {"matrix": [8, 3], "x": 13, "y": 3},
- {"matrix": [8, 4], "x": 14, "y": 3},
- {"matrix": [8, 5], "x": 15, "y": 3},
- {"matrix": [8, 6], "x": 16, "y": 3},
- {"matrix": [8, 7], "x": 17, "y": 3},
-
- {"matrix": [4, 3], "x": 3.75, "y": 4},
- {"matrix": [4, 2], "x": 4.75, "y": 4},
- {"matrix": [4, 1], "x": 5.75, "y": 4},
- {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
-
- {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
- {"matrix": [9, 1], "x": 11.25, "y": 4},
- {"matrix": [9, 2], "x": 12.25, "y": 4},
- {"matrix": [9, 3], "x": 13.25, "y": 4}
- ]
- },
- "LAYOUT_6_8": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0},
- {"matrix": [0, 4], "x": 1, "y": 0},
- {"matrix": [0, 3], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 1], "x": 4, "y": 0},
- {"matrix": [0, 0], "x": 5, "y": 0},
-
- {"matrix": [5, 0], "x": 8, "y": 0},
- {"matrix": [5, 1], "x": 9, "y": 0},
- {"matrix": [5, 2], "x": 10, "y": 0},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0},
- {"matrix": [5, 5], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [5, 7], "x": 15, "y": 0},
-
- {"matrix": [1, 5], "x": 0, "y": 1},
- {"matrix": [1, 4], "x": 1, "y": 1},
- {"matrix": [1, 3], "x": 2, "y": 1},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 1], "x": 4, "y": 1},
- {"matrix": [1, 0], "x": 5, "y": 1},
-
- {"matrix": [6, 0], "x": 8, "y": 1},
- {"matrix": [6, 1], "x": 9, "y": 1},
- {"matrix": [6, 2], "x": 10, "y": 1},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1},
- {"matrix": [6, 5], "x": 13, "y": 1},
- {"matrix": [6, 6], "x": 14, "y": 1},
- {"matrix": [6, 7], "x": 15, "y": 1},
-
- {"matrix": [2, 5], "x": 0, "y": 2},
- {"matrix": [2, 4], "x": 1, "y": 2},
- {"matrix": [2, 3], "x": 2, "y": 2},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 1], "x": 4, "y": 2},
- {"matrix": [2, 0], "x": 5, "y": 2},
-
- {"matrix": [7, 0], "x": 8, "y": 2},
- {"matrix": [7, 1], "x": 9, "y": 2},
- {"matrix": [7, 2], "x": 10, "y": 2},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2},
- {"matrix": [7, 5], "x": 13, "y": 2},
- {"matrix": [7, 6], "x": 14, "y": 2},
- {"matrix": [7, 7], "x": 15, "y": 2},
-
- {"matrix": [3, 5], "x": 0, "y": 3},
- {"matrix": [3, 4], "x": 1, "y": 3},
- {"matrix": [3, 3], "x": 2, "y": 3},
- {"matrix": [3, 2], "x": 3, "y": 3},
- {"matrix": [3, 1], "x": 4, "y": 3},
- {"matrix": [3, 0], "x": 5, "y": 3},
- {"matrix": [4, 4], "x": 6, "y": 3},
-
- {"matrix": [9, 4], "x": 7, "y": 3},
- {"matrix": [8, 0], "x": 8, "y": 3},
- {"matrix": [8, 1], "x": 9, "y": 3},
- {"matrix": [8, 2], "x": 10, "y": 3},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 5], "x": 13, "y": 3},
- {"matrix": [8, 6], "x": 14, "y": 3},
- {"matrix": [8, 7], "x": 15, "y": 3},
-
- {"matrix": [4, 3], "x": 1.75, "y": 4},
- {"matrix": [4, 2], "x": 2.75, "y": 4},
- {"matrix": [4, 1], "x": 3.75, "y": 4},
- {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
-
- {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
- {"matrix": [9, 1], "x": 9.25, "y": 4},
- {"matrix": [9, 2], "x": 10.25, "y": 4},
- {"matrix": [9, 3], "x": 11.25, "y": 4}
- ]
- },
- "LAYOUT_8_6": {
- "layout": [
- {"matrix": [0, 7], "x": 0, "y": 0},
- {"matrix": [0, 6], "x": 1, "y": 0},
- {"matrix": [0, 5], "x": 2, "y": 0},
- {"matrix": [0, 4], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
- {"matrix": [0, 1], "x": 6, "y": 0},
- {"matrix": [0, 0], "x": 7, "y": 0},
-
- {"matrix": [5, 0], "x": 10, "y": 0},
- {"matrix": [5, 1], "x": 11, "y": 0},
- {"matrix": [5, 2], "x": 12, "y": 0},
- {"matrix": [5, 3], "x": 13, "y": 0},
- {"matrix": [5, 4], "x": 14, "y": 0},
- {"matrix": [5, 5], "x": 15, "y": 0},
-
- {"matrix": [1, 7], "x": 0, "y": 1},
- {"matrix": [1, 6], "x": 1, "y": 1},
- {"matrix": [1, 5], "x": 2, "y": 1},
- {"matrix": [1, 4], "x": 3, "y": 1},
- {"matrix": [1, 3], "x": 4, "y": 1},
- {"matrix": [1, 2], "x": 5, "y": 1},
- {"matrix": [1, 1], "x": 6, "y": 1},
- {"matrix": [1, 0], "x": 7, "y": 1},
-
- {"matrix": [6, 0], "x": 10, "y": 1},
- {"matrix": [6, 1], "x": 11, "y": 1},
- {"matrix": [6, 2], "x": 12, "y": 1},
- {"matrix": [6, 3], "x": 13, "y": 1},
- {"matrix": [6, 4], "x": 14, "y": 1},
- {"matrix": [6, 5], "x": 15, "y": 1},
-
- {"matrix": [2, 7], "x": 0, "y": 2},
- {"matrix": [2, 6], "x": 1, "y": 2},
- {"matrix": [2, 5], "x": 2, "y": 2},
- {"matrix": [2, 4], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 2], "x": 5, "y": 2},
- {"matrix": [2, 1], "x": 6, "y": 2},
- {"matrix": [2, 0], "x": 7, "y": 2},
-
- {"matrix": [7, 0], "x": 10, "y": 2},
- {"matrix": [7, 1], "x": 11, "y": 2},
- {"matrix": [7, 2], "x": 12, "y": 2},
- {"matrix": [7, 3], "x": 13, "y": 2},
- {"matrix": [7, 4], "x": 14, "y": 2},
- {"matrix": [7, 5], "x": 15, "y": 2},
-
- {"matrix": [3, 7], "x": 0, "y": 3},
- {"matrix": [3, 6], "x": 1, "y": 3},
- {"matrix": [3, 5], "x": 2, "y": 3},
- {"matrix": [3, 4], "x": 3, "y": 3},
- {"matrix": [3, 3], "x": 4, "y": 3},
- {"matrix": [3, 2], "x": 5, "y": 3},
- {"matrix": [3, 1], "x": 6, "y": 3},
- {"matrix": [3, 0], "x": 7, "y": 3},
- {"matrix": [4, 4], "x": 8, "y": 3},
-
- {"matrix": [9, 4], "x": 9, "y": 3},
- {"matrix": [8, 0], "x": 10, "y": 3},
- {"matrix": [8, 1], "x": 11, "y": 3},
- {"matrix": [8, 2], "x": 12, "y": 3},
- {"matrix": [8, 3], "x": 13, "y": 3},
- {"matrix": [8, 4], "x": 14, "y": 3},
- {"matrix": [8, 5], "x": 15, "y": 3},
-
- {"matrix": [4, 3], "x": 3.75, "y": 4},
- {"matrix": [4, 2], "x": 4.75, "y": 4},
- {"matrix": [4, 1], "x": 5.75, "y": 4},
- {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
-
- {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
- {"matrix": [9, 1], "x": 11.25, "y": 4},
- {"matrix": [9, 2], "x": 12.25, "y": 4},
- {"matrix": [9, 3], "x": 13.25, "y": 4}
- ]
- },
- "LAYOUT_6_6": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0},
- {"matrix": [0, 4], "x": 1, "y": 0},
- {"matrix": [0, 3], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 1], "x": 4, "y": 0},
- {"matrix": [0, 0], "x": 5, "y": 0},
-
- {"matrix": [5, 0], "x": 8, "y": 0},
- {"matrix": [5, 1], "x": 9, "y": 0},
- {"matrix": [5, 2], "x": 10, "y": 0},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0},
- {"matrix": [5, 5], "x": 13, "y": 0},
-
- {"matrix": [1, 5], "x": 0, "y": 1},
- {"matrix": [1, 4], "x": 1, "y": 1},
- {"matrix": [1, 3], "x": 2, "y": 1},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 1], "x": 4, "y": 1},
- {"matrix": [1, 0], "x": 5, "y": 1},
-
- {"matrix": [6, 0], "x": 8, "y": 1},
- {"matrix": [6, 1], "x": 9, "y": 1},
- {"matrix": [6, 2], "x": 10, "y": 1},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1},
- {"matrix": [6, 5], "x": 13, "y": 1},
-
- {"matrix": [2, 5], "x": 0, "y": 2},
- {"matrix": [2, 4], "x": 1, "y": 2},
- {"matrix": [2, 3], "x": 2, "y": 2},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 1], "x": 4, "y": 2},
- {"matrix": [2, 0], "x": 5, "y": 2},
-
- {"matrix": [7, 0], "x": 8, "y": 2},
- {"matrix": [7, 1], "x": 9, "y": 2},
- {"matrix": [7, 2], "x": 10, "y": 2},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2},
- {"matrix": [7, 5], "x": 13, "y": 2},
-
- {"matrix": [3, 5], "x": 0, "y": 3},
- {"matrix": [3, 4], "x": 1, "y": 3},
- {"matrix": [3, 3], "x": 2, "y": 3},
- {"matrix": [3, 2], "x": 3, "y": 3},
- {"matrix": [3, 1], "x": 4, "y": 3},
- {"matrix": [3, 0], "x": 5, "y": 3},
- {"matrix": [4, 4], "x": 6, "y": 3},
-
- {"matrix": [9, 4], "x": 7, "y": 3},
- {"matrix": [8, 0], "x": 8, "y": 3},
- {"matrix": [8, 1], "x": 9, "y": 3},
- {"matrix": [8, 2], "x": 10, "y": 3},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 5], "x": 13, "y": 3},
-
- {"matrix": [4, 3], "x": 1.75, "y": 4},
- {"matrix": [4, 2], "x": 2.75, "y": 4},
- {"matrix": [4, 1], "x": 3.75, "y": 4},
- {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
-
- {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
- {"matrix": [9, 1], "x": 9.25, "y": 4},
- {"matrix": [9, 2], "x": 10.25, "y": 4},
- {"matrix": [9, 3], "x": 11.25, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/keyprez/bison/keyboard.json b/keyboards/keyprez/bison/keyboard.json
new file mode 100644
index 00000000000..462b9d4274c
--- /dev/null
+++ b/keyboards/keyprez/bison/keyboard.json
@@ -0,0 +1,361 @@
+{
+ "keyboard_name": "bison",
+ "manufacturer": "csandven",
+ "url": "",
+ "maintainer": "Christian Sandven",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D3", "E6", "B2", "B4", "D4", "F6", "F5", "F4"],
+ "rows": ["D2", "F7", "B1", "B3", "D7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B6", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "B6"}
+ ]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6, "y": 0},
+ {"matrix": [0, 0], "x": 7, "y": 0},
+
+ {"matrix": [5, 0], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 4], "x": 14, "y": 0},
+ {"matrix": [5, 5], "x": 15, "y": 0},
+ {"matrix": [5, 6], "x": 16, "y": 0},
+ {"matrix": [5, 7], "x": 17, "y": 0},
+
+ {"matrix": [1, 7], "x": 0, "y": 1},
+ {"matrix": [1, 6], "x": 1, "y": 1},
+ {"matrix": [1, 5], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [1, 1], "x": 6, "y": 1},
+ {"matrix": [1, 0], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 4], "x": 14, "y": 1},
+ {"matrix": [6, 5], "x": 15, "y": 1},
+ {"matrix": [6, 6], "x": 16, "y": 1},
+ {"matrix": [6, 7], "x": 17, "y": 1},
+
+ {"matrix": [2, 7], "x": 0, "y": 2},
+ {"matrix": [2, 6], "x": 1, "y": 2},
+ {"matrix": [2, 5], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 2], "x": 5, "y": 2},
+ {"matrix": [2, 1], "x": 6, "y": 2},
+ {"matrix": [2, 0], "x": 7, "y": 2},
+
+ {"matrix": [7, 0], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 5], "x": 15, "y": 2},
+ {"matrix": [7, 6], "x": 16, "y": 2},
+ {"matrix": [7, 7], "x": 17, "y": 2},
+
+ {"matrix": [3, 7], "x": 0, "y": 3},
+ {"matrix": [3, 6], "x": 1, "y": 3},
+ {"matrix": [3, 5], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 7, "y": 3},
+ {"matrix": [4, 4], "x": 8, "y": 3},
+
+ {"matrix": [9, 4], "x": 9, "y": 3},
+ {"matrix": [8, 0], "x": 10, "y": 3},
+ {"matrix": [8, 1], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 4], "x": 14, "y": 3},
+ {"matrix": [8, 5], "x": 15, "y": 3},
+ {"matrix": [8, 6], "x": 16, "y": 3},
+ {"matrix": [8, 7], "x": 17, "y": 3},
+
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 2], "x": 4.75, "y": 4},
+ {"matrix": [4, 1], "x": 5.75, "y": 4},
+ {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 11.25, "y": 4},
+ {"matrix": [9, 2], "x": 12.25, "y": 4},
+ {"matrix": [9, 3], "x": 13.25, "y": 4}
+ ]
+ },
+ "LAYOUT_6_8": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0},
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 8, "y": 0},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 5], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [5, 7], "x": 15, "y": 0},
+
+ {"matrix": [1, 5], "x": 0, "y": 1},
+ {"matrix": [1, 4], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 8, "y": 1},
+ {"matrix": [6, 1], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 5], "x": 13, "y": 1},
+ {"matrix": [6, 6], "x": 14, "y": 1},
+ {"matrix": [6, 7], "x": 15, "y": 1},
+
+ {"matrix": [2, 5], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+
+ {"matrix": [7, 0], "x": 8, "y": 2},
+ {"matrix": [7, 1], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 5], "x": 13, "y": 2},
+ {"matrix": [7, 6], "x": 14, "y": 2},
+ {"matrix": [7, 7], "x": 15, "y": 2},
+
+ {"matrix": [3, 5], "x": 0, "y": 3},
+ {"matrix": [3, 4], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 1], "x": 4, "y": 3},
+ {"matrix": [3, 0], "x": 5, "y": 3},
+ {"matrix": [4, 4], "x": 6, "y": 3},
+
+ {"matrix": [9, 4], "x": 7, "y": 3},
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3},
+ {"matrix": [8, 6], "x": 14, "y": 3},
+ {"matrix": [8, 7], "x": 15, "y": 3},
+
+ {"matrix": [4, 3], "x": 1.75, "y": 4},
+ {"matrix": [4, 2], "x": 2.75, "y": 4},
+ {"matrix": [4, 1], "x": 3.75, "y": 4},
+ {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 9.25, "y": 4},
+ {"matrix": [9, 2], "x": 10.25, "y": 4},
+ {"matrix": [9, 3], "x": 11.25, "y": 4}
+ ]
+ },
+ "LAYOUT_8_6": {
+ "layout": [
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6, "y": 0},
+ {"matrix": [0, 0], "x": 7, "y": 0},
+
+ {"matrix": [5, 0], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 4], "x": 14, "y": 0},
+ {"matrix": [5, 5], "x": 15, "y": 0},
+
+ {"matrix": [1, 7], "x": 0, "y": 1},
+ {"matrix": [1, 6], "x": 1, "y": 1},
+ {"matrix": [1, 5], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [1, 1], "x": 6, "y": 1},
+ {"matrix": [1, 0], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 4], "x": 14, "y": 1},
+ {"matrix": [6, 5], "x": 15, "y": 1},
+
+ {"matrix": [2, 7], "x": 0, "y": 2},
+ {"matrix": [2, 6], "x": 1, "y": 2},
+ {"matrix": [2, 5], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 2], "x": 5, "y": 2},
+ {"matrix": [2, 1], "x": 6, "y": 2},
+ {"matrix": [2, 0], "x": 7, "y": 2},
+
+ {"matrix": [7, 0], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 5], "x": 15, "y": 2},
+
+ {"matrix": [3, 7], "x": 0, "y": 3},
+ {"matrix": [3, 6], "x": 1, "y": 3},
+ {"matrix": [3, 5], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 7, "y": 3},
+ {"matrix": [4, 4], "x": 8, "y": 3},
+
+ {"matrix": [9, 4], "x": 9, "y": 3},
+ {"matrix": [8, 0], "x": 10, "y": 3},
+ {"matrix": [8, 1], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 4], "x": 14, "y": 3},
+ {"matrix": [8, 5], "x": 15, "y": 3},
+
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 2], "x": 4.75, "y": 4},
+ {"matrix": [4, 1], "x": 5.75, "y": 4},
+ {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 11.25, "y": 4},
+ {"matrix": [9, 2], "x": 12.25, "y": 4},
+ {"matrix": [9, 3], "x": 13.25, "y": 4}
+ ]
+ },
+ "LAYOUT_6_6": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0},
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 8, "y": 0},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 5], "x": 13, "y": 0},
+
+ {"matrix": [1, 5], "x": 0, "y": 1},
+ {"matrix": [1, 4], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 8, "y": 1},
+ {"matrix": [6, 1], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 5], "x": 13, "y": 1},
+
+ {"matrix": [2, 5], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+
+ {"matrix": [7, 0], "x": 8, "y": 2},
+ {"matrix": [7, 1], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 5], "x": 13, "y": 2},
+
+ {"matrix": [3, 5], "x": 0, "y": 3},
+ {"matrix": [3, 4], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 1], "x": 4, "y": 3},
+ {"matrix": [3, 0], "x": 5, "y": 3},
+ {"matrix": [4, 4], "x": 6, "y": 3},
+
+ {"matrix": [9, 4], "x": 7, "y": 3},
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3},
+
+ {"matrix": [4, 3], "x": 1.75, "y": 4},
+ {"matrix": [4, 2], "x": 2.75, "y": 4},
+ {"matrix": [4, 1], "x": 3.75, "y": 4},
+ {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 9.25, "y": 4},
+ {"matrix": [9, 2], "x": 10.25, "y": 4},
+ {"matrix": [9, 3], "x": 11.25, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keyprez/bison/rules.mk b/keyboards/keyprez/bison/rules.mk
deleted file mode 100644
index 21a7746f6c6..00000000000
--- a/keyboards/keyprez/bison/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json
deleted file mode 100644
index 58d2a98d300..00000000000
--- a/keyboards/keyprez/unicorn/info.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "keyboard_name": "Unicorn",
- "manufacturer": "Keyprez",
- "url": "",
- "maintainer": "Keyprez",
- "usb": {
- "vid": "0x6B7A",
- "pid": "0x7563",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"],
- "rows": ["F4", "D3", "F6", "F7", "B1", "B3"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "D2", "pin_b": "D4"}
- ]
- },
- "split": {
- "soft_serial_pin": "D0",
- "matrix_pins": {
- "right": {
- "cols": ["F5", "D3", "B5", "D7", "B4", "B6", "E6", "C6"],
- "rows": ["F4", "B2", "F6", "F7", "B1", "B3"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [6, 0], "x": 8, "y": 0},
- {"matrix": [6, 1], "x": 9, "y": 0},
- {"matrix": [6, 2], "x": 10, "y": 0},
- {"matrix": [6, 3], "x": 11, "y": 0},
- {"matrix": [6, 4], "x": 12, "y": 0},
- {"matrix": [6, 5], "x": 13, "y": 0},
- {"matrix": [6, 6], "x": 14, "y": 0, "w": 2},
- {"matrix": [6, 7], "x": 16, "y": 0},
- {"matrix": [11, 2], "x": 17, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
-
- {"matrix": [7, 0], "x": 7.5, "y": 1},
- {"matrix": [7, 1], "x": 8.5, "y": 1},
- {"matrix": [7, 2], "x": 9.5, "y": 1},
- {"matrix": [7, 3], "x": 10.5, "y": 1},
- {"matrix": [7, 4], "x": 11.5, "y": 1},
- {"matrix": [7, 5], "x": 12.5, "y": 1},
- {"matrix": [7, 6], "x": 13.5, "y": 1},
- {"matrix": [11, 4], "x": 16, "y": 1},
- {"matrix": [11, 3], "x": 17, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [8, 0], "x": 7.75, "y": 2},
- {"matrix": [8, 1], "x": 8.75, "y": 2},
- {"matrix": [8, 2], "x": 9.75, "y": 2},
- {"matrix": [8, 3], "x": 10.75, "y": 2},
- {"matrix": [8, 4], "x": 11.75, "y": 2},
- {"matrix": [8, 5], "x": 12.75, "y": 2},
- {"matrix": [8, 6], "x": 13.75, "y": 2},
- {"matrix": [8, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
- {"matrix": [11, 6], "x": 16, "y": 2},
- {"matrix": [11, 5], "x": 17, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
-
- {"matrix": [9, 0], "x": 8.25, "y": 3},
- {"matrix": [9, 1], "x": 9.25, "y": 3},
- {"matrix": [9, 2], "x": 10.25, "y": 3},
- {"matrix": [9, 3], "x": 11.25, "y": 3},
- {"matrix": [9, 4], "x": 12.25, "y": 3},
- {"matrix": [9, 5], "x": 13.25, "y": 3, "w": 1.75},
- {"matrix": [9, 6], "x": 15, "y": 3},
- {"matrix": [9, 7], "x": 16, "y": 3},
- {"matrix": [11, 7], "x": 17, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
- {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
-
- {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 2.75},
- {"matrix": [10, 1], "x": 11, "y": 4},
- {"matrix": [10, 2], "x": 12, "y": 4},
- {"matrix": [10, 3], "x": 13, "y": 4},
- {"matrix": [10, 4], "x": 14, "y": 4},
- {"matrix": [10, 5], "x": 15, "y": 4},
- {"matrix": [10, 6], "x": 16, "y": 4},
- {"matrix": [10, 7], "x": 17, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/keyprez/unicorn/keyboard.json b/keyboards/keyprez/unicorn/keyboard.json
new file mode 100644
index 00000000000..56061290ea7
--- /dev/null
+++ b/keyboards/keyprez/unicorn/keyboard.json
@@ -0,0 +1,133 @@
+{
+ "keyboard_name": "Unicorn",
+ "manufacturer": "Keyprez",
+ "url": "",
+ "maintainer": "Keyprez",
+ "usb": {
+ "vid": "0x6B7A",
+ "pid": "0x7563",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"],
+ "rows": ["F4", "D3", "F6", "F7", "B1", "B3"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "D4"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F5", "D3", "B5", "D7", "B4", "B6", "E6", "C6"],
+ "rows": ["F4", "B2", "F6", "F7", "B1", "B3"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [6, 0], "x": 8, "y": 0},
+ {"matrix": [6, 1], "x": 9, "y": 0},
+ {"matrix": [6, 2], "x": 10, "y": 0},
+ {"matrix": [6, 3], "x": 11, "y": 0},
+ {"matrix": [6, 4], "x": 12, "y": 0},
+ {"matrix": [6, 5], "x": 13, "y": 0},
+ {"matrix": [6, 6], "x": 14, "y": 0, "w": 2},
+ {"matrix": [6, 7], "x": 16, "y": 0},
+ {"matrix": [11, 2], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 1},
+ {"matrix": [7, 1], "x": 8.5, "y": 1},
+ {"matrix": [7, 2], "x": 9.5, "y": 1},
+ {"matrix": [7, 3], "x": 10.5, "y": 1},
+ {"matrix": [7, 4], "x": 11.5, "y": 1},
+ {"matrix": [7, 5], "x": 12.5, "y": 1},
+ {"matrix": [7, 6], "x": 13.5, "y": 1},
+ {"matrix": [11, 4], "x": 16, "y": 1},
+ {"matrix": [11, 3], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [8, 0], "x": 7.75, "y": 2},
+ {"matrix": [8, 1], "x": 8.75, "y": 2},
+ {"matrix": [8, 2], "x": 9.75, "y": 2},
+ {"matrix": [8, 3], "x": 10.75, "y": 2},
+ {"matrix": [8, 4], "x": 11.75, "y": 2},
+ {"matrix": [8, 5], "x": 12.75, "y": 2},
+ {"matrix": [8, 6], "x": 13.75, "y": 2},
+ {"matrix": [8, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [11, 6], "x": 16, "y": 2},
+ {"matrix": [11, 5], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [9, 0], "x": 8.25, "y": 3},
+ {"matrix": [9, 1], "x": 9.25, "y": 3},
+ {"matrix": [9, 2], "x": 10.25, "y": 3},
+ {"matrix": [9, 3], "x": 11.25, "y": 3},
+ {"matrix": [9, 4], "x": 12.25, "y": 3},
+ {"matrix": [9, 5], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [9, 6], "x": 15, "y": 3},
+ {"matrix": [9, 7], "x": 16, "y": 3},
+ {"matrix": [11, 7], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 2.75},
+ {"matrix": [10, 1], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 12, "y": 4},
+ {"matrix": [10, 3], "x": 13, "y": 4},
+ {"matrix": [10, 4], "x": 14, "y": 4},
+ {"matrix": [10, 5], "x": 15, "y": 4},
+ {"matrix": [10, 6], "x": 16, "y": 4},
+ {"matrix": [10, 7], "x": 17, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keyprez/unicorn/rules.mk b/keyboards/keyprez/unicorn/rules.mk
deleted file mode 100644
index 9458603d100..00000000000
--- a/keyboards/keyprez/unicorn/rules.mk
+++ /dev/null
@@ -1,14 +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
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/info.json
deleted file mode 100644
index b2d2a01f8b0..00000000000
--- a/keyboards/keystonecaps/gameroyadvance/info.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
- "keyboard_name": "Game Roy ADVANCE",
- "manufacturer": "Keystone Caps",
- "url": "https://keystonecaps.store/?product=game-roy-advance-game-pad-group-buy-preorder",
- "maintainer": "@RoyMeetsWorld",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x6060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "D0", "D1", "C6", "D7", "E6", "F4", "B2", "B6"],
- "rows": ["F5", "F6", "F7", "B1", "B3"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B5", "pin_b": "B4"}
- ]
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 0,
- "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": {
- "pin": "C7"
- },
- "split": {
- "soft_serial_pin": "D2",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "B3", "pin_b": "B2"}
- ]
- }
- },
- "matrix_pins": {
- "right": {
- "cols": ["C6", "D4", "D0", "D1", "B1", "F7", "F4", "F5", "F6"],
- "rows": ["D7", "E6", "B4", "B5", "B6"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0.5, "y": 0},
- {"matrix": [0, 1], "x": 1.5, "y": 0},
- {"matrix": [0, 2], "x": 2.5, "y": 0},
- {"matrix": [0, 3], "x": 3.5, "y": 0},
- {"matrix": [0, 4], "x": 4.5, "y": 0},
- {"matrix": [0, 5], "x": 5.5, "y": 0},
- {"matrix": [0, 6], "x": 6.5, "y": 0},
-
- {"matrix": [5, 0], "x": 13.25, "y": 0},
- {"matrix": [5, 1], "x": 14.25, "y": 0},
- {"matrix": [5, 2], "x": 15.25, "y": 0},
- {"matrix": [5, 3], "x": 16.25, "y": 0},
- {"matrix": [5, 4], "x": 17.25, "y": 0},
- {"matrix": [5, 5], "x": 18.25, "y": 0},
- {"matrix": [5, 7], "x": 19.25, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.75, "y": 1},
- {"matrix": [1, 8], "x": 8.75, "y": 1},
-
- {"matrix": [6, 0], "x": 10.5, "y": 1},
- {"matrix": [6, 1], "x": 11.5, "y": 1},
- {"matrix": [6, 2], "x": 13.25, "y": 1},
- {"matrix": [6, 3], "x": 14.25, "y": 1},
- {"matrix": [6, 4], "x": 15.25, "y": 1},
- {"matrix": [6, 5], "x": 16.25, "y": 1},
- {"matrix": [6, 6], "x": 17.25, "y": 1},
- {"matrix": [6, 7], "x": 18.25, "y": 1},
- {"matrix": [6, 8], "x": 19.25, "y": 1},
- {"matrix": [7, 8], "x": 20.25, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
-
- {"matrix": [7, 0], "x": 10.5, "y": 2},
- {"matrix": [7, 1], "x": 11.5, "y": 2},
- {"matrix": [7, 2], "x": 13.5, "y": 2},
- {"matrix": [7, 3], "x": 14.5, "y": 2},
- {"matrix": [7, 4], "x": 15.5, "y": 2},
- {"matrix": [7, 5], "x": 16.5, "y": 2},
- {"matrix": [7, 6], "x": 17.5, "y": 2},
- {"matrix": [7, 7], "x": 18.5, "y": 2},
- {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
-
- {"matrix": [8, 0], "x": 10.5, "y": 3},
- {"matrix": [8, 1], "x": 11.5, "y": 3},
- {"matrix": [8, 2], "x": 13, "y": 3},
- {"matrix": [8, 3], "x": 14, "y": 3},
- {"matrix": [8, 4], "x": 15, "y": 3},
- {"matrix": [8, 5], "x": 16, "y": 3},
- {"matrix": [8, 6], "x": 17, "y": 3},
- {"matrix": [8, 7], "x": 18, "y": 3},
- {"matrix": [9, 6], "x": 19, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
- {"matrix": [4, 8], "x": 7.5, "y": 4},
-
- {"matrix": [9, 0], "x": 11.75, "y": 4},
- {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
- {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
- {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
- {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
-
- {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
-
- {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
- ]
- },
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0.5, "y": 0},
- {"matrix": [0, 1], "x": 1.5, "y": 0},
- {"matrix": [0, 2], "x": 2.5, "y": 0},
- {"matrix": [0, 3], "x": 3.5, "y": 0},
- {"matrix": [0, 4], "x": 4.5, "y": 0},
- {"matrix": [0, 5], "x": 5.5, "y": 0},
- {"matrix": [0, 6], "x": 6.5, "y": 0},
-
- {"matrix": [5, 0], "x": 13.25, "y": 0},
- {"matrix": [5, 1], "x": 14.25, "y": 0},
- {"matrix": [5, 2], "x": 15.25, "y": 0},
- {"matrix": [5, 3], "x": 16.25, "y": 0},
- {"matrix": [5, 4], "x": 17.25, "y": 0},
- {"matrix": [5, 5], "x": 18.25, "y": 0},
- {"matrix": [5, 6], "x": 19.25, "y": 0},
- {"matrix": [5, 7], "x": 22.25, "y": 0, "w": 2},
- {"matrix": [5, 8], "x": 20.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.75, "y": 1},
- {"matrix": [1, 8], "x": 8.75, "y": 1},
-
- {"matrix": [6, 0], "x": 10.5, "y": 1},
- {"matrix": [6, 1], "x": 11.5, "y": 1},
- {"matrix": [6, 2], "x": 13.25, "y": 1},
- {"matrix": [6, 3], "x": 14.25, "y": 1},
- {"matrix": [6, 4], "x": 15.25, "y": 1},
- {"matrix": [6, 5], "x": 16.25, "y": 1},
- {"matrix": [6, 6], "x": 17.25, "y": 1},
- {"matrix": [6, 7], "x": 18.25, "y": 1},
- {"matrix": [6, 8], "x": 19.25, "y": 1},
- {"matrix": [7, 8], "x": 20.25, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
-
- {"matrix": [7, 0], "x": 10.5, "y": 2},
- {"matrix": [7, 1], "x": 11.5, "y": 2},
- {"matrix": [7, 2], "x": 13.5, "y": 2},
- {"matrix": [7, 3], "x": 14.5, "y": 2},
- {"matrix": [7, 4], "x": 15.5, "y": 2},
- {"matrix": [7, 5], "x": 16.5, "y": 2},
- {"matrix": [7, 6], "x": 17.5, "y": 2},
- {"matrix": [7, 7], "x": 18.5, "y": 2},
- {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [4, 4], "x": 1.25, "y": 3},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
-
- {"matrix": [8, 0], "x": 10.5, "y": 3},
- {"matrix": [8, 1], "x": 11.5, "y": 3},
- {"matrix": [8, 2], "x": 13, "y": 3},
- {"matrix": [8, 3], "x": 14, "y": 3},
- {"matrix": [8, 4], "x": 15, "y": 3},
- {"matrix": [8, 5], "x": 16, "y": 3},
- {"matrix": [8, 6], "x": 17, "y": 3},
- {"matrix": [8, 7], "x": 18, "y": 3},
- {"matrix": [9, 6], "x": 19, "y": 3, "w": 1.75},
- {"matrix": [9, 8], "x": 20.75, "y": 3},
-
- {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
- {"matrix": [4, 8], "x": 7.5, "y": 4},
-
- {"matrix": [9, 0], "x": 11.75, "y": 4},
- {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
- {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
- {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
- {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
-
- {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
-
- {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/keystonecaps/gameroyadvance/keyboard.json b/keyboards/keystonecaps/gameroyadvance/keyboard.json
new file mode 100644
index 00000000000..89b30fe4d80
--- /dev/null
+++ b/keyboards/keystonecaps/gameroyadvance/keyboard.json
@@ -0,0 +1,267 @@
+{
+ "keyboard_name": "Game Roy ADVANCE",
+ "manufacturer": "Keystone Caps",
+ "url": "https://keystonecaps.store/?product=game-roy-advance-game-pad-group-buy-preorder",
+ "maintainer": "@RoyMeetsWorld",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D4", "D0", "D1", "C6", "D7", "E6", "F4", "B2", "B6"],
+ "rows": ["F5", "F6", "F7", "B1", "B3"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "B4"}
+ ]
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 0,
+ "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": {
+ "pin": "C7"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "B3", "pin_b": "B2"}
+ ]
+ }
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["C6", "D4", "D0", "D1", "B1", "F7", "F4", "F5", "F6"],
+ "rows": ["D7", "E6", "B4", "B5", "B6"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 13.25, "y": 0},
+ {"matrix": [5, 1], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 3], "x": 16.25, "y": 0},
+ {"matrix": [5, 4], "x": 17.25, "y": 0},
+ {"matrix": [5, 5], "x": 18.25, "y": 0},
+ {"matrix": [5, 7], "x": 19.25, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+
+ {"matrix": [6, 0], "x": 10.5, "y": 1},
+ {"matrix": [6, 1], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 13.25, "y": 1},
+ {"matrix": [6, 3], "x": 14.25, "y": 1},
+ {"matrix": [6, 4], "x": 15.25, "y": 1},
+ {"matrix": [6, 5], "x": 16.25, "y": 1},
+ {"matrix": [6, 6], "x": 17.25, "y": 1},
+ {"matrix": [6, 7], "x": 18.25, "y": 1},
+ {"matrix": [6, 8], "x": 19.25, "y": 1},
+ {"matrix": [7, 8], "x": 20.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 10.5, "y": 2},
+ {"matrix": [7, 1], "x": 11.5, "y": 2},
+ {"matrix": [7, 2], "x": 13.5, "y": 2},
+ {"matrix": [7, 3], "x": 14.5, "y": 2},
+ {"matrix": [7, 4], "x": 15.5, "y": 2},
+ {"matrix": [7, 5], "x": 16.5, "y": 2},
+ {"matrix": [7, 6], "x": 17.5, "y": 2},
+ {"matrix": [7, 7], "x": 18.5, "y": 2},
+ {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 10.5, "y": 3},
+ {"matrix": [8, 1], "x": 11.5, "y": 3},
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3},
+ {"matrix": [8, 4], "x": 15, "y": 3},
+ {"matrix": [8, 5], "x": 16, "y": 3},
+ {"matrix": [8, 6], "x": 17, "y": 3},
+ {"matrix": [8, 7], "x": 18, "y": 3},
+ {"matrix": [9, 6], "x": 19, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
+ {"matrix": [4, 8], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 11.75, "y": 4},
+ {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
+ {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
+
+ {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 13.25, "y": 0},
+ {"matrix": [5, 1], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 3], "x": 16.25, "y": 0},
+ {"matrix": [5, 4], "x": 17.25, "y": 0},
+ {"matrix": [5, 5], "x": 18.25, "y": 0},
+ {"matrix": [5, 6], "x": 19.25, "y": 0},
+ {"matrix": [5, 7], "x": 22.25, "y": 0, "w": 2},
+ {"matrix": [5, 8], "x": 20.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+
+ {"matrix": [6, 0], "x": 10.5, "y": 1},
+ {"matrix": [6, 1], "x": 11.5, "y": 1},
+ {"matrix": [6, 2], "x": 13.25, "y": 1},
+ {"matrix": [6, 3], "x": 14.25, "y": 1},
+ {"matrix": [6, 4], "x": 15.25, "y": 1},
+ {"matrix": [6, 5], "x": 16.25, "y": 1},
+ {"matrix": [6, 6], "x": 17.25, "y": 1},
+ {"matrix": [6, 7], "x": 18.25, "y": 1},
+ {"matrix": [6, 8], "x": 19.25, "y": 1},
+ {"matrix": [7, 8], "x": 20.25, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 10.5, "y": 2},
+ {"matrix": [7, 1], "x": 11.5, "y": 2},
+ {"matrix": [7, 2], "x": 13.5, "y": 2},
+ {"matrix": [7, 3], "x": 14.5, "y": 2},
+ {"matrix": [7, 4], "x": 15.5, "y": 2},
+ {"matrix": [7, 5], "x": 16.5, "y": 2},
+ {"matrix": [7, 6], "x": 17.5, "y": 2},
+ {"matrix": [7, 7], "x": 18.5, "y": 2},
+ {"matrix": [8, 8], "x": 19.5, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [4, 4], "x": 1.25, "y": 3},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 10.5, "y": 3},
+ {"matrix": [8, 1], "x": 11.5, "y": 3},
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3},
+ {"matrix": [8, 4], "x": 15, "y": 3},
+ {"matrix": [8, 5], "x": 16, "y": 3},
+ {"matrix": [8, 6], "x": 17, "y": 3},
+ {"matrix": [8, 7], "x": 18, "y": 3},
+ {"matrix": [9, 6], "x": 19, "y": 3, "w": 1.75},
+ {"matrix": [9, 8], "x": 20.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 0.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6.5, "y": 4, "h": 1.5},
+ {"matrix": [4, 8], "x": 7.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 11.75, "y": 4},
+ {"matrix": [9, 2], "x": 12.75, "y": 4, "h": 1.5},
+ {"matrix": [9, 3], "x": 16.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 17.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 18.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 20, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 7.5, "y": 5, "h": 1.5},
+
+ {"matrix": [9, 1], "x": 11.75, "y": 5, "h": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keystonecaps/gameroyadvance/rules.mk b/keyboards/keystonecaps/gameroyadvance/rules.mk
deleted file mode 100644
index 2a8d8c7bce6..00000000000
--- a/keyboards/keystonecaps/gameroyadvance/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
-
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/kumaokobo/kudox/info.json b/keyboards/kumaokobo/kudox/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/kumaokobo/kudox/info.json
@@ -0,0 +1,5 @@
+{
+ "split": {
+ "enabled": true
+ }
+}
diff --git a/keyboards/kumaokobo/kudox/rules.mk b/keyboards/kumaokobo/kudox/rules.mk
index 261c8e2a2b7..ff1dfc760e7 100644
--- a/keyboards/kumaokobo/kudox/rules.mk
+++ b/keyboards/kumaokobo/kudox/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = kumaokobo/kudox/rev3
diff --git a/keyboards/kumaokobo/kudox_full/rev1/info.json b/keyboards/kumaokobo/kudox_full/rev1/info.json
index 673fda9acfc..d12984f16e3 100644
--- a/keyboards/kumaokobo/kudox_full/rev1/info.json
+++ b/keyboards/kumaokobo/kudox_full/rev1/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"rgblight": {
diff --git a/keyboards/kumaokobo/kudox_full/rules.mk b/keyboards/kumaokobo/kudox_full/rules.mk
index 06453b2337a..2924b7cee57 100644
--- a/keyboards/kumaokobo/kudox_full/rules.mk
+++ b/keyboards/kumaokobo/kudox_full/rules.mk
@@ -13,6 +13,4 @@ AUDIO_ENABLE = no # Audio output
UNICODE_ENABLE = yes # Unicode
LTO_ENABLE = yes
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = kumaokobo/kudox_full/rev1
diff --git a/keyboards/kumaokobo/pico/info.json b/keyboards/kumaokobo/pico/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/kumaokobo/pico/info.json
@@ -0,0 +1,5 @@
+{
+ "split": {
+ "enabled": true
+ }
+}
diff --git a/keyboards/kumaokobo/pico/rules.mk b/keyboards/kumaokobo/pico/rules.mk
index 11fe77d618d..36372376ea1 100644
--- a/keyboards/kumaokobo/pico/rules.mk
+++ b/keyboards/kumaokobo/pico/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = kumaokobo/pico/65keys
diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
deleted file mode 100644
index a211846f628..00000000000
--- a/keyboards/latincompass/latin17rgb/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- "keyboard_name": "Latin17RGB",
- "manufacturer": "18438880",
- "url": "",
- "maintainer": "18438880",
- "usb": {
- "vid": "0x7C88",
- "pid": "0x7C97",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "hue_steps": 5,
- "saturation_steps": 5,
- "brightness_steps": 5,
- "led_count": 8,
- "sleep": true,
- "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": {
- "pin": "B7"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "solid_reactive_simple": true,
- "solid_reactive": true
- },
- "driver": "is31fl3731",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["F7", "F6", "F5", "F4"],
- "rows": ["C7", "C6", "B6", "B5", "B4"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "community_layouts": ["numpad_5x4"],
- "layout_aliases": {
- "LAYOUT_pad": "LAYOUT_numpad_5x4"
- },
- "layouts": {
- "LAYOUT_numpad_5x4": {
- "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": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
- {"matrix": [4, 1], "x": 2, "y": 4},
- {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/latincompass/latin17rgb/keyboard.json b/keyboards/latincompass/latin17rgb/keyboard.json
new file mode 100644
index 00000000000..161672aea4f
--- /dev/null
+++ b/keyboards/latincompass/latin17rgb/keyboard.json
@@ -0,0 +1,115 @@
+{
+ "keyboard_name": "Latin17RGB",
+ "manufacturer": "18438880",
+ "url": "",
+ "maintainer": "18438880",
+ "usb": {
+ "vid": "0x7C88",
+ "pid": "0x7C97",
+ "device_version": "0.0.1"
+ },
+ "rgblight": {
+ "hue_steps": 5,
+ "saturation_steps": 5,
+ "brightness_steps": 5,
+ "led_count": 8,
+ "sleep": true,
+ "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": {
+ "pin": "B7"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true
+ },
+ "driver": "is31fl3731",
+ "sleep": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4"],
+ "rows": ["C7", "C6", "B6", "B5", "B4"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "community_layouts": ["numpad_5x4"],
+ "layout_aliases": {
+ "LAYOUT_pad": "LAYOUT_numpad_5x4"
+ },
+ "layouts": {
+ "LAYOUT_numpad_5x4": {
+ "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": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 1], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/latincompass/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk
deleted file mode 100644
index 0af5f68e5e1..00000000000
--- a/keyboards/latincompass/latin17rgb/rules.mk
+++ /dev/null
@@ -1,13 +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
diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json
index a92a948abd2..4640bd9e84f 100644
--- a/keyboards/lets_split/info.json
+++ b/keyboards/lets_split/info.json
@@ -3,5 +3,8 @@
"maintainer": "qmk",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "split": {
+ "enabled": true
+ },
"community_layouts": ["ortho_4x12"]
}
diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk
index cb7097b091a..11f365e8e9c 100644
--- a/keyboards/lets_split/rules.mk
+++ b/keyboards/lets_split/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = lets_split/rev2
diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json
index 19ac7dfda2b..2e395f5e6a7 100644
--- a/keyboards/lime/rev1/info.json
+++ b/keyboards/lime/rev1/info.json
@@ -19,6 +19,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"encoder": {
"right": {
diff --git a/keyboards/lime/rules.mk b/keyboards/lime/rules.mk
index 1d1f049a53d..cd2da2eedf3 100644
--- a/keyboards/lime/rules.mk
+++ b/keyboards/lime/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD = yes
SWAP_HANDS_ENABLE = yes
DEFAULT_FOLDER = lime/rev1
diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json
deleted file mode 100644
index 7f4cfa8e94c..00000000000
--- a/keyboards/majistic/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "keyboard_name": "maJIStic",
- "manufacturer": "yossiyossy",
- "url": "https://github.com/yossiyossy/maJIStic",
- "maintainer": "yossiyossy",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x6E55",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
- "rows": ["F6", "F7", "B1", "B3", "B2"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2",
- "matrix_pins": {
- "right": {
- "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
- {"matrix": [0, 1], "x": 1.5, "y": 0},
- {"matrix": [0, 2], "x": 2.5, "y": 0},
- {"matrix": [0, 3], "x": 3.5, "y": 0},
- {"matrix": [0, 4], "x": 4.5, "y": 0},
- {"matrix": [0, 5], "x": 5.5, "y": 0},
-
- {"matrix": [5, 0], "x": 7.5, "y": 0},
- {"matrix": [5, 1], "x": 8.5, "y": 0},
- {"matrix": [5, 2], "x": 9.5, "y": 0},
- {"matrix": [5, 3], "x": 10.5, "y": 0},
- {"matrix": [5, 4], "x": 11.5, "y": 0},
- {"matrix": [5, 5], "x": 12.5, "y": 0},
- {"matrix": [5, 6], "x": 13.5, "y": 0},
- {"matrix": [5, 7], "x": 14.5, "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": [6, 0], "x": 7, "y": 1},
- {"matrix": [6, 1], "x": 8, "y": 1},
- {"matrix": [6, 2], "x": 9, "y": 1},
- {"matrix": [6, 3], "x": 10, "y": 1},
- {"matrix": [6, 4], "x": 11, "y": 1},
- {"matrix": [6, 5], "x": 12, "y": 1},
- {"matrix": [6, 6], "x": 13, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
- {"matrix": [2, 1], "x": 1.25, "y": 2},
- {"matrix": [2, 2], "x": 2.25, "y": 2},
- {"matrix": [2, 3], "x": 3.25, "y": 2},
- {"matrix": [2, 4], "x": 4.25, "y": 2},
- {"matrix": [2, 5], "x": 5.25, "y": 2},
-
- {"matrix": [7, 0], "x": 7.25, "y": 2},
- {"matrix": [7, 1], "x": 8.25, "y": 2},
- {"matrix": [7, 2], "x": 9.25, "y": 2},
- {"matrix": [7, 3], "x": 10.25, "y": 2},
- {"matrix": [7, 4], "x": 11.25, "y": 2},
- {"matrix": [7, 5], "x": 12.25, "y": 2},
- {"matrix": [7, 6], "x": 13.25, "y": 2},
- {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
-
- {"matrix": [8, 0], "x": 7.75, "y": 3},
- {"matrix": [8, 1], "x": 8.75, "y": 3},
- {"matrix": [8, 2], "x": 9.75, "y": 3},
- {"matrix": [8, 3], "x": 10.75, "y": 3},
- {"matrix": [8, 4], "x": 11.75, "y": 3},
- {"matrix": [8, 5], "x": 12.75, "y": 3},
- {"matrix": [8, 6], "x": 13.75, "y": 3, "w": 1.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.75},
-
- {"matrix": [9, 0], "x": 7.25, "y": 4, "w": 1.5},
- {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.5},
- {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.5},
- {"matrix": [9, 3], "x": 11.75, "y": 4},
- {"matrix": [9, 4], "x": 12.75, "y": 4},
- {"matrix": [9, 5], "x": 13.75, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/majistic/keyboard.json b/keyboards/majistic/keyboard.json
new file mode 100644
index 00000000000..258df08d883
--- /dev/null
+++ b/keyboards/majistic/keyboard.json
@@ -0,0 +1,116 @@
+{
+ "keyboard_name": "maJIStic",
+ "manufacturer": "yossiyossy",
+ "url": "https://github.com/yossiyossy/maJIStic",
+ "maintainer": "yossiyossy",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6E55",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
+ "rows": ["F6", "F7", "B1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "matrix_pins": {
+ "right": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 7.5, "y": 0},
+ {"matrix": [5, 1], "x": 8.5, "y": 0},
+ {"matrix": [5, 2], "x": 9.5, "y": 0},
+ {"matrix": [5, 3], "x": 10.5, "y": 0},
+ {"matrix": [5, 4], "x": 11.5, "y": 0},
+ {"matrix": [5, 5], "x": 12.5, "y": 0},
+ {"matrix": [5, 6], "x": 13.5, "y": 0},
+ {"matrix": [5, 7], "x": 14.5, "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": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "y": 1},
+ {"matrix": [6, 6], "x": 13, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.25, "y": 2},
+ {"matrix": [7, 1], "x": 8.25, "y": 2},
+ {"matrix": [7, 2], "x": 9.25, "y": 2},
+ {"matrix": [7, 3], "x": 10.25, "y": 2},
+ {"matrix": [7, 4], "x": 11.25, "y": 2},
+ {"matrix": [7, 5], "x": 12.25, "y": 2},
+ {"matrix": [7, 6], "x": 13.25, "y": 2},
+ {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 7.75, "y": 3},
+ {"matrix": [8, 1], "x": 8.75, "y": 3},
+ {"matrix": [8, 2], "x": 9.75, "y": 3},
+ {"matrix": [8, 3], "x": 10.75, "y": 3},
+ {"matrix": [8, 4], "x": 11.75, "y": 3},
+ {"matrix": [8, 5], "x": 12.75, "y": 3},
+ {"matrix": [8, 6], "x": 13.75, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.75},
+
+ {"matrix": [9, 0], "x": 7.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 3], "x": 11.75, "y": 4},
+ {"matrix": [9, 4], "x": 12.75, "y": 4},
+ {"matrix": [9, 5], "x": 13.75, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/majistic/rules.mk b/keyboards/majistic/rules.mk
deleted file mode 100644
index d7abef3ae35..00000000000
--- a/keyboards/majistic/rules.mk
+++ /dev/null
@@ -1,14 +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 = 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
index 7a9aa305acb..6bbf3477dc0 100644
--- a/keyboards/malevolti/lyra/rev1/info.json
+++ b/keyboards/malevolti/lyra/rev1/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"tapping": {
diff --git a/keyboards/malevolti/lyra/rev1/rules.mk b/keyboards/malevolti/lyra/rev1/rules.mk
index 78e2bfea04a..c2c363d51c3 100644
--- a/keyboards/malevolti/lyra/rev1/rules.mk
+++ b/keyboards/malevolti/lyra/rev1/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json
deleted file mode 100644
index 86637d4b680..00000000000
--- a/keyboards/manta60/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "keyboard_name": "manta60",
- "manufacturer": "kamonanban",
- "url": "https://github.com/KamoNanban",
- "maintainer": "kamonanban",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x991D",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "rgblight": {
- "saturation_steps": 8,
- "led_count": 68,
- "split_count": [34, 34],
- "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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [5, 6], "x": 10, "y": 0},
- {"matrix": [5, 5], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0},
- {"matrix": [5, 3], "x": 13, "y": 0},
- {"matrix": [5, 2], "x": 14, "y": 0},
- {"matrix": [5, 1], "x": 15, "y": 0},
- {"matrix": [5, 0], "x": 16, "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": [6, 6], "x": 10, "y": 1},
- {"matrix": [6, 5], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1},
- {"matrix": [6, 3], "x": 13, "y": 1},
- {"matrix": [6, 2], "x": 14, "y": 1},
- {"matrix": [6, 1], "x": 15, "y": 1},
- {"matrix": [6, 0], "x": 16, "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": [7, 6], "x": 10, "y": 2},
- {"matrix": [7, 5], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2},
- {"matrix": [7, 3], "x": 13, "y": 2},
- {"matrix": [7, 2], "x": 14, "y": 2},
- {"matrix": [7, 1], "x": 15, "y": 2},
- {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 3], "x": 13, "y": 3},
- {"matrix": [8, 2], "x": 14, "y": 3},
- {"matrix": [8, 1], "x": 15, "y": 3},
- {"matrix": [8, 0], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 4, "y": 4},
- {"matrix": [4, 3], "x": 5, "y": 4.25},
- {"matrix": [4, 4], "x": 6, "y": 3.5, "h": 2},
- {"matrix": [4, 5], "x": 7, "y": 3.5},
- {"matrix": [4, 6], "x": 7, "y": 4.5},
-
- {"matrix": [9, 6], "x": 9, "y": 4.5},
- {"matrix": [9, 5], "x": 9, "y": 3.5},
- {"matrix": [9, 4], "x": 10, "y": 3.5, "h": 2},
- {"matrix": [9, 3], "x": 11, "y": 4.25},
- {"matrix": [9, 2], "x": 12, "y": 4},
- {"matrix": [9, 1], "x": 15, "y": 4},
- {"matrix": [9, 0], "x": 16, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/manta60/keyboard.json b/keyboards/manta60/keyboard.json
new file mode 100644
index 00000000000..8482970b9b2
--- /dev/null
+++ b/keyboards/manta60/keyboard.json
@@ -0,0 +1,134 @@
+{
+ "keyboard_name": "manta60",
+ "manufacturer": "kamonanban",
+ "url": "https://github.com/KamoNanban",
+ "maintainer": "kamonanban",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x991D",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": false,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "led_count": 68,
+ "split_count": [34, 34],
+ "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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 6], "x": 10, "y": 0},
+ {"matrix": [5, 5], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 2], "x": 14, "y": 0},
+ {"matrix": [5, 1], "x": 15, "y": 0},
+ {"matrix": [5, 0], "x": 16, "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": [6, 6], "x": 10, "y": 1},
+ {"matrix": [6, 5], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 2], "x": 14, "y": 1},
+ {"matrix": [6, 1], "x": 15, "y": 1},
+ {"matrix": [6, 0], "x": 16, "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": [7, 6], "x": 10, "y": 2},
+ {"matrix": [7, 5], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 2], "x": 14, "y": 2},
+ {"matrix": [7, 1], "x": 15, "y": 2},
+ {"matrix": [7, 0], "x": 16, "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": [8, 5], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 2], "x": 14, "y": 3},
+ {"matrix": [8, 1], "x": 15, "y": 3},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 4, "y": 4},
+ {"matrix": [4, 3], "x": 5, "y": 4.25},
+ {"matrix": [4, 4], "x": 6, "y": 3.5, "h": 2},
+ {"matrix": [4, 5], "x": 7, "y": 3.5},
+ {"matrix": [4, 6], "x": 7, "y": 4.5},
+
+ {"matrix": [9, 6], "x": 9, "y": 4.5},
+ {"matrix": [9, 5], "x": 9, "y": 3.5},
+ {"matrix": [9, 4], "x": 10, "y": 3.5, "h": 2},
+ {"matrix": [9, 3], "x": 11, "y": 4.25},
+ {"matrix": [9, 2], "x": 12, "y": 4},
+ {"matrix": [9, 1], "x": 15, "y": 4},
+ {"matrix": [9, 0], "x": 16, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/manta60/rules.mk b/keyboards/manta60/rules.mk
deleted file mode 100644
index 31ff5c952c5..00000000000
--- a/keyboards/manta60/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 = no # Audio control and System control
-CONSOLE_ENABLE = no # 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 = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
-IOS_DEVICE_ENABLE = no # connect to IOS device (iPad, iPhone)
diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
index 2b77267da81..6b680418df3 100644
--- a/keyboards/maple_computing/lets_split_eh/eh/info.json
+++ b/keyboards/maple_computing/lets_split_eh/eh/info.json
@@ -36,6 +36,7 @@
"pin": "B2"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/maple_computing/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk
index 4c5d9f9e5d4..8e8d4c13b6c 100644
--- a/keyboards/maple_computing/lets_split_eh/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = maple_computing/lets_split_eh/eh
diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
index e42ec5a08df..6f3a0dd1fca 100644
--- a/keyboards/maple_computing/minidox/rev1/info.json
+++ b/keyboards/maple_computing/minidox/rev1/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/maple_computing/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk
index 4cf751c4931..64efe315122 100644
--- a/keyboards/maple_computing/minidox/rules.mk
+++ b/keyboards/maple_computing/minidox/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = maple_computing/minidox/rev1
diff --git a/keyboards/marksard/rhymestone/rev1/keyboard.json b/keyboards/marksard/rhymestone/rev1/keyboard.json
index bc474f08817..31eb063c030 100644
--- a/keyboards/marksard/rhymestone/rev1/keyboard.json
+++ b/keyboards/marksard/rhymestone/rev1/keyboard.json
@@ -22,6 +22,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk
index 6f15328b5a4..477a0a7da73 100644
--- a/keyboards/marksard/rhymestone/rules.mk
+++ b/keyboards/marksard/rhymestone/rules.mk
@@ -10,7 +10,6 @@ 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
-SPLIT_KEYBOARD = yes
RGB_MATRIX_ENABLE = no
DEFAULT_FOLDER = marksard/rhymestone/rev1
diff --git a/keyboards/marksard/treadstone48/rev1/keyboard.json b/keyboards/marksard/treadstone48/rev1/keyboard.json
index 5c13e5b15c5..07ad96140d9 100644
--- a/keyboards/marksard/treadstone48/rev1/keyboard.json
+++ b/keyboards/marksard/treadstone48/rev1/keyboard.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
diff --git a/keyboards/marksard/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk
index d29d9074a01..3bbd2614291 100644
--- a/keyboards/marksard/treadstone48/rev2/rules.mk
+++ b/keyboards/marksard/treadstone48/rev2/rules.mk
@@ -1 +1 @@
-SPLIT_KEYBOARD = no
+# File intentionally blank
diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
index e9a2de4c251..dddb6f07296 100644
--- a/keyboards/marksard/treadstone48/rules.mk
+++ b/keyboards/marksard/treadstone48/rules.mk
@@ -8,7 +8,6 @@ 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
-SPLIT_KEYBOARD = yes
MOUSEKEY_ENABLE = yes # Mouse keys
diff --git a/keyboards/mechstudio/chapter1/info.json b/keyboards/mechstudio/chapter1/info.json
new file mode 100644
index 00000000000..7f761a2e119
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/info.json
@@ -0,0 +1,402 @@
+{
+ "manufacturer": "Mech Studio",
+ "keyboard_name": "Chapter 1",
+ "maintainer": "Cheezi0747",
+ "bootloader": "qmk-dfu",
+ "bootmagic": {
+ "matrix": [1, 0]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F6", "pin_b": "F7"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "caps_word": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B3", "F4", "F5", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+ "rows": ["F1", "F0", "E6", "B1", "B2"]
+ },
+ "processor": "atmega32u4",
+ "qmk_lufa_bootloader": {
+ "esc_input": "B3",
+ "esc_output": "F1"
+ },
+ "url": "https://rooke.myportfolio.com/chapter-165-1",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x0006",
+ "vid": "0x4D53"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+ {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0},
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+ {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+ {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+ {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+ {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0},
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+ {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+ {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+ {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+ {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+ ]
+ },
+ "LAYOUT_65_iso_blocker": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+ {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0},
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "ISO \\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+ {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+ {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+ {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+ {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+ ]
+ },
+ "LAYOUT_65_iso_blocker_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0},
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "ISO \\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+ {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+ {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+ {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+ {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Encoder", "matrix": [0, 15], "x": 15.5, "y": 0},
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page up", "matrix": [1, 15], "x": 15.5, "y": 1},
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 1},
+ {"label": "Page Down", "matrix": [2, 15], "x": 15.5, "y": 2},
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Up", "matrix": [3, 14], "x": 14.25, "y": 3.25},
+ {"label": "Fn", "matrix": [3, 15], "x": 15.5, "y": 3},
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.25},
+ {"label": "Left", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+ {"label": "Down", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+ {"label": "Right", "matrix": [4, 15], "x": 15.25, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mechstudio/chapter1/keymaps/default/keymap.c b/keyboards/mechstudio/chapter1/keymaps/default/keymap.c
new file mode 100644
index 00000000000..38508b2b031
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2024 Linus Sjölinder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSLS, KC_DEL, KC_MPLY,
+ KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
+ KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , KC_PGDN,
+ KC_LSFT, KC_NUBS, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP, _______,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RCTL , KC_LEFT, KC_DOWN, KC_RGHT)
+};
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = {ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)}
+};
+#endif
diff --git a/keyboards/mechstudio/chapter1/keymaps/default/rules.mk b/keyboards/mechstudio/chapter1/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechstudio/chapter1/keymaps/via/keymap.c b/keyboards/mechstudio/chapter1/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6811aca06c6
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2024 Linus Sjölinder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSLS, KC_DEL, KC_MPLY,
+ KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
+ KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT , KC_PGDN,
+ KC_LSFT, KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP, _______,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RCTL , KC_LEFT, KC_DOWN, KC_RGHT)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = {ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)}
+};
+#endif
diff --git a/keyboards/mechstudio/chapter1/keymaps/via/rules.mk b/keyboards/mechstudio/chapter1/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/mechstudio/chapter1/readme.md b/keyboards/mechstudio/chapter1/readme.md
new file mode 100644
index 00000000000..eb52f8eb49a
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/readme.md
@@ -0,0 +1,29 @@
+# Chapter 1
+
+A exploded 65% with a rotary encoder designed by Rooke Design
+
+
+
+## Support
+
+- Keyboard Maintainer: [Cheezi](https://github.com/cheezi747)
+- Hardware Supported: Chapter-1
+- Hardware Availability: [Rooke Design](https://rooke.myportfolio.com/chapter-165-1)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechstudio/chapter1:default
+
+Flashing example for this keyboard:
+
+ make mechstudio/chapter1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+- **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/mechstudio/chapter1/rules.mk b/keyboards/mechstudio/chapter1/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/mechstudio/chapter1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index 7289147e6b5..ccc2d02b637 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -22,6 +22,7 @@
"tap_keycode_delay": 10
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D3",
"transport": {
"sync": {
diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk
index 875d4311681..1a9045155ba 100644
--- a/keyboards/mechwild/mokulua/mirrored/rules.mk
+++ b/keyboards/mechwild/mokulua/mirrored/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable encoder
OLED_ENABLE = yes # Enable OLED Screen
-SPLIT_KEYBOARD = yes # Define split functionality
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index da82447980f..5b22023cce3 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -22,6 +22,7 @@
"tap_keycode_delay": 10
},
"split": {
+ "enabled": true
"soft_serial_pin": "D3",
"transport": {
"sync": {
diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk
index 875d4311681..1a9045155ba 100644
--- a/keyboards/mechwild/mokulua/standard/rules.mk
+++ b/keyboards/mechwild/mokulua/standard/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable encoder
OLED_ENABLE = yes # Enable OLED Screen
-SPLIT_KEYBOARD = yes # Define split functionality
diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/info.json
deleted file mode 100644
index 67a4a004d62..00000000000
--- a/keyboards/melgeek/mj61/rev1/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
- "rows": ["B12", "B11", "B10", "B1", "A3"]
- },
- "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj61/rev1/keyboard.json b/keyboards/melgeek/mj61/rev1/keyboard.json
new file mode 100644
index 00000000000..e0bd315865d
--- /dev/null
+++ b/keyboards/melgeek/mj61/rev1/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+ "rows": ["B12", "B11", "B10", "B1", "A3"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk
deleted file mode 100644
index c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj61/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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj61/rev2/info.json
deleted file mode 100644
index 62c58271177..00000000000
--- a/keyboards/melgeek/mj61/rev2/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
- "rows": ["B12", "B11", "B10", "B1", "A3"]
- },
- "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj61/rev2/keyboard.json b/keyboards/melgeek/mj61/rev2/keyboard.json
new file mode 100644
index 00000000000..779cfc091c8
--- /dev/null
+++ b/keyboards/melgeek/mj61/rev2/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+ "rows": ["B12", "B11", "B10", "B1", "A3"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk
deleted file mode 100644
index c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj61/rev2/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
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj63/rev1/info.json
deleted file mode 100644
index 67a4a004d62..00000000000
--- a/keyboards/melgeek/mj63/rev1/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
- "rows": ["B12", "B11", "B10", "B1", "A3"]
- },
- "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj63/rev1/keyboard.json b/keyboards/melgeek/mj63/rev1/keyboard.json
new file mode 100644
index 00000000000..e0bd315865d
--- /dev/null
+++ b/keyboards/melgeek/mj63/rev1/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+ "rows": ["B12", "B11", "B10", "B1", "A3"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj63/rev1/rules.mk b/keyboards/melgeek/mj63/rev1/rules.mk
deleted file mode 100644
index c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj63/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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj63/rev2/info.json
deleted file mode 100644
index 62c58271177..00000000000
--- a/keyboards/melgeek/mj63/rev2/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
- "rows": ["B12", "B11", "B10", "B1", "A3"]
- },
- "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj63/rev2/keyboard.json b/keyboards/melgeek/mj63/rev2/keyboard.json
new file mode 100644
index 00000000000..779cfc091c8
--- /dev/null
+++ b/keyboards/melgeek/mj63/rev2/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+ "rows": ["B12", "B11", "B10", "B1", "A3"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj63/rev2/rules.mk b/keyboards/melgeek/mj63/rev2/rules.mk
deleted file mode 100644
index c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj63/rev2/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
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json
deleted file mode 100644
index 67a4a004d62..00000000000
--- a/keyboards/melgeek/mj64/rev1/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
- "rows": ["B12", "B11", "B10", "B1", "A3"]
- },
- "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj64/rev1/keyboard.json b/keyboards/melgeek/mj64/rev1/keyboard.json
new file mode 100644
index 00000000000..e0bd315865d
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev1/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+ "rows": ["B12", "B11", "B10", "B1", "A3"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj64/rev1/rules.mk b/keyboards/melgeek/mj64/rev1/rules.mk
deleted file mode 100644
index c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj64/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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json
deleted file mode 100644
index 67a4a004d62..00000000000
--- a/keyboards/melgeek/mj64/rev2/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
- "rows": ["B12", "B11", "B10", "B1", "A3"]
- },
- "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj64/rev2/keyboard.json b/keyboards/melgeek/mj64/rev2/keyboard.json
new file mode 100644
index 00000000000..e0bd315865d
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev2/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+ "rows": ["B12", "B11", "B10", "B1", "A3"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj64/rev2/rules.mk b/keyboards/melgeek/mj64/rev2/rules.mk
deleted file mode 100644
index c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj64/rev2/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
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json
deleted file mode 100644
index 62c58271177..00000000000
--- a/keyboards/melgeek/mj64/rev3/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
- "rows": ["B12", "B11", "B10", "B1", "A3"]
- },
- "diode_direction": "COL2ROW"
-}
diff --git a/keyboards/melgeek/mj64/rev3/keyboard.json b/keyboards/melgeek/mj64/rev3/keyboard.json
new file mode 100644
index 00000000000..779cfc091c8
--- /dev/null
+++ b/keyboards/melgeek/mj64/rev3/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
+ "rows": ["B12", "B11", "B10", "B1", "A3"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/melgeek/mj64/rev3/rules.mk b/keyboards/melgeek/mj64/rev3/rules.mk
deleted file mode 100644
index c66b1abcd45..00000000000
--- a/keyboards/melgeek/mj64/rev3/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
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
deleted file mode 100644
index 9c120b92247..00000000000
--- a/keyboards/merge/um70/info.json
+++ /dev/null
@@ -1,411 +0,0 @@
-{
- "keyboard_name": "UM-70",
- "manufacturer": "Merge",
- "url": "https://mergedesign.store/um-70",
- "maintainer": "duoshock",
- "usb": {
- "vid": "0x4D65",
- "pid": "0x3222",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
- "rows": ["B0", "B1", "B2", "B3", "B7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "B5"}
- ]
- },
- "split": {
- "soft_serial_pin": "D2"
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgb_matrix": {
- "driver": "ws2812",
- "split_count": [39, 44]
- },
- "rgblight": {
- "led_count": 83,
- "max_brightness": 150,
- "sleep": true,
- "split_count": [39, 44]
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_rspace_2u_bksp": {
- "layout": [
- {"matrix": [0, 0], "x": 1.5, "y": 0},
- {"matrix": [0, 1], "x": 2.5, "y": 0},
- {"matrix": [0, 2], "x": 3.5, "y": 0},
- {"matrix": [0, 3], "x": 4.5, "y": 0},
- {"matrix": [0, 4], "x": 5.5, "y": 0},
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
-
- {"matrix": [5, 0], "x": 9.25, "y": 0},
- {"matrix": [5, 1], "x": 10.25, "y": 0},
- {"matrix": [5, 2], "x": 11.25, "y": 0},
- {"matrix": [5, 3], "x": 12.25, "y": 0},
- {"matrix": [5, 4], "x": 13.25, "y": 0},
- {"matrix": [5, 5], "x": 14.25, "y": 0},
- {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
-
- {"matrix": [7, 7], "x": 17.75, "y": 0},
-
- {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 3, "y": 1},
- {"matrix": [1, 2], "x": 4, "y": 1},
- {"matrix": [1, 3], "x": 5, "y": 1},
- {"matrix": [1, 4], "x": 6, "y": 1},
- {"matrix": [1, 5], "x": 7, "y": 1},
-
- {"matrix": [6, 0], "x": 8.75, "y": 1},
- {"matrix": [6, 1], "x": 9.75, "y": 1},
- {"matrix": [6, 2], "x": 10.75, "y": 1},
- {"matrix": [6, 3], "x": 11.75, "y": 1},
- {"matrix": [6, 4], "x": 12.75, "y": 1},
- {"matrix": [6, 5], "x": 13.75, "y": 1},
- {"matrix": [6, 6], "x": 14.75, "y": 1},
- {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-
- {"matrix": [8, 7], "x": 17.75, "y": 1},
-
- {"matrix": [4, 5], "x": 0, "y": 2},
-
- {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 3.25, "y": 2},
- {"matrix": [2, 2], "x": 4.25, "y": 2},
- {"matrix": [2, 3], "x": 5.25, "y": 2},
- {"matrix": [2, 4], "x": 6.25, "y": 2},
- {"matrix": [2, 5], "x": 7.25, "y": 2},
-
- {"matrix": [7, 0], "x": 9, "y": 2},
- {"matrix": [7, 1], "x": 10, "y": 2},
- {"matrix": [7, 2], "x": 11, "y": 2},
- {"matrix": [7, 3], "x": 12, "y": 2},
- {"matrix": [7, 4], "x": 13, "y": 2},
- {"matrix": [7, 5], "x": 14, "y": 2},
- {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
-
- {"matrix": [9, 7], "x": 17.75, "y": 2},
-
- {"matrix": [4, 6], "x": 0, "y": 3},
-
- {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 3.75, "y": 3},
- {"matrix": [3, 2], "x": 4.75, "y": 3},
- {"matrix": [3, 3], "x": 5.75, "y": 3},
- {"matrix": [3, 4], "x": 6.75, "y": 3},
- {"matrix": [3, 5], "x": 7.75, "y": 3},
-
- {"matrix": [8, 0], "x": 9.5, "y": 3},
- {"matrix": [8, 1], "x": 10.5, "y": 3},
- {"matrix": [8, 2], "x": 11.5, "y": 3},
- {"matrix": [8, 3], "x": 12.5, "y": 3},
- {"matrix": [8, 4], "x": 13.5, "y": 3},
- {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-
- {"matrix": [8, 6], "x": 16.5, "y": 3.25},
-
- {"matrix": [4, 7], "x": 0, "y": 4},
-
- {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-
- {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
- {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
-
- {"matrix": [9, 3], "x": 15.5, "y": 4.25},
- {"matrix": [9, 4], "x": 16.5, "y": 4.25},
- {"matrix": [9, 5], "x": 17.5, "y": 4.25}
- ]
- },
- "LAYOUT_rspace_split_bksp": {
- "layout": [
- {"matrix": [0, 0], "x": 1.5, "y": 0},
- {"matrix": [0, 1], "x": 2.5, "y": 0},
- {"matrix": [0, 2], "x": 3.5, "y": 0},
- {"matrix": [0, 3], "x": 4.5, "y": 0},
- {"matrix": [0, 4], "x": 5.5, "y": 0},
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
-
- {"matrix": [5, 0], "x": 9.25, "y": 0},
- {"matrix": [5, 1], "x": 10.25, "y": 0},
- {"matrix": [5, 2], "x": 11.25, "y": 0},
- {"matrix": [5, 3], "x": 12.25, "y": 0},
- {"matrix": [5, 4], "x": 13.25, "y": 0},
- {"matrix": [5, 5], "x": 14.25, "y": 0},
- {"matrix": [5, 6], "x": 15.25, "y": 0},
- {"matrix": [5, 7], "x": 16.25, "y": 0},
-
- {"matrix": [7, 7], "x": 17.75, "y": 0},
-
- {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 3, "y": 1},
- {"matrix": [1, 2], "x": 4, "y": 1},
- {"matrix": [1, 3], "x": 5, "y": 1},
- {"matrix": [1, 4], "x": 6, "y": 1},
- {"matrix": [1, 5], "x": 7, "y": 1},
-
- {"matrix": [6, 0], "x": 8.75, "y": 1},
- {"matrix": [6, 1], "x": 9.75, "y": 1},
- {"matrix": [6, 2], "x": 10.75, "y": 1},
- {"matrix": [6, 3], "x": 11.75, "y": 1},
- {"matrix": [6, 4], "x": 12.75, "y": 1},
- {"matrix": [6, 5], "x": 13.75, "y": 1},
- {"matrix": [6, 6], "x": 14.75, "y": 1},
- {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-
- {"matrix": [8, 7], "x": 17.75, "y": 1},
-
- {"matrix": [4, 5], "x": 0, "y": 2},
-
- {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 3.25, "y": 2},
- {"matrix": [2, 2], "x": 4.25, "y": 2},
- {"matrix": [2, 3], "x": 5.25, "y": 2},
- {"matrix": [2, 4], "x": 6.25, "y": 2},
- {"matrix": [2, 5], "x": 7.25, "y": 2},
-
- {"matrix": [7, 0], "x": 9, "y": 2},
- {"matrix": [7, 1], "x": 10, "y": 2},
- {"matrix": [7, 2], "x": 11, "y": 2},
- {"matrix": [7, 3], "x": 12, "y": 2},
- {"matrix": [7, 4], "x": 13, "y": 2},
- {"matrix": [7, 5], "x": 14, "y": 2},
- {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
-
- {"matrix": [9, 7], "x": 17.75, "y": 2},
-
- {"matrix": [4, 6], "x": 0, "y": 3},
-
- {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 3.75, "y": 3},
- {"matrix": [3, 2], "x": 4.75, "y": 3},
- {"matrix": [3, 3], "x": 5.75, "y": 3},
- {"matrix": [3, 4], "x": 6.75, "y": 3},
- {"matrix": [3, 5], "x": 7.75, "y": 3},
-
- {"matrix": [8, 0], "x": 9.5, "y": 3},
- {"matrix": [8, 1], "x": 10.5, "y": 3},
- {"matrix": [8, 2], "x": 11.5, "y": 3},
- {"matrix": [8, 3], "x": 12.5, "y": 3},
- {"matrix": [8, 4], "x": 13.5, "y": 3},
- {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-
- {"matrix": [8, 6], "x": 16.5, "y": 3.25},
-
- {"matrix": [4, 7], "x": 0, "y": 4},
-
- {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
-
- {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
- {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
-
- {"matrix": [9, 3], "x": 15.5, "y": 4.25},
- {"matrix": [9, 4], "x": 16.5, "y": 4.25},
- {"matrix": [9, 5], "x": 17.5, "y": 4.25}
- ]
- },
- "LAYOUT_lspace_2u_bksp": {
- "layout": [
- {"matrix": [0, 0], "x": 1.5, "y": 0},
- {"matrix": [0, 1], "x": 2.5, "y": 0},
- {"matrix": [0, 2], "x": 3.5, "y": 0},
- {"matrix": [0, 3], "x": 4.5, "y": 0},
- {"matrix": [0, 4], "x": 5.5, "y": 0},
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
-
- {"matrix": [5, 0], "x": 9.25, "y": 0},
- {"matrix": [5, 1], "x": 10.25, "y": 0},
- {"matrix": [5, 2], "x": 11.25, "y": 0},
- {"matrix": [5, 3], "x": 12.25, "y": 0},
- {"matrix": [5, 4], "x": 13.25, "y": 0},
- {"matrix": [5, 5], "x": 14.25, "y": 0},
- {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
-
- {"matrix": [7, 7], "x": 17.75, "y": 0},
-
- {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 3, "y": 1},
- {"matrix": [1, 2], "x": 4, "y": 1},
- {"matrix": [1, 3], "x": 5, "y": 1},
- {"matrix": [1, 4], "x": 6, "y": 1},
- {"matrix": [1, 5], "x": 7, "y": 1},
-
- {"matrix": [6, 0], "x": 8.75, "y": 1},
- {"matrix": [6, 1], "x": 9.75, "y": 1},
- {"matrix": [6, 2], "x": 10.75, "y": 1},
- {"matrix": [6, 3], "x": 11.75, "y": 1},
- {"matrix": [6, 4], "x": 12.75, "y": 1},
- {"matrix": [6, 5], "x": 13.75, "y": 1},
- {"matrix": [6, 6], "x": 14.75, "y": 1},
- {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-
- {"matrix": [8, 7], "x": 17.75, "y": 1},
-
- {"matrix": [4, 5], "x": 0, "y": 2},
-
- {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 3.25, "y": 2},
- {"matrix": [2, 2], "x": 4.25, "y": 2},
- {"matrix": [2, 3], "x": 5.25, "y": 2},
- {"matrix": [2, 4], "x": 6.25, "y": 2},
- {"matrix": [2, 5], "x": 7.25, "y": 2},
-
- {"matrix": [7, 0], "x": 9, "y": 2},
- {"matrix": [7, 1], "x": 10, "y": 2},
- {"matrix": [7, 2], "x": 11, "y": 2},
- {"matrix": [7, 3], "x": 12, "y": 2},
- {"matrix": [7, 4], "x": 13, "y": 2},
- {"matrix": [7, 5], "x": 14, "y": 2},
- {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
-
- {"matrix": [9, 7], "x": 17.75, "y": 2},
-
- {"matrix": [4, 6], "x": 0, "y": 3},
-
- {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 3.75, "y": 3},
- {"matrix": [3, 2], "x": 4.75, "y": 3},
- {"matrix": [3, 3], "x": 5.75, "y": 3},
- {"matrix": [3, 4], "x": 6.75, "y": 3},
- {"matrix": [3, 5], "x": 7.75, "y": 3},
-
- {"matrix": [8, 0], "x": 9.5, "y": 3},
- {"matrix": [8, 1], "x": 10.5, "y": 3},
- {"matrix": [8, 2], "x": 11.5, "y": 3},
- {"matrix": [8, 3], "x": 12.5, "y": 3},
- {"matrix": [8, 4], "x": 13.5, "y": 3},
- {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-
- {"matrix": [8, 6], "x": 16.5, "y": 3.25},
-
- {"matrix": [4, 7], "x": 0, "y": 4},
-
- {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
- {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
-
- {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
- {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
-
- {"matrix": [9, 3], "x": 15.5, "y": 4.25},
- {"matrix": [9, 4], "x": 16.5, "y": 4.25},
- {"matrix": [9, 5], "x": 17.5, "y": 4.25}
- ]
- },
- "LAYOUT_lspace_split_bksp": {
- "layout": [
- {"matrix": [0, 0], "x": 1.5, "y": 0},
- {"matrix": [0, 1], "x": 2.5, "y": 0},
- {"matrix": [0, 2], "x": 3.5, "y": 0},
- {"matrix": [0, 3], "x": 4.5, "y": 0},
- {"matrix": [0, 4], "x": 5.5, "y": 0},
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
-
- {"matrix": [5, 0], "x": 9.25, "y": 0},
- {"matrix": [5, 1], "x": 10.25, "y": 0},
- {"matrix": [5, 2], "x": 11.25, "y": 0},
- {"matrix": [5, 3], "x": 12.25, "y": 0},
- {"matrix": [5, 4], "x": 13.25, "y": 0},
- {"matrix": [5, 5], "x": 14.25, "y": 0},
- {"matrix": [5, 6], "x": 15.25, "y": 0},
- {"matrix": [5, 7], "x": 16.25, "y": 0},
-
- {"matrix": [7, 7], "x": 17.75, "y": 0},
-
- {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 3, "y": 1},
- {"matrix": [1, 2], "x": 4, "y": 1},
- {"matrix": [1, 3], "x": 5, "y": 1},
- {"matrix": [1, 4], "x": 6, "y": 1},
- {"matrix": [1, 5], "x": 7, "y": 1},
-
- {"matrix": [6, 0], "x": 8.75, "y": 1},
- {"matrix": [6, 1], "x": 9.75, "y": 1},
- {"matrix": [6, 2], "x": 10.75, "y": 1},
- {"matrix": [6, 3], "x": 11.75, "y": 1},
- {"matrix": [6, 4], "x": 12.75, "y": 1},
- {"matrix": [6, 5], "x": 13.75, "y": 1},
- {"matrix": [6, 6], "x": 14.75, "y": 1},
- {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
-
- {"matrix": [8, 7], "x": 17.75, "y": 1},
-
- {"matrix": [4, 5], "x": 0, "y": 2},
-
- {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 3.25, "y": 2},
- {"matrix": [2, 2], "x": 4.25, "y": 2},
- {"matrix": [2, 3], "x": 5.25, "y": 2},
- {"matrix": [2, 4], "x": 6.25, "y": 2},
- {"matrix": [2, 5], "x": 7.25, "y": 2},
-
- {"matrix": [7, 0], "x": 9, "y": 2},
- {"matrix": [7, 1], "x": 10, "y": 2},
- {"matrix": [7, 2], "x": 11, "y": 2},
- {"matrix": [7, 3], "x": 12, "y": 2},
- {"matrix": [7, 4], "x": 13, "y": 2},
- {"matrix": [7, 5], "x": 14, "y": 2},
- {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
-
- {"matrix": [9, 7], "x": 17.75, "y": 2},
-
- {"matrix": [4, 6], "x": 0, "y": 3},
-
- {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 3.75, "y": 3},
- {"matrix": [3, 2], "x": 4.75, "y": 3},
- {"matrix": [3, 3], "x": 5.75, "y": 3},
- {"matrix": [3, 4], "x": 6.75, "y": 3},
- {"matrix": [3, 5], "x": 7.75, "y": 3},
-
- {"matrix": [8, 0], "x": 9.5, "y": 3},
- {"matrix": [8, 1], "x": 10.5, "y": 3},
- {"matrix": [8, 2], "x": 11.5, "y": 3},
- {"matrix": [8, 3], "x": 12.5, "y": 3},
- {"matrix": [8, 4], "x": 13.5, "y": 3},
- {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
-
- {"matrix": [8, 6], "x": 16.5, "y": 3.25},
-
- {"matrix": [4, 7], "x": 0, "y": 4},
-
- {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
- {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
-
- {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
- {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
-
- {"matrix": [9, 3], "x": 15.5, "y": 4.25},
- {"matrix": [9, 4], "x": 16.5, "y": 4.25},
- {"matrix": [9, 5], "x": 17.5, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/merge/um70/keyboard.json b/keyboards/merge/um70/keyboard.json
new file mode 100644
index 00000000000..c349abc7881
--- /dev/null
+++ b/keyboards/merge/um70/keyboard.json
@@ -0,0 +1,423 @@
+{
+ "keyboard_name": "UM-70",
+ "manufacturer": "Merge",
+ "url": "https://mergedesign.store/um-70",
+ "maintainer": "duoshock",
+ "usb": {
+ "vid": "0x4D65",
+ "pid": "0x3222",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
+ "rows": ["B0", "B1", "B2", "B3", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgb_matrix": {
+ "driver": "ws2812",
+ "split_count": [39, 44]
+ },
+ "rgblight": {
+ "led_count": 83,
+ "max_brightness": 150,
+ "sleep": true,
+ "split_count": [39, 44]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_rspace_2u_bksp": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.25, "y": 0},
+ {"matrix": [5, 1], "x": 10.25, "y": 0},
+ {"matrix": [5, 2], "x": 11.25, "y": 0},
+ {"matrix": [5, 3], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 5], "x": 14.25, "y": 0},
+ {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 8.75, "y": 1},
+ {"matrix": [6, 1], "x": 9.75, "y": 1},
+ {"matrix": [6, 2], "x": 10.75, "y": 1},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 4], "x": 12.75, "y": 1},
+ {"matrix": [6, 5], "x": 13.75, "y": 1},
+ {"matrix": [6, 6], "x": 14.75, "y": 1},
+ {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+ {"matrix": [4, 5], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 5], "x": 14, "y": 2},
+ {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+ {"matrix": [4, 6], "x": 0, "y": 3},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 3.75, "y": 3},
+ {"matrix": [3, 2], "x": 4.75, "y": 3},
+ {"matrix": [3, 3], "x": 5.75, "y": 3},
+ {"matrix": [3, 4], "x": 6.75, "y": 3},
+ {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 3},
+ {"matrix": [8, 1], "x": 10.5, "y": 3},
+ {"matrix": [8, 2], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+ ]
+ },
+ "LAYOUT_rspace_split_bksp": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.25, "y": 0},
+ {"matrix": [5, 1], "x": 10.25, "y": 0},
+ {"matrix": [5, 2], "x": 11.25, "y": 0},
+ {"matrix": [5, 3], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 5], "x": 14.25, "y": 0},
+ {"matrix": [5, 6], "x": 15.25, "y": 0},
+ {"matrix": [5, 7], "x": 16.25, "y": 0},
+
+ {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 8.75, "y": 1},
+ {"matrix": [6, 1], "x": 9.75, "y": 1},
+ {"matrix": [6, 2], "x": 10.75, "y": 1},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 4], "x": 12.75, "y": 1},
+ {"matrix": [6, 5], "x": 13.75, "y": 1},
+ {"matrix": [6, 6], "x": 14.75, "y": 1},
+ {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+ {"matrix": [4, 5], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 5], "x": 14, "y": 2},
+ {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+ {"matrix": [4, 6], "x": 0, "y": 3},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 3.75, "y": 3},
+ {"matrix": [3, 2], "x": 4.75, "y": 3},
+ {"matrix": [3, 3], "x": 5.75, "y": 3},
+ {"matrix": [3, 4], "x": 6.75, "y": 3},
+ {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 3},
+ {"matrix": [8, 1], "x": 10.5, "y": 3},
+ {"matrix": [8, 2], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+ ]
+ },
+ "LAYOUT_lspace_2u_bksp": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.25, "y": 0},
+ {"matrix": [5, 1], "x": 10.25, "y": 0},
+ {"matrix": [5, 2], "x": 11.25, "y": 0},
+ {"matrix": [5, 3], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 5], "x": 14.25, "y": 0},
+ {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2},
+
+ {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 8.75, "y": 1},
+ {"matrix": [6, 1], "x": 9.75, "y": 1},
+ {"matrix": [6, 2], "x": 10.75, "y": 1},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 4], "x": 12.75, "y": 1},
+ {"matrix": [6, 5], "x": 13.75, "y": 1},
+ {"matrix": [6, 6], "x": 14.75, "y": 1},
+ {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+ {"matrix": [4, 5], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 5], "x": 14, "y": 2},
+ {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+ {"matrix": [4, 6], "x": 0, "y": 3},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 3.75, "y": 3},
+ {"matrix": [3, 2], "x": 4.75, "y": 3},
+ {"matrix": [3, 3], "x": 5.75, "y": 3},
+ {"matrix": [3, 4], "x": 6.75, "y": 3},
+ {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 3},
+ {"matrix": [8, 1], "x": 10.5, "y": 3},
+ {"matrix": [8, 2], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+ ]
+ },
+ "LAYOUT_lspace_split_bksp": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 3], "x": 4.5, "y": 0},
+ {"matrix": [0, 4], "x": 5.5, "y": 0},
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.25, "y": 0},
+ {"matrix": [5, 1], "x": 10.25, "y": 0},
+ {"matrix": [5, 2], "x": 11.25, "y": 0},
+ {"matrix": [5, 3], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 5], "x": 14.25, "y": 0},
+ {"matrix": [5, 6], "x": 15.25, "y": 0},
+ {"matrix": [5, 7], "x": 16.25, "y": 0},
+
+ {"matrix": [7, 7], "x": 17.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1},
+ {"matrix": [1, 3], "x": 5, "y": 1},
+ {"matrix": [1, 4], "x": 6, "y": 1},
+ {"matrix": [1, 5], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 8.75, "y": 1},
+ {"matrix": [6, 1], "x": 9.75, "y": 1},
+ {"matrix": [6, 2], "x": 10.75, "y": 1},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 4], "x": 12.75, "y": 1},
+ {"matrix": [6, 5], "x": 13.75, "y": 1},
+ {"matrix": [6, 6], "x": 14.75, "y": 1},
+ {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [8, 7], "x": 17.75, "y": 1},
+
+ {"matrix": [4, 5], "x": 0, "y": 2},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 3.25, "y": 2},
+ {"matrix": [2, 2], "x": 4.25, "y": 2},
+ {"matrix": [2, 3], "x": 5.25, "y": 2},
+ {"matrix": [2, 4], "x": 6.25, "y": 2},
+ {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 9, "y": 2},
+ {"matrix": [7, 1], "x": 10, "y": 2},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 5], "x": 14, "y": 2},
+ {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25},
+
+ {"matrix": [9, 7], "x": 17.75, "y": 2},
+
+ {"matrix": [4, 6], "x": 0, "y": 3},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 3.75, "y": 3},
+ {"matrix": [3, 2], "x": 4.75, "y": 3},
+ {"matrix": [3, 3], "x": 5.75, "y": 3},
+ {"matrix": [3, 4], "x": 6.75, "y": 3},
+ {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 9.5, "y": 3},
+ {"matrix": [8, 1], "x": 10.5, "y": 3},
+ {"matrix": [8, 2], "x": 11.5, "y": 3},
+ {"matrix": [8, 3], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 16.5, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 3], "x": 15.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 5], "x": 17.5, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk
deleted file mode 100644
index 11776618e22..00000000000
--- a/keyboards/merge/um70/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
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
deleted file mode 100644
index 554d1997a36..00000000000
--- a/keyboards/merge/um80/info.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "keyboard_name": "UM-80",
- "manufacturer": "Merge",
- "url": "https://mergedesign.store/um-80",
- "maintainer": "duoshock",
- "usb": {
- "vid": "0x4D65",
- "pid": "0x3241",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
- "rows": ["B0", "B1", "B2", "B3", "B7", "C7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "B5"}
- ]
- },
- "split": {
- "soft_serial_pin": "D2"
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgblight": {
- "led_count": 100,
- "max_brightness": 120,
- "sleep": true,
- "split_count": [48, 52]
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_rspace_split_bksp": {
- "layout": [
- {"matrix": [0, 0], "x": 1.5, "y": 0},
-
- {"matrix": [0, 1], "x": 2.75, "y": 0},
- {"matrix": [0, 2], "x": 3.75, "y": 0},
- {"matrix": [0, 3], "x": 4.75, "y": 0},
- {"matrix": [0, 4], "x": 5.75, "y": 0},
-
- {"matrix": [0, 5], "x": 7, "y": 0},
- {"matrix": [0, 6], "x": 8, "y": 0},
-
- {"matrix": [6, 0], "x": 10.25, "y": 0},
- {"matrix": [6, 1], "x": 11.25, "y": 0},
-
- {"matrix": [6, 2], "x": 12.5, "y": 0},
- {"matrix": [6, 3], "x": 13.5, "y": 0},
- {"matrix": [6, 4], "x": 14.5, "y": 0},
- {"matrix": [6, 5], "x": 15.5, "y": 0},
-
- {"matrix": [6, 6], "x": 16.75, "y": 0},
-
- {"matrix": [6, 7], "x": 18.25, "y": 0},
-
- {"matrix": [1, 0], "x": 1.5, "y": 1.25},
- {"matrix": [1, 1], "x": 2.5, "y": 1.25},
- {"matrix": [1, 2], "x": 3.5, "y": 1.25},
- {"matrix": [1, 3], "x": 4.5, "y": 1.25},
- {"matrix": [1, 4], "x": 5.5, "y": 1.25},
- {"matrix": [1, 5], "x": 6.5, "y": 1.25},
- {"matrix": [1, 6], "x": 7.5, "y": 1.25},
-
- {"matrix": [7, 0], "x": 9.75, "y": 1.25},
- {"matrix": [7, 1], "x": 10.75, "y": 1.25},
- {"matrix": [7, 2], "x": 11.75, "y": 1.25},
- {"matrix": [7, 3], "x": 12.75, "y": 1.25},
- {"matrix": [7, 4], "x": 13.75, "y": 1.25},
- {"matrix": [7, 5], "x": 14.75, "y": 1.25},
- {"matrix": [7, 6], "x": 15.75, "y": 1.25},
- {"matrix": [7, 7], "x": 16.75, "y": 1.25},
-
- {"matrix": [9, 7], "x": 18.25, "y": 1.25},
-
- {"matrix": [2, 7], "x": 0, "y": 2.25},
-
- {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 3, "y": 2.25},
- {"matrix": [2, 2], "x": 4, "y": 2.25},
- {"matrix": [2, 3], "x": 5, "y": 2.25},
- {"matrix": [2, 4], "x": 6, "y": 2.25},
- {"matrix": [2, 5], "x": 7, "y": 2.25},
-
- {"matrix": [8, 0], "x": 9.25, "y": 2.25},
- {"matrix": [8, 1], "x": 10.25, "y": 2.25},
- {"matrix": [8, 2], "x": 11.25, "y": 2.25},
- {"matrix": [8, 3], "x": 12.25, "y": 2.25},
- {"matrix": [8, 4], "x": 13.25, "y": 2.25},
- {"matrix": [8, 5], "x": 14.25, "y": 2.25},
- {"matrix": [8, 6], "x": 15.25, "y": 2.25},
- {"matrix": [8, 7], "x": 16.25, "y": 2.25, "w": 1.5},
-
- {"matrix": [10, 7], "x": 18.25, "y": 2.25},
-
- {"matrix": [3, 7], "x": 0, "y": 3.25},
-
- {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 3.25, "y": 3.25},
- {"matrix": [3, 2], "x": 4.25, "y": 3.25},
- {"matrix": [3, 3], "x": 5.25, "y": 3.25},
- {"matrix": [3, 4], "x": 6.25, "y": 3.25},
- {"matrix": [3, 5], "x": 7.25, "y": 3.25},
-
- {"matrix": [9, 0], "x": 9.5, "y": 3.25},
- {"matrix": [9, 1], "x": 10.5, "y": 3.25},
- {"matrix": [9, 2], "x": 11.5, "y": 3.25},
- {"matrix": [9, 3], "x": 12.5, "y": 3.25},
- {"matrix": [9, 4], "x": 13.5, "y": 3.25},
- {"matrix": [9, 5], "x": 14.5, "y": 3.25},
- {"matrix": [9, 6], "x": 15.5, "y": 3.25, "w": 2.25},
-
- {"matrix": [11, 7], "x": 18.25, "y": 3.25},
-
- {"matrix": [4, 7], "x": 0, "y": 4.25},
-
- {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25},
- {"matrix": [4, 1], "x": 3.75, "y": 4.25},
- {"matrix": [4, 2], "x": 4.75, "y": 4.25},
- {"matrix": [4, 3], "x": 5.75, "y": 4.25},
- {"matrix": [4, 4], "x": 6.75, "y": 4.25},
- {"matrix": [4, 5], "x": 7.75, "y": 4.25},
-
- {"matrix": [10, 0], "x": 10, "y": 4.25},
- {"matrix": [10, 1], "x": 11, "y": 4.25},
- {"matrix": [10, 2], "x": 12, "y": 4.25},
- {"matrix": [10, 3], "x": 13, "y": 4.25},
- {"matrix": [10, 4], "x": 14, "y": 4.25},
- {"matrix": [10, 5], "x": 15, "y": 4.25, "w": 1.75},
-
- {"matrix": [11, 6], "x": 17, "y": 4.5},
-
- {"matrix": [5, 7], "x": 0, "y": 5.25},
-
- {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 1], "x": 2.75, "y": 5.25, "w": 1.25},
- {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.25},
- {"matrix": [5, 3], "x": 5.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 4], "x": 6.5, "y": 5.25, "w": 2.25},
-
- {"matrix": [11, 0], "x": 10, "y": 5.25, "w": 2.75},
- {"matrix": [11, 1], "x": 12.75, "y": 5.25, "w": 1.5},
- {"matrix": [11, 2], "x": 14.25, "y": 5.25, "w": 1.5},
-
- {"matrix": [11, 3], "x": 16, "y": 5.5},
- {"matrix": [11, 4], "x": 17, "y": 5.5},
- {"matrix": [11, 5], "x": 18, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/merge/um80/keyboard.json b/keyboards/merge/um80/keyboard.json
new file mode 100644
index 00000000000..5a369877f88
--- /dev/null
+++ b/keyboards/merge/um80/keyboard.json
@@ -0,0 +1,166 @@
+{
+ "keyboard_name": "UM-80",
+ "manufacturer": "Merge",
+ "url": "https://mergedesign.store/um-80",
+ "maintainer": "duoshock",
+ "usb": {
+ "vid": "0x4D65",
+ "pid": "0x3241",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
+ "rows": ["B0", "B1", "B2", "B3", "B7", "C7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgblight": {
+ "led_count": 100,
+ "max_brightness": 120,
+ "sleep": true,
+ "split_count": [48, 52]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_rspace_split_bksp": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1.5, "y": 0},
+
+ {"matrix": [0, 1], "x": 2.75, "y": 0},
+ {"matrix": [0, 2], "x": 3.75, "y": 0},
+ {"matrix": [0, 3], "x": 4.75, "y": 0},
+ {"matrix": [0, 4], "x": 5.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 7, "y": 0},
+ {"matrix": [0, 6], "x": 8, "y": 0},
+
+ {"matrix": [6, 0], "x": 10.25, "y": 0},
+ {"matrix": [6, 1], "x": 11.25, "y": 0},
+
+ {"matrix": [6, 2], "x": 12.5, "y": 0},
+ {"matrix": [6, 3], "x": 13.5, "y": 0},
+ {"matrix": [6, 4], "x": 14.5, "y": 0},
+ {"matrix": [6, 5], "x": 15.5, "y": 0},
+
+ {"matrix": [6, 6], "x": 16.75, "y": 0},
+
+ {"matrix": [6, 7], "x": 18.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 1.25},
+ {"matrix": [1, 1], "x": 2.5, "y": 1.25},
+ {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+ {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+ {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+ {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+ {"matrix": [1, 6], "x": 7.5, "y": 1.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 1.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 1.25},
+ {"matrix": [7, 2], "x": 11.75, "y": 1.25},
+ {"matrix": [7, 3], "x": 12.75, "y": 1.25},
+ {"matrix": [7, 4], "x": 13.75, "y": 1.25},
+ {"matrix": [7, 5], "x": 14.75, "y": 1.25},
+ {"matrix": [7, 6], "x": 15.75, "y": 1.25},
+ {"matrix": [7, 7], "x": 16.75, "y": 1.25},
+
+ {"matrix": [9, 7], "x": 18.25, "y": 1.25},
+
+ {"matrix": [2, 7], "x": 0, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 3, "y": 2.25},
+ {"matrix": [2, 2], "x": 4, "y": 2.25},
+ {"matrix": [2, 3], "x": 5, "y": 2.25},
+ {"matrix": [2, 4], "x": 6, "y": 2.25},
+ {"matrix": [2, 5], "x": 7, "y": 2.25},
+
+ {"matrix": [8, 0], "x": 9.25, "y": 2.25},
+ {"matrix": [8, 1], "x": 10.25, "y": 2.25},
+ {"matrix": [8, 2], "x": 11.25, "y": 2.25},
+ {"matrix": [8, 3], "x": 12.25, "y": 2.25},
+ {"matrix": [8, 4], "x": 13.25, "y": 2.25},
+ {"matrix": [8, 5], "x": 14.25, "y": 2.25},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.25},
+ {"matrix": [8, 7], "x": 16.25, "y": 2.25, "w": 1.5},
+
+ {"matrix": [10, 7], "x": 18.25, "y": 2.25},
+
+ {"matrix": [3, 7], "x": 0, "y": 3.25},
+
+ {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+ {"matrix": [9, 0], "x": 9.5, "y": 3.25},
+ {"matrix": [9, 1], "x": 10.5, "y": 3.25},
+ {"matrix": [9, 2], "x": 11.5, "y": 3.25},
+ {"matrix": [9, 3], "x": 12.5, "y": 3.25},
+ {"matrix": [9, 4], "x": 13.5, "y": 3.25},
+ {"matrix": [9, 5], "x": 14.5, "y": 3.25},
+ {"matrix": [9, 6], "x": 15.5, "y": 3.25, "w": 2.25},
+
+ {"matrix": [11, 7], "x": 18.25, "y": 3.25},
+
+ {"matrix": [4, 7], "x": 0, "y": 4.25},
+
+ {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 3.75, "y": 4.25},
+ {"matrix": [4, 2], "x": 4.75, "y": 4.25},
+ {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+ {"matrix": [4, 4], "x": 6.75, "y": 4.25},
+ {"matrix": [4, 5], "x": 7.75, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 10, "y": 4.25},
+ {"matrix": [10, 1], "x": 11, "y": 4.25},
+ {"matrix": [10, 2], "x": 12, "y": 4.25},
+ {"matrix": [10, 3], "x": 13, "y": 4.25},
+ {"matrix": [10, 4], "x": 14, "y": 4.25},
+ {"matrix": [10, 5], "x": 15, "y": 4.25, "w": 1.75},
+
+ {"matrix": [11, 6], "x": 17, "y": 4.5},
+
+ {"matrix": [5, 7], "x": 0, "y": 5.25},
+
+ {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 2.75, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 3], "x": 5.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 4], "x": 6.5, "y": 5.25, "w": 2.25},
+
+ {"matrix": [11, 0], "x": 10, "y": 5.25, "w": 2.75},
+ {"matrix": [11, 1], "x": 12.75, "y": 5.25, "w": 1.5},
+ {"matrix": [11, 2], "x": 14.25, "y": 5.25, "w": 1.5},
+
+ {"matrix": [11, 3], "x": 16, "y": 5.5},
+ {"matrix": [11, 4], "x": 17, "y": 5.5},
+ {"matrix": [11, 5], "x": 18, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk
deleted file mode 100644
index 11776618e22..00000000000
--- a/keyboards/merge/um80/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
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
index 7de7cd251f1..6413480391e 100644
--- a/keyboards/merge/uma/info.json
+++ b/keyboards/merge/uma/info.json
@@ -22,6 +22,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk
index 8bd01d2bb4c..e146f96ce6f 100644
--- a/keyboards/merge/uma/rules.mk
+++ b/keyboards/merge/uma/rules.mk
@@ -11,6 +11,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
LTO_ENABLE = yes
OLED_ENABLE = yes
diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
deleted file mode 100644
index 55b4591f1fb..00000000000
--- a/keyboards/meson/info.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
- "keyboard_name": "Meson",
- "manufacturer": "Luciano M",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"],
- "rows": ["F7", "C6", "F6", "F5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 10,
- "sleep": true,
- "split_count": [5, 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": {
- "pin": "B5"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [4, 6], "x": 8.5, "y": 0},
- {"matrix": [4, 5], "x": 9.5, "y": 0},
- {"matrix": [4, 4], "x": 10.5, "y": 0},
- {"matrix": [4, 3], "x": 11.5, "y": 0},
- {"matrix": [4, 2], "x": 12.5, "y": 0},
- {"matrix": [4, 1], "x": 13.5, "y": 0},
- {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
- {"matrix": [5, 5], "x": 9.5, "y": 1},
- {"matrix": [5, 4], "x": 10.5, "y": 1},
- {"matrix": [5, 3], "x": 11.5, "y": 1},
- {"matrix": [5, 2], "x": 12.5, "y": 1},
- {"matrix": [5, 1], "x": 13.5, "y": 1},
- {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
- {"matrix": [6, 5], "x": 9.5, "y": 2},
- {"matrix": [6, 4], "x": 10.5, "y": 2},
- {"matrix": [6, 3], "x": 11.5, "y": 2},
- {"matrix": [6, 2], "x": 12.5, "y": 2},
- {"matrix": [6, 1], "x": 13.5, "y": 2},
- {"matrix": [6, 0], "x": 14.5, "y": 2},
-
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3},
- {"matrix": [7, 5], "x": 9.5, "y": 3},
- {"matrix": [7, 4], "x": 10.5, "y": 3}
- ]
- },
- "LAYOUT_2u": {
- "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": [4, 6], "x": 8.5, "y": 0},
- {"matrix": [4, 5], "x": 9.5, "y": 0},
- {"matrix": [4, 4], "x": 10.5, "y": 0},
- {"matrix": [4, 3], "x": 11.5, "y": 0},
- {"matrix": [4, 2], "x": 12.5, "y": 0},
- {"matrix": [4, 1], "x": 13.5, "y": 0},
- {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
- {"matrix": [5, 5], "x": 9.5, "y": 1},
- {"matrix": [5, 4], "x": 10.5, "y": 1},
- {"matrix": [5, 3], "x": 11.5, "y": 1},
- {"matrix": [5, 2], "x": 12.5, "y": 1},
- {"matrix": [5, 1], "x": 13.5, "y": 1},
- {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
- {"matrix": [6, 5], "x": 9.5, "y": 2},
- {"matrix": [6, 4], "x": 10.5, "y": 2},
- {"matrix": [6, 3], "x": 11.5, "y": 2},
- {"matrix": [6, 2], "x": 12.5, "y": 2},
- {"matrix": [6, 1], "x": 13.5, "y": 2},
- {"matrix": [6, 0], "x": 14.5, "y": 2},
-
- {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
-
- {"matrix": [7, 4], "x": 9.5, "y": 3, "w": 2}
- ]
- }
- }
- }
diff --git a/keyboards/meson/keyboard.json b/keyboards/meson/keyboard.json
new file mode 100644
index 00000000000..72d9ec58e72
--- /dev/null
+++ b/keyboards/meson/keyboard.json
@@ -0,0 +1,165 @@
+{
+ "keyboard_name": "Meson",
+ "manufacturer": "Luciano M",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"],
+ "rows": ["F7", "C6", "F6", "F5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 10,
+ "sleep": true,
+ "split_count": [5, 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": {
+ "pin": "B5"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [4, 6], "x": 8.5, "y": 0},
+ {"matrix": [4, 5], "x": 9.5, "y": 0},
+ {"matrix": [4, 4], "x": 10.5, "y": 0},
+ {"matrix": [4, 3], "x": 11.5, "y": 0},
+ {"matrix": [4, 2], "x": 12.5, "y": 0},
+ {"matrix": [4, 1], "x": 13.5, "y": 0},
+ {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
+ {"matrix": [5, 5], "x": 9.5, "y": 1},
+ {"matrix": [5, 4], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 2], "x": 12.5, "y": 1},
+ {"matrix": [5, 1], "x": 13.5, "y": 1},
+ {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
+ {"matrix": [6, 5], "x": 9.5, "y": 2},
+ {"matrix": [6, 4], "x": 10.5, "y": 2},
+ {"matrix": [6, 3], "x": 11.5, "y": 2},
+ {"matrix": [6, 2], "x": 12.5, "y": 2},
+ {"matrix": [6, 1], "x": 13.5, "y": 2},
+ {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [7, 5], "x": 9.5, "y": 3},
+ {"matrix": [7, 4], "x": 10.5, "y": 3}
+ ]
+ },
+ "LAYOUT_2u": {
+ "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": [4, 6], "x": 8.5, "y": 0},
+ {"matrix": [4, 5], "x": 9.5, "y": 0},
+ {"matrix": [4, 4], "x": 10.5, "y": 0},
+ {"matrix": [4, 3], "x": 11.5, "y": 0},
+ {"matrix": [4, 2], "x": 12.5, "y": 0},
+ {"matrix": [4, 1], "x": 13.5, "y": 0},
+ {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
+ {"matrix": [5, 5], "x": 9.5, "y": 1},
+ {"matrix": [5, 4], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 2], "x": 12.5, "y": 1},
+ {"matrix": [5, 1], "x": 13.5, "y": 1},
+ {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
+ {"matrix": [6, 5], "x": 9.5, "y": 2},
+ {"matrix": [6, 4], "x": 10.5, "y": 2},
+ {"matrix": [6, 3], "x": 11.5, "y": 2},
+ {"matrix": [6, 2], "x": 12.5, "y": 2},
+ {"matrix": [6, 1], "x": 13.5, "y": 2},
+ {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+
+ {"matrix": [7, 4], "x": 9.5, "y": 3, "w": 2}
+ ]
+ }
+ }
+ }
diff --git a/keyboards/meson/rules.mk b/keyboards/meson/rules.mk
deleted file mode 100644
index 2f33b87f294..00000000000
--- a/keyboards/meson/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-SPLIT_KEYBOARD = yes
-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
diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/info.json
deleted file mode 100644
index 1249b0a5aba..00000000000
--- a/keyboards/miller/gm862/info.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "keyboard_name": "GM862",
- "manufacturer": "MILLER",
- "url": "",
- "maintainer": "MILLER",
- "usb": {
- "vid": "0x4B42",
- "pid": "0x0223",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "solid_reactive_simple": true,
- "solid_reactive": true
- },
- "driver": "is31fl3733",
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
- "rows": ["F0", "F1", "F4", "F5", "B4"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "layouts": {
- "LAYOUT_60_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/miller/gm862/keyboard.json b/keyboards/miller/gm862/keyboard.json
new file mode 100644
index 00000000000..b8c32cf16a6
--- /dev/null
+++ b/keyboards/miller/gm862/keyboard.json
@@ -0,0 +1,133 @@
+{
+ "keyboard_name": "GM862",
+ "manufacturer": "MILLER",
+ "url": "",
+ "maintainer": "MILLER",
+ "usb": {
+ "vid": "0x4B42",
+ "pid": "0x0223",
+ "device_version": "0.0.1"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true
+ },
+ "driver": "is31fl3733",
+ "sleep": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"],
+ "rows": ["F0", "F1", "F4", "F5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/miller/gm862/rules.mk b/keyboards/miller/gm862/rules.mk
deleted file mode 100644
index ea646d3d939..00000000000
--- a/keyboards/miller/gm862/rules.mk
+++ /dev/null
@@ -1,13 +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 # Use RGB matrix
diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
deleted file mode 100644
index 4f2f658a205..00000000000
--- a/keyboards/mint60/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
- "keyboard_name": "Mint60",
- "manufacturer": "Eucalyn",
- "url": "",
- "maintainer": "eucalyn",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "B3", "B1", "F7", "B2", "B6", "F6", "F5"],
- "rows": ["C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 8,
- "split": true,
- "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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 7, "y": 0},
- {"matrix": [5, 1], "x": 8, "y": 0},
- {"matrix": [5, 2], "x": 9, "y": 0},
- {"matrix": [5, 3], "x": 10, "y": 0},
- {"matrix": [5, 4], "x": 11, "y": 0},
- {"matrix": [5, 5], "x": 12, "y": 0},
- {"matrix": [5, 6], "x": 13, "y": 0},
- {"matrix": [5, 7], "x": 14, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
-
- {"matrix": [6, 0], "x": 7.5, "y": 1},
- {"matrix": [6, 1], "x": 8.5, "y": 1},
- {"matrix": [6, 2], "x": 9.5, "y": 1},
- {"matrix": [6, 3], "x": 10.5, "y": 1},
- {"matrix": [6, 4], "x": 11.5, "y": 1},
- {"matrix": [6, 5], "x": 12.5, "y": 1},
- {"matrix": [6, 6], "x": 13.5, "y": 1},
- {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [7, 0], "x": 7.75, "y": 2},
- {"matrix": [7, 1], "x": 8.75, "y": 2},
- {"matrix": [7, 2], "x": 9.75, "y": 2},
- {"matrix": [7, 3], "x": 10.75, "y": 2},
- {"matrix": [7, 4], "x": 11.75, "y": 2},
- {"matrix": [7, 5], "x": 12.75, "y": 2},
- {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
- {"matrix": [3, 1], "x": 2, "y": 3},
- {"matrix": [3, 2], "x": 3, "y": 3},
- {"matrix": [3, 3], "x": 4, "y": 3},
- {"matrix": [3, 4], "x": 5, "y": 3},
- {"matrix": [3, 5], "x": 6, "y": 3},
-
- {"matrix": [8, 0], "x": 8, "y": 3},
- {"matrix": [8, 1], "x": 9, "y": 3},
- {"matrix": [8, 2], "x": 10, "y": 3},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 5], "x": 13, "y": 3},
- {"matrix": [8, 6], "x": 14, "y": 3},
- {"matrix": [8, 7], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2.25},
-
- {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 2.75},
- {"matrix": [9, 1], "x": 10.5, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
- {"matrix": [9, 5], "x": 13, "y": 4},
- {"matrix": [9, 6], "x": 14, "y": 4},
- {"matrix": [9, 7], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/mint60/keyboard.json b/keyboards/mint60/keyboard.json
new file mode 100644
index 00000000000..332a366aa6e
--- /dev/null
+++ b/keyboards/mint60/keyboard.json
@@ -0,0 +1,132 @@
+{
+ "keyboard_name": "Mint60",
+ "manufacturer": "Eucalyn",
+ "url": "",
+ "maintainer": "eucalyn",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["D4", "B3", "B1", "F7", "B2", "B6", "F6", "F5"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 8,
+ "split": true,
+ "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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "y": 0},
+ {"matrix": [5, 6], "x": 13, "y": 0},
+ {"matrix": [5, 7], "x": 14, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.5, "y": 1},
+ {"matrix": [6, 1], "x": 8.5, "y": 1},
+ {"matrix": [6, 2], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 4], "x": 11.5, "y": 1},
+ {"matrix": [6, 5], "x": 12.5, "y": 1},
+ {"matrix": [6, 6], "x": 13.5, "y": 1},
+ {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.75, "y": 2},
+ {"matrix": [7, 1], "x": 8.75, "y": 2},
+ {"matrix": [7, 2], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [7, 5], "x": 12.75, "y": 2},
+ {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3},
+ {"matrix": [3, 5], "x": 6, "y": 3},
+
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3},
+ {"matrix": [8, 6], "x": 14, "y": 3},
+ {"matrix": [8, 7], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2.25},
+
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 2.75},
+ {"matrix": [9, 1], "x": 10.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 13, "y": 4},
+ {"matrix": [9, 6], "x": 14, "y": 4},
+ {"matrix": [9, 7], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mint60/rules.mk b/keyboards/mint60/rules.mk
deleted file mode 100644
index 2cd353930ea..00000000000
--- a/keyboards/mint60/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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 WS2812 RGB underlight.
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index 8280ffa022b..83e66ce2ccf 100644
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -45,6 +45,7 @@
}
},
"split": {
+ "enabled": true,
"bootmagic": {
"matrix": [5, 0]
},
diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk
index 497e86c8cb6..c38e4335e89 100644
--- a/keyboards/mlego/m60_split/rev1/rules.mk
+++ b/keyboards/mlego/m60_split/rev1/rules.mk
@@ -10,7 +10,6 @@ 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
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
ENCODER_ENABLE = yes # Enable encoder
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index 1fde8a4cf25..b4b18a91d69 100644
--- a/keyboards/mlego/m60_split/rev2/info.json
+++ b/keyboards/mlego/m60_split/rev2/info.json
@@ -38,6 +38,7 @@
"pin": "B15"
},
"split": {
+ "enabled": true,
"bootmagic": {
"matrix": [5, 0]
},
diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk
index ac47e053a2a..f3ecf1b52cb 100644
--- a/keyboards/mlego/m60_split/rev2/rules.mk
+++ b/keyboards/mlego/m60_split/rev2/rules.mk
@@ -10,6 +10,5 @@ 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
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
ENCODER_ENABLE = yes # Enable encoder
diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
deleted file mode 100644
index d45bb124b06..00000000000
--- a/keyboards/momoka_ergo/info.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
- "keyboard_name": "Momoka Ergo",
- "manufacturer": "StefanGrindelwald",
- "url": "",
- "maintainer": "StefanGrindelwald",
- "usb": {
- "vid": "0x4F4D",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F7", "F6", "F5", "F4", "F1", "F0"],
- "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 22,
- "split_count": [11, 11],
- "animations": {
- "breathing": true,
- "rainbow_swirl": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "pin": "C7"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 5], "x": 0, "y": 0.375, "w": 1.5},
- {"matrix": [0, 4], "x": 1.5, "y": 0.375},
- {"matrix": [0, 3], "x": 2.5, "y": 0.125},
- {"matrix": [0, 2], "x": 3.5, "y": 0},
- {"matrix": [0, 1], "x": 4.5, "y": 0.125},
- {"matrix": [0, 0], "x": 5.5, "y": 0.25},
-
- {"matrix": [7, 0], "x": 12.5, "y": 0.25},
- {"matrix": [7, 1], "x": 13.5, "y": 0.125},
- {"matrix": [7, 2], "x": 14.5, "y": 0},
- {"matrix": [7, 3], "x": 15.5, "y": 0.125},
- {"matrix": [7, 4], "x": 16.5, "y": 0.375},
- {"matrix": [7, 5], "x": 17.5, "y": 0.375, "w": 1.5},
-
- {"matrix": [1, 5], "x": 0, "y": 1.375, "w": 1.5},
- {"matrix": [1, 4], "x": 1.5, "y": 1.375},
- {"matrix": [1, 3], "x": 2.5, "y": 1.125},
- {"matrix": [1, 2], "x": 3.5, "y": 1},
- {"matrix": [1, 1], "x": 4.5, "y": 1.125},
- {"matrix": [1, 0], "x": 5.5, "y": 1.25},
-
- {"matrix": [8, 0], "x": 12.5, "y": 1.25},
- {"matrix": [8, 1], "x": 13.5, "y": 1.125},
- {"matrix": [8, 2], "x": 14.5, "y": 1},
- {"matrix": [8, 3], "x": 15.5, "y": 1.125},
- {"matrix": [8, 4], "x": 16.5, "y": 1.375},
- {"matrix": [8, 5], "x": 17.5, "y": 1.375, "w": 1.5},
-
- {"matrix": [2, 5], "x": 0, "y": 2.375, "w": 1.5},
- {"matrix": [2, 4], "x": 1.5, "y": 2.375},
- {"matrix": [2, 3], "x": 2.5, "y": 2.125},
- {"matrix": [2, 2], "x": 3.5, "y": 2},
- {"matrix": [2, 1], "x": 4.5, "y": 2.125},
- {"matrix": [2, 0], "x": 5.5, "y": 2.25},
-
- {"matrix": [9, 0], "x": 12.5, "y": 2.25},
- {"matrix": [9, 1], "x": 13.5, "y": 2.125},
- {"matrix": [9, 2], "x": 14.5, "y": 2},
- {"matrix": [9, 3], "x": 15.5, "y": 2.125},
- {"matrix": [9, 4], "x": 16.5, "y": 2.375},
- {"matrix": [9, 5], "x": 17.5, "y": 2.375, "w": 1.5},
-
- {"matrix": [3, 5], "x": 0, "y": 3.375, "w": 1.5},
- {"matrix": [3, 4], "x": 1.5, "y": 3.375},
- {"matrix": [3, 3], "x": 2.5, "y": 3.125},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 1], "x": 4.5, "y": 3.125},
- {"matrix": [3, 0], "x": 5.5, "y": 3.25},
-
- {"matrix": [10, 0], "x": 12.5, "y": 3.25},
- {"matrix": [10, 1], "x": 13.5, "y": 3.125},
- {"matrix": [10, 2], "x": 14.5, "y": 3},
- {"matrix": [10, 3], "x": 15.5, "y": 3.125},
- {"matrix": [10, 4], "x": 16.5, "y": 3.375},
- {"matrix": [10, 5], "x": 17.5, "y": 3.375, "w": 1.5},
-
- {"matrix": [4, 5], "x": 0.5, "y": 4.375},
- {"matrix": [4, 4], "x": 1.5, "y": 4.375},
- {"matrix": [4, 3], "x": 2.5, "y": 4.125},
- {"matrix": [4, 2], "x": 3.5, "y": 4},
- {"matrix": [4, 1], "x": 4.5, "y": 4.125},
-
- {"matrix": [11, 1], "x": 13.5, "y": 4.125},
- {"matrix": [11, 2], "x": 14.5, "y": 4},
- {"matrix": [11, 3], "x": 15.5, "y": 4.125},
- {"matrix": [11, 4], "x": 16.5, "y": 4.375},
- {"matrix": [11, 5], "x": 17.5, "y": 4.375},
-
- {"matrix": [5, 1], "x": 7, "y": 4.875},
- {"matrix": [4, 0], "x": 8, "y": 4.875},
-
- {"matrix": [11, 0], "x": 10, "y": 4.875},
- {"matrix": [12, 1], "x": 11, "y": 4.875},
-
- {"matrix": [5, 0], "x": 8, "y": 5.875},
-
- {"matrix": [12, 0], "x": 10, "y": 5.875},
-
- {"matrix": [5, 2], "x": 6, "y": 5.875, "h": 2},
- {"matrix": [6, 1], "x": 7, "y": 5.875, "h": 2},
- {"matrix": [6, 0], "x": 8, "y": 6.875},
-
- {"matrix": [13, 0], "x": 10, "y": 6.875},
- {"matrix": [13, 1], "x": 11, "y": 5.875, "h": 2},
- {"matrix": [12, 2], "x": 12, "y": 5.875, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/momoka_ergo/keyboard.json b/keyboards/momoka_ergo/keyboard.json
new file mode 100644
index 00000000000..da21c509b92
--- /dev/null
+++ b/keyboards/momoka_ergo/keyboard.json
@@ -0,0 +1,140 @@
+{
+ "keyboard_name": "Momoka Ergo",
+ "manufacturer": "StefanGrindelwald",
+ "url": "",
+ "maintainer": "StefanGrindelwald",
+ "usb": {
+ "vid": "0x4F4D",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D1"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 22,
+ "split_count": [11, 11],
+ "animations": {
+ "breathing": true,
+ "rainbow_swirl": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "pin": "C7"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 5], "x": 0, "y": 0.375, "w": 1.5},
+ {"matrix": [0, 4], "x": 1.5, "y": 0.375},
+ {"matrix": [0, 3], "x": 2.5, "y": 0.125},
+ {"matrix": [0, 2], "x": 3.5, "y": 0},
+ {"matrix": [0, 1], "x": 4.5, "y": 0.125},
+ {"matrix": [0, 0], "x": 5.5, "y": 0.25},
+
+ {"matrix": [7, 0], "x": 12.5, "y": 0.25},
+ {"matrix": [7, 1], "x": 13.5, "y": 0.125},
+ {"matrix": [7, 2], "x": 14.5, "y": 0},
+ {"matrix": [7, 3], "x": 15.5, "y": 0.125},
+ {"matrix": [7, 4], "x": 16.5, "y": 0.375},
+ {"matrix": [7, 5], "x": 17.5, "y": 0.375, "w": 1.5},
+
+ {"matrix": [1, 5], "x": 0, "y": 1.375, "w": 1.5},
+ {"matrix": [1, 4], "x": 1.5, "y": 1.375},
+ {"matrix": [1, 3], "x": 2.5, "y": 1.125},
+ {"matrix": [1, 2], "x": 3.5, "y": 1},
+ {"matrix": [1, 1], "x": 4.5, "y": 1.125},
+ {"matrix": [1, 0], "x": 5.5, "y": 1.25},
+
+ {"matrix": [8, 0], "x": 12.5, "y": 1.25},
+ {"matrix": [8, 1], "x": 13.5, "y": 1.125},
+ {"matrix": [8, 2], "x": 14.5, "y": 1},
+ {"matrix": [8, 3], "x": 15.5, "y": 1.125},
+ {"matrix": [8, 4], "x": 16.5, "y": 1.375},
+ {"matrix": [8, 5], "x": 17.5, "y": 1.375, "w": 1.5},
+
+ {"matrix": [2, 5], "x": 0, "y": 2.375, "w": 1.5},
+ {"matrix": [2, 4], "x": 1.5, "y": 2.375},
+ {"matrix": [2, 3], "x": 2.5, "y": 2.125},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 1], "x": 4.5, "y": 2.125},
+ {"matrix": [2, 0], "x": 5.5, "y": 2.25},
+
+ {"matrix": [9, 0], "x": 12.5, "y": 2.25},
+ {"matrix": [9, 1], "x": 13.5, "y": 2.125},
+ {"matrix": [9, 2], "x": 14.5, "y": 2},
+ {"matrix": [9, 3], "x": 15.5, "y": 2.125},
+ {"matrix": [9, 4], "x": 16.5, "y": 2.375},
+ {"matrix": [9, 5], "x": 17.5, "y": 2.375, "w": 1.5},
+
+ {"matrix": [3, 5], "x": 0, "y": 3.375, "w": 1.5},
+ {"matrix": [3, 4], "x": 1.5, "y": 3.375},
+ {"matrix": [3, 3], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 1], "x": 4.5, "y": 3.125},
+ {"matrix": [3, 0], "x": 5.5, "y": 3.25},
+
+ {"matrix": [10, 0], "x": 12.5, "y": 3.25},
+ {"matrix": [10, 1], "x": 13.5, "y": 3.125},
+ {"matrix": [10, 2], "x": 14.5, "y": 3},
+ {"matrix": [10, 3], "x": 15.5, "y": 3.125},
+ {"matrix": [10, 4], "x": 16.5, "y": 3.375},
+ {"matrix": [10, 5], "x": 17.5, "y": 3.375, "w": 1.5},
+
+ {"matrix": [4, 5], "x": 0.5, "y": 4.375},
+ {"matrix": [4, 4], "x": 1.5, "y": 4.375},
+ {"matrix": [4, 3], "x": 2.5, "y": 4.125},
+ {"matrix": [4, 2], "x": 3.5, "y": 4},
+ {"matrix": [4, 1], "x": 4.5, "y": 4.125},
+
+ {"matrix": [11, 1], "x": 13.5, "y": 4.125},
+ {"matrix": [11, 2], "x": 14.5, "y": 4},
+ {"matrix": [11, 3], "x": 15.5, "y": 4.125},
+ {"matrix": [11, 4], "x": 16.5, "y": 4.375},
+ {"matrix": [11, 5], "x": 17.5, "y": 4.375},
+
+ {"matrix": [5, 1], "x": 7, "y": 4.875},
+ {"matrix": [4, 0], "x": 8, "y": 4.875},
+
+ {"matrix": [11, 0], "x": 10, "y": 4.875},
+ {"matrix": [12, 1], "x": 11, "y": 4.875},
+
+ {"matrix": [5, 0], "x": 8, "y": 5.875},
+
+ {"matrix": [12, 0], "x": 10, "y": 5.875},
+
+ {"matrix": [5, 2], "x": 6, "y": 5.875, "h": 2},
+ {"matrix": [6, 1], "x": 7, "y": 5.875, "h": 2},
+ {"matrix": [6, 0], "x": 8, "y": 6.875},
+
+ {"matrix": [13, 0], "x": 10, "y": 6.875},
+ {"matrix": [13, 1], "x": 11, "y": 5.875, "h": 2},
+ {"matrix": [12, 2], "x": 12, "y": 5.875, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/momoka_ergo/rules.mk b/keyboards/momoka_ergo/rules.mk
deleted file mode 100644
index 850aa4e2248..00000000000
--- a/keyboards/momoka_ergo/rules.mk
+++ /dev/null
@@ -1,13 +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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json
deleted file mode 100644
index 0c92f469aea..00000000000
--- a/keyboards/nacly/sodium42/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "keyboard_name": "sodium42",
- "manufacturer": "nacly",
- "url": "https://nacly.net",
- "maintainer": "nacly",
- "usb": {
- "vid": "0xBEEF",
- "pid": "0xFED0",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D2", "C6", "E6", "B5", "B2", "B3"],
- "rows": ["F7", "D4", "D7", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.75},
- {"matrix": [0, 1], "x": 1, "y": 0.5},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.25},
- {"matrix": [0, 4], "x": 4, "y": 1},
-
- {"matrix": [4, 4], "x": 8.75, "y": 1},
- {"matrix": [4, 3], "x": 9.75, "y": 0.5},
- {"matrix": [4, 2], "x": 10.75, "y": 0},
- {"matrix": [4, 1], "x": 11.75, "y": 0.5},
- {"matrix": [4, 0], "x": 12.75, "y": 0.75},
-
- {"matrix": [1, 0], "x": 0, "y": 1.75},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 2},
-
- {"matrix": [5, 4], "x": 8.75, "y": 2},
- {"matrix": [5, 3], "x": 9.75, "y": 1.5},
- {"matrix": [5, 2], "x": 10.75, "y": 1},
- {"matrix": [5, 1], "x": 11.75, "y": 1.5},
- {"matrix": [5, 0], "x": 12.75, "y": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2.75},
- {"matrix": [2, 1], "x": 1, "y": 2.5},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.25},
- {"matrix": [2, 4], "x": 4, "y": 3},
-
- {"matrix": [6, 4], "x": 8.75, "y": 3},
- {"matrix": [6, 3], "x": 9.75, "y": 2.5},
- {"matrix": [6, 2], "x": 10.75, "y": 2},
- {"matrix": [6, 1], "x": 11.75, "y": 2.5},
- {"matrix": [6, 0], "x": 12.75, "y": 2.75},
-
- {"matrix": [3, 0], "x": 0, "y": 3.75},
- {"matrix": [3, 1], "x": 1, "y": 3.5},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3, "y": 3.25},
- {"matrix": [3, 4], "x": 4, "y": 4},
- {"matrix": [3, 5], "x": 5, "y": 4.5},
-
- {"matrix": [7, 5], "x": 7.75, "y": 4.5},
- {"matrix": [7, 4], "x": 8.75, "y": 4},
- {"matrix": [7, 3], "x": 9.75, "y": 3.5},
- {"matrix": [7, 2], "x": 10.75, "y": 3},
- {"matrix": [7, 1], "x": 11.75, "y": 3.5},
- {"matrix": [7, 0], "x": 12.75, "y": 3.75}
- ]
- }
- }
-}
diff --git a/keyboards/nacly/sodium42/keyboard.json b/keyboards/nacly/sodium42/keyboard.json
new file mode 100644
index 00000000000..f084ca2a239
--- /dev/null
+++ b/keyboards/nacly/sodium42/keyboard.json
@@ -0,0 +1,85 @@
+{
+ "keyboard_name": "sodium42",
+ "manufacturer": "nacly",
+ "url": "https://nacly.net",
+ "maintainer": "nacly",
+ "usb": {
+ "vid": "0xBEEF",
+ "pid": "0xFED0",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D2", "C6", "E6", "B5", "B2", "B3"],
+ "rows": ["F7", "D4", "D7", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+
+ {"matrix": [4, 4], "x": 8.75, "y": 1},
+ {"matrix": [4, 3], "x": 9.75, "y": 0.5},
+ {"matrix": [4, 2], "x": 10.75, "y": 0},
+ {"matrix": [4, 1], "x": 11.75, "y": 0.5},
+ {"matrix": [4, 0], "x": 12.75, "y": 0.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.75},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+
+ {"matrix": [5, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 3], "x": 9.75, "y": 1.5},
+ {"matrix": [5, 2], "x": 10.75, "y": 1},
+ {"matrix": [5, 1], "x": 11.75, "y": 1.5},
+ {"matrix": [5, 0], "x": 12.75, "y": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.75},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+ {"matrix": [2, 4], "x": 4, "y": 3},
+
+ {"matrix": [6, 4], "x": 8.75, "y": 3},
+ {"matrix": [6, 3], "x": 9.75, "y": 2.5},
+ {"matrix": [6, 2], "x": 10.75, "y": 2},
+ {"matrix": [6, 1], "x": 11.75, "y": 2.5},
+ {"matrix": [6, 0], "x": 12.75, "y": 2.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.75},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3.25},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4.5},
+
+ {"matrix": [7, 5], "x": 7.75, "y": 4.5},
+ {"matrix": [7, 4], "x": 8.75, "y": 4},
+ {"matrix": [7, 3], "x": 9.75, "y": 3.5},
+ {"matrix": [7, 2], "x": 10.75, "y": 3},
+ {"matrix": [7, 1], "x": 11.75, "y": 3.5},
+ {"matrix": [7, 0], "x": 12.75, "y": 3.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/nacly/sodium42/rules.mk b/keyboards/nacly/sodium42/rules.mk
deleted file mode 100644
index f30bd81997e..00000000000
--- a/keyboards/nacly/sodium42/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 = yes # 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
-
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json
deleted file mode 100644
index aa60255b0d3..00000000000
--- a/keyboards/nacly/sodium50/info.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "keyboard_name": "sodium50",
- "manufacturer": "nacly",
- "url": "https://nacly.net",
- "maintainer": "nacly",
- "usb": {
- "vid": "0xBEEF",
- "pid": "0xFED0",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
- "rows": ["F7", "D4", "D7", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.75},
- {"matrix": [0, 1], "x": 1, "y": 0.75},
- {"matrix": [0, 2], "x": 2, "y": 0.5},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.25},
- {"matrix": [0, 5], "x": 5, "y": 1},
-
- {"matrix": [4, 5], "x": 9.75, "y": 1},
- {"matrix": [4, 4], "x": 10.75, "y": 0.5},
- {"matrix": [4, 3], "x": 11.75, "y": 0},
- {"matrix": [4, 2], "x": 12.75, "y": 0.5},
- {"matrix": [4, 1], "x": 13.75, "y": 0.75},
- {"matrix": [4, 0], "x": 14.75, "y": 0.75},
-
- {"matrix": [1, 0], "x": 0, "y": 1.75},
- {"matrix": [1, 1], "x": 1, "y": 1.75},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 2},
-
- {"matrix": [5, 5], "x": 9.75, "y": 2},
- {"matrix": [5, 4], "x": 10.75, "y": 1.5},
- {"matrix": [5, 3], "x": 11.75, "y": 1},
- {"matrix": [5, 2], "x": 12.75, "y": 1.5},
- {"matrix": [5, 1], "x": 13.75, "y": 1.75},
- {"matrix": [5, 0], "x": 14.75, "y": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2.75},
- {"matrix": [2, 1], "x": 1, "y": 2.75},
- {"matrix": [2, 2], "x": 2, "y": 2.5},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.25},
- {"matrix": [2, 5], "x": 5, "y": 3},
-
- {"matrix": [6, 5], "x": 9.75, "y": 3},
- {"matrix": [6, 4], "x": 10.75, "y": 2.5},
- {"matrix": [6, 3], "x": 11.75, "y": 2},
- {"matrix": [6, 2], "x": 12.75, "y": 2.5},
- {"matrix": [6, 1], "x": 13.75, "y": 2.75},
- {"matrix": [6, 0], "x": 14.75, "y": 2.75},
-
- {"matrix": [3, 0], "x": 0, "y": 3.75},
- {"matrix": [3, 1], "x": 1, "y": 3.75},
- {"matrix": [3, 2], "x": 2, "y": 3.5},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3.25},
- {"matrix": [3, 5], "x": 5, "y": 4},
- {"matrix": [3, 6], "x": 6, "y": 4.5},
-
- {"matrix": [7, 6], "x": 8.75, "y": 4.5},
- {"matrix": [7, 5], "x": 9.75, "y": 4},
- {"matrix": [7, 4], "x": 10.75, "y": 3.5},
- {"matrix": [7, 3], "x": 11.75, "y": 3},
- {"matrix": [7, 2], "x": 12.75, "y": 3.5},
- {"matrix": [7, 1], "x": 13.75, "y": 3.75},
- {"matrix": [7, 0], "x": 14.75, "y": 3.75}
- ]
- }
- }
-}
diff --git a/keyboards/nacly/sodium50/keyboard.json b/keyboards/nacly/sodium50/keyboard.json
new file mode 100644
index 00000000000..ff7b691d9d7
--- /dev/null
+++ b/keyboards/nacly/sodium50/keyboard.json
@@ -0,0 +1,93 @@
+{
+ "keyboard_name": "sodium50",
+ "manufacturer": "nacly",
+ "url": "https://nacly.net",
+ "maintainer": "nacly",
+ "usb": {
+ "vid": "0xBEEF",
+ "pid": "0xFED0",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
+ "rows": ["F7", "D4", "D7", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 1], "x": 1, "y": 0.75},
+ {"matrix": [0, 2], "x": 2, "y": 0.5},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+
+ {"matrix": [4, 5], "x": 9.75, "y": 1},
+ {"matrix": [4, 4], "x": 10.75, "y": 0.5},
+ {"matrix": [4, 3], "x": 11.75, "y": 0},
+ {"matrix": [4, 2], "x": 12.75, "y": 0.5},
+ {"matrix": [4, 1], "x": 13.75, "y": 0.75},
+ {"matrix": [4, 0], "x": 14.75, "y": 0.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.75},
+ {"matrix": [1, 1], "x": 1, "y": 1.75},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+
+ {"matrix": [5, 5], "x": 9.75, "y": 2},
+ {"matrix": [5, 4], "x": 10.75, "y": 1.5},
+ {"matrix": [5, 3], "x": 11.75, "y": 1},
+ {"matrix": [5, 2], "x": 12.75, "y": 1.5},
+ {"matrix": [5, 1], "x": 13.75, "y": 1.75},
+ {"matrix": [5, 0], "x": 14.75, "y": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.75},
+ {"matrix": [2, 1], "x": 1, "y": 2.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+
+ {"matrix": [6, 5], "x": 9.75, "y": 3},
+ {"matrix": [6, 4], "x": 10.75, "y": 2.5},
+ {"matrix": [6, 3], "x": 11.75, "y": 2},
+ {"matrix": [6, 2], "x": 12.75, "y": 2.5},
+ {"matrix": [6, 1], "x": 13.75, "y": 2.75},
+ {"matrix": [6, 0], "x": 14.75, "y": 2.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.75},
+ {"matrix": [3, 1], "x": 1, "y": 3.75},
+ {"matrix": [3, 2], "x": 2, "y": 3.5},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.25},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+ {"matrix": [3, 6], "x": 6, "y": 4.5},
+
+ {"matrix": [7, 6], "x": 8.75, "y": 4.5},
+ {"matrix": [7, 5], "x": 9.75, "y": 4},
+ {"matrix": [7, 4], "x": 10.75, "y": 3.5},
+ {"matrix": [7, 3], "x": 11.75, "y": 3},
+ {"matrix": [7, 2], "x": 12.75, "y": 3.5},
+ {"matrix": [7, 1], "x": 13.75, "y": 3.75},
+ {"matrix": [7, 0], "x": 14.75, "y": 3.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/nacly/sodium50/rules.mk b/keyboards/nacly/sodium50/rules.mk
deleted file mode 100644
index f30bd81997e..00000000000
--- a/keyboards/nacly/sodium50/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 = yes # 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
-
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json
deleted file mode 100644
index de4f22d6074..00000000000
--- a/keyboards/nacly/sodium62/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
- "keyboard_name": "sodium62",
- "manufacturer": "nacly",
- "url": "https://nacly.net",
- "maintainer": "nacly",
- "usb": {
- "vid": "0x6E61",
- "pid": "0x636C",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
- "rows": ["F7", "D4", "D7", "B4", "B6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.75},
- {"matrix": [0, 1], "x": 1, "y": 0.75},
- {"matrix": [0, 2], "x": 2, "y": 0.5},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.25},
- {"matrix": [0, 5], "x": 5, "y": 1},
-
- {"matrix": [5, 5], "x": 9.75, "y": 1},
- {"matrix": [5, 4], "x": 10.75, "y": 0.5},
- {"matrix": [5, 3], "x": 11.75, "y": 0},
- {"matrix": [5, 2], "x": 12.75, "y": 0.5},
- {"matrix": [5, 1], "x": 13.75, "y": 0.75},
- {"matrix": [5, 0], "x": 14.75, "y": 0.75},
-
- {"matrix": [1, 0], "x": 0, "y": 1.75},
- {"matrix": [1, 1], "x": 1, "y": 1.75},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 2},
-
- {"matrix": [6, 5], "x": 9.75, "y": 2},
- {"matrix": [6, 4], "x": 10.75, "y": 1.5},
- {"matrix": [6, 3], "x": 11.75, "y": 1},
- {"matrix": [6, 2], "x": 12.75, "y": 1.5},
- {"matrix": [6, 1], "x": 13.75, "y": 1.75},
- {"matrix": [6, 0], "x": 14.75, "y": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2.75},
- {"matrix": [2, 1], "x": 1, "y": 2.75},
- {"matrix": [2, 2], "x": 2, "y": 2.5},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.25},
- {"matrix": [2, 5], "x": 5, "y": 3},
-
- {"matrix": [7, 5], "x": 9.75, "y": 3},
- {"matrix": [7, 4], "x": 10.75, "y": 2.5},
- {"matrix": [7, 3], "x": 11.75, "y": 2},
- {"matrix": [7, 2], "x": 12.75, "y": 2.5},
- {"matrix": [7, 1], "x": 13.75, "y": 2.75},
- {"matrix": [7, 0], "x": 14.75, "y": 2.75},
-
- {"matrix": [3, 0], "x": 0, "y": 3.75},
- {"matrix": [3, 1], "x": 1, "y": 3.75},
- {"matrix": [3, 2], "x": 2, "y": 3.5},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3.25},
- {"matrix": [3, 5], "x": 5, "y": 4},
-
- {"matrix": [8, 5], "x": 9.75, "y": 4},
- {"matrix": [8, 4], "x": 10.75, "y": 3.5},
- {"matrix": [8, 3], "x": 11.75, "y": 3},
- {"matrix": [8, 2], "x": 12.75, "y": 3.5},
- {"matrix": [8, 1], "x": 13.75, "y": 3.75},
- {"matrix": [8, 0], "x": 14.75, "y": 3.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4.75},
- {"matrix": [4, 1], "x": 1, "y": 4.75},
- {"matrix": [4, 2], "x": 2, "y": 4.5},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4.25},
- {"matrix": [4, 5], "x": 5, "y": 5},
- {"matrix": [4, 6], "x": 6, "y": 5.5},
-
- {"matrix": [9, 6], "x": 8.75, "y": 5.5},
- {"matrix": [9, 5], "x": 9.75, "y": 5},
- {"matrix": [9, 4], "x": 10.75, "y": 4.5},
- {"matrix": [9, 3], "x": 11.75, "y": 4},
- {"matrix": [9, 2], "x": 12.75, "y": 4.5},
- {"matrix": [9, 1], "x": 13.75, "y": 4.75},
- {"matrix": [9, 0], "x": 14.75, "y": 4.75}
- ]
- }
- }
-}
diff --git a/keyboards/nacly/sodium62/keyboard.json b/keyboards/nacly/sodium62/keyboard.json
new file mode 100644
index 00000000000..941bad2bd6c
--- /dev/null
+++ b/keyboards/nacly/sodium62/keyboard.json
@@ -0,0 +1,108 @@
+{
+ "keyboard_name": "sodium62",
+ "manufacturer": "nacly",
+ "url": "https://nacly.net",
+ "maintainer": "nacly",
+ "usb": {
+ "vid": "0x6E61",
+ "pid": "0x636C",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true
+ },
+ "matrix_pins": {
+ "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"],
+ "rows": ["F7", "D4", "D7", "B4", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.75},
+ {"matrix": [0, 1], "x": 1, "y": 0.75},
+ {"matrix": [0, 2], "x": 2, "y": 0.5},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+
+ {"matrix": [5, 5], "x": 9.75, "y": 1},
+ {"matrix": [5, 4], "x": 10.75, "y": 0.5},
+ {"matrix": [5, 3], "x": 11.75, "y": 0},
+ {"matrix": [5, 2], "x": 12.75, "y": 0.5},
+ {"matrix": [5, 1], "x": 13.75, "y": 0.75},
+ {"matrix": [5, 0], "x": 14.75, "y": 0.75},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.75},
+ {"matrix": [1, 1], "x": 1, "y": 1.75},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+
+ {"matrix": [6, 5], "x": 9.75, "y": 2},
+ {"matrix": [6, 4], "x": 10.75, "y": 1.5},
+ {"matrix": [6, 3], "x": 11.75, "y": 1},
+ {"matrix": [6, 2], "x": 12.75, "y": 1.5},
+ {"matrix": [6, 1], "x": 13.75, "y": 1.75},
+ {"matrix": [6, 0], "x": 14.75, "y": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.75},
+ {"matrix": [2, 1], "x": 1, "y": 2.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+
+ {"matrix": [7, 5], "x": 9.75, "y": 3},
+ {"matrix": [7, 4], "x": 10.75, "y": 2.5},
+ {"matrix": [7, 3], "x": 11.75, "y": 2},
+ {"matrix": [7, 2], "x": 12.75, "y": 2.5},
+ {"matrix": [7, 1], "x": 13.75, "y": 2.75},
+ {"matrix": [7, 0], "x": 14.75, "y": 2.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.75},
+ {"matrix": [3, 1], "x": 1, "y": 3.75},
+ {"matrix": [3, 2], "x": 2, "y": 3.5},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.25},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+
+ {"matrix": [8, 5], "x": 9.75, "y": 4},
+ {"matrix": [8, 4], "x": 10.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 11.75, "y": 3},
+ {"matrix": [8, 2], "x": 12.75, "y": 3.5},
+ {"matrix": [8, 1], "x": 13.75, "y": 3.75},
+ {"matrix": [8, 0], "x": 14.75, "y": 3.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.75},
+ {"matrix": [4, 1], "x": 1, "y": 4.75},
+ {"matrix": [4, 2], "x": 2, "y": 4.5},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4.25},
+ {"matrix": [4, 5], "x": 5, "y": 5},
+ {"matrix": [4, 6], "x": 6, "y": 5.5},
+
+ {"matrix": [9, 6], "x": 8.75, "y": 5.5},
+ {"matrix": [9, 5], "x": 9.75, "y": 5},
+ {"matrix": [9, 4], "x": 10.75, "y": 4.5},
+ {"matrix": [9, 3], "x": 11.75, "y": 4},
+ {"matrix": [9, 2], "x": 12.75, "y": 4.5},
+ {"matrix": [9, 1], "x": 13.75, "y": 4.75},
+ {"matrix": [9, 0], "x": 14.75, "y": 4.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/nacly/sodium62/rules.mk b/keyboards/nacly/sodium62/rules.mk
deleted file mode 100644
index c62dc408b51..00000000000
--- a/keyboards/nacly/sodium62/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 = yes # 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
-
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
deleted file mode 100644
index c4992778890..00000000000
--- a/keyboards/nacly/splitreus62/info.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
- "keyboard_name": "Splitreus62",
- "manufacturer": "NaCly",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xBEEF",
- "pid": "0xFED0",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["E6", "B4", "B5", "B6", "B2", "B3"],
- "rows": ["D3", "D2", "D1", "D4", "C6", "D7"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 12,
- "split_count": [6, 6]
- },
- "ws2812": {
- "pin": "B1"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.6},
- {"matrix": [0, 1], "x": 1, "y": 0.6},
- {"matrix": [0, 2], "x": 2, "y": 0.35},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.35},
- {"matrix": [0, 5], "x": 5, "y": 0.7},
-
- {"matrix": [6, 5], "x": 9, "y": 0.7},
- {"matrix": [6, 4], "x": 10, "y": 0.35},
- {"matrix": [6, 3], "x": 11, "y": 0},
- {"matrix": [6, 2], "x": 12, "y": 0.35},
- {"matrix": [6, 1], "x": 13, "y": 0.6},
- {"matrix": [6, 0], "x": 14, "y": 0.6},
-
- {"matrix": [1, 0], "x": 0, "y": 1.6},
- {"matrix": [1, 1], "x": 1, "y": 1.6},
- {"matrix": [1, 2], "x": 2, "y": 1.35},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.35},
- {"matrix": [1, 5], "x": 5, "y": 1.7},
-
- {"matrix": [7, 5], "x": 9, "y": 1.7},
- {"matrix": [7, 4], "x": 10, "y": 1.35},
- {"matrix": [7, 3], "x": 11, "y": 1},
- {"matrix": [7, 2], "x": 12, "y": 1.35},
- {"matrix": [7, 1], "x": 13, "y": 1.6},
- {"matrix": [7, 0], "x": 14, "y": 1.6},
-
- {"matrix": [2, 0], "x": 0, "y": 2.6},
- {"matrix": [2, 1], "x": 1, "y": 2.6},
- {"matrix": [2, 2], "x": 2, "y": 2.35},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.35},
- {"matrix": [2, 5], "x": 5, "y": 2.7},
-
- {"matrix": [8, 5], "x": 9, "y": 2.7},
- {"matrix": [8, 4], "x": 10, "y": 2.35},
- {"matrix": [8, 3], "x": 11, "y": 2},
- {"matrix": [8, 2], "x": 12, "y": 2.35},
- {"matrix": [8, 1], "x": 13, "y": 2.6},
- {"matrix": [8, 0], "x": 14, "y": 2.6},
-
- {"matrix": [3, 0], "x": 0, "y": 3.6},
- {"matrix": [3, 1], "x": 1, "y": 3.6},
- {"matrix": [3, 2], "x": 2, "y": 3.35},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3.35},
- {"matrix": [3, 5], "x": 5, "y": 3.7},
-
- {"matrix": [9, 5], "x": 9, "y": 3.7},
- {"matrix": [9, 4], "x": 10, "y": 3.35},
- {"matrix": [9, 3], "x": 11, "y": 3},
- {"matrix": [9, 2], "x": 12, "y": 3.35},
- {"matrix": [9, 1], "x": 13, "y": 3.6},
- {"matrix": [9, 0], "x": 14, "y": 3.6},
-
- {"matrix": [4, 0], "x": 0, "y": 4.6},
- {"matrix": [4, 1], "x": 1, "y": 4.6},
- {"matrix": [4, 2], "x": 2, "y": 4.35},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4.35},
- {"matrix": [4, 5], "x": 5, "y": 4.7},
- {"matrix": [5, 5], "x": 6, "y": 3.95, "h": 1.5},
-
- {"matrix": [11, 5], "x": 8, "y": 3.95, "h": 1.5},
- {"matrix": [10, 5], "x": 9, "y": 4.7},
- {"matrix": [10, 4], "x": 10, "y": 4.35},
- {"matrix": [10, 3], "x": 11, "y": 4},
- {"matrix": [10, 2], "x": 12, "y": 4.35},
- {"matrix": [10, 1], "x": 13, "y": 4.6},
- {"matrix": [10, 0], "x": 14, "y": 4.6}
- ]
- }
- }
-}
diff --git a/keyboards/nacly/splitreus62/keyboard.json b/keyboards/nacly/splitreus62/keyboard.json
new file mode 100644
index 00000000000..4efc32f5c5d
--- /dev/null
+++ b/keyboards/nacly/splitreus62/keyboard.json
@@ -0,0 +1,115 @@
+{
+ "keyboard_name": "Splitreus62",
+ "manufacturer": "NaCly",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xBEEF",
+ "pid": "0xFED0",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["E6", "B4", "B5", "B6", "B2", "B3"],
+ "rows": ["D3", "D2", "D1", "D4", "C6", "D7"]
+ },
+ "diode_direction": "ROW2COL",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 12,
+ "split_count": [6, 6]
+ },
+ "ws2812": {
+ "pin": "B1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.6},
+ {"matrix": [0, 1], "x": 1, "y": 0.6},
+ {"matrix": [0, 2], "x": 2, "y": 0.35},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.35},
+ {"matrix": [0, 5], "x": 5, "y": 0.7},
+
+ {"matrix": [6, 5], "x": 9, "y": 0.7},
+ {"matrix": [6, 4], "x": 10, "y": 0.35},
+ {"matrix": [6, 3], "x": 11, "y": 0},
+ {"matrix": [6, 2], "x": 12, "y": 0.35},
+ {"matrix": [6, 1], "x": 13, "y": 0.6},
+ {"matrix": [6, 0], "x": 14, "y": 0.6},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.6},
+ {"matrix": [1, 1], "x": 1, "y": 1.6},
+ {"matrix": [1, 2], "x": 2, "y": 1.35},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.35},
+ {"matrix": [1, 5], "x": 5, "y": 1.7},
+
+ {"matrix": [7, 5], "x": 9, "y": 1.7},
+ {"matrix": [7, 4], "x": 10, "y": 1.35},
+ {"matrix": [7, 3], "x": 11, "y": 1},
+ {"matrix": [7, 2], "x": 12, "y": 1.35},
+ {"matrix": [7, 1], "x": 13, "y": 1.6},
+ {"matrix": [7, 0], "x": 14, "y": 1.6},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.6},
+ {"matrix": [2, 1], "x": 1, "y": 2.6},
+ {"matrix": [2, 2], "x": 2, "y": 2.35},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.35},
+ {"matrix": [2, 5], "x": 5, "y": 2.7},
+
+ {"matrix": [8, 5], "x": 9, "y": 2.7},
+ {"matrix": [8, 4], "x": 10, "y": 2.35},
+ {"matrix": [8, 3], "x": 11, "y": 2},
+ {"matrix": [8, 2], "x": 12, "y": 2.35},
+ {"matrix": [8, 1], "x": 13, "y": 2.6},
+ {"matrix": [8, 0], "x": 14, "y": 2.6},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.6},
+ {"matrix": [3, 1], "x": 1, "y": 3.6},
+ {"matrix": [3, 2], "x": 2, "y": 3.35},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.35},
+ {"matrix": [3, 5], "x": 5, "y": 3.7},
+
+ {"matrix": [9, 5], "x": 9, "y": 3.7},
+ {"matrix": [9, 4], "x": 10, "y": 3.35},
+ {"matrix": [9, 3], "x": 11, "y": 3},
+ {"matrix": [9, 2], "x": 12, "y": 3.35},
+ {"matrix": [9, 1], "x": 13, "y": 3.6},
+ {"matrix": [9, 0], "x": 14, "y": 3.6},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.6},
+ {"matrix": [4, 1], "x": 1, "y": 4.6},
+ {"matrix": [4, 2], "x": 2, "y": 4.35},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4.35},
+ {"matrix": [4, 5], "x": 5, "y": 4.7},
+ {"matrix": [5, 5], "x": 6, "y": 3.95, "h": 1.5},
+
+ {"matrix": [11, 5], "x": 8, "y": 3.95, "h": 1.5},
+ {"matrix": [10, 5], "x": 9, "y": 4.7},
+ {"matrix": [10, 4], "x": 10, "y": 4.35},
+ {"matrix": [10, 3], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 12, "y": 4.35},
+ {"matrix": [10, 1], "x": 13, "y": 4.6},
+ {"matrix": [10, 0], "x": 14, "y": 4.6}
+ ]
+ }
+ }
+}
diff --git a/keyboards/nacly/splitreus62/rules.mk b/keyboards/nacly/splitreus62/rules.mk
deleted file mode 100644
index 81ed47f82da..00000000000
--- a/keyboards/nacly/splitreus62/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 = yes # 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json
index 65cd463708b..909e45d1625 100644
--- a/keyboards/nullbitsco/snap/info.json
+++ b/keyboards/nullbitsco/snap/info.json
@@ -31,6 +31,7 @@
}
},
"split": {
+ "enabled": true,
"encoder": {
"right": {
"rotary": [
diff --git a/keyboards/nullbitsco/snap/rules.mk b/keyboards/nullbitsco/snap/rules.mk
index 2ad88b97c02..087be867f3e 100644
--- a/keyboards/nullbitsco/snap/rules.mk
+++ b/keyboards/nullbitsco/snap/rules.mk
@@ -9,7 +9,6 @@ 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
-SPLIT_KEYBOARD = yes # Split common
LTO_ENABLE = yes # Use Link Time Optimization
ENCODER_ENABLE = yes # Enables the use of one or more encoders
SPACE_CADET_ENABLE = no # Enables the use of Space Cadet
diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/info.json
deleted file mode 100644
index 464cd01be8f..00000000000
--- a/keyboards/obosob/arch_36/info.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
- "keyboard_name": "Arch-36",
- "manufacturer": "obosob",
- "url": "",
- "maintainer": "obosob",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x9CE3",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F7", "B1", "B3", "B2", "B6"],
- "rows": ["D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "rgblight": {
- "led_count": 12,
- "led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
- "split_count": [6, 6]
- },
- "ws2812": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "community_layouts": ["split_3x5_3"],
- "layouts": {
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 1},
- {"matrix": [0, 1], "x": 1, "y": 0.25},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.375},
- {"matrix": [0, 4], "x": 4, "y": 0.5},
-
- {"matrix": [4, 4], "x": 9, "y": 0.5},
- {"matrix": [4, 3], "x": 10, "y": 0.375},
- {"matrix": [4, 2], "x": 11, "y": 0},
- {"matrix": [4, 1], "x": 12, "y": 0.25},
- {"matrix": [4, 0], "x": 13, "y": 1},
-
- {"matrix": [1, 0], "x": 0, "y": 2},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.375},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
-
- {"matrix": [5, 4], "x": 9, "y": 1.5},
- {"matrix": [5, 3], "x": 10, "y": 1.375},
- {"matrix": [5, 2], "x": 11, "y": 1},
- {"matrix": [5, 1], "x": 12, "y": 1.25},
- {"matrix": [5, 0], "x": 13, "y": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 3},
- {"matrix": [2, 1], "x": 1, "y": 2.25},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.375},
- {"matrix": [2, 4], "x": 4, "y": 2.5},
-
- {"matrix": [6, 4], "x": 9, "y": 2.5},
- {"matrix": [6, 3], "x": 10, "y": 2.375},
- {"matrix": [6, 2], "x": 11, "y": 2},
- {"matrix": [6, 1], "x": 12, "y": 2.25},
- {"matrix": [6, 0], "x": 13, "y": 3},
-
- {"matrix": [3, 2], "x": 3.5, "y": 3.5},
- {"matrix": [3, 3], "x": 4.5, "y": 3.7},
- {"matrix": [3, 4], "x": 5.5, "y": 4.1},
-
- {"matrix": [7, 4], "x": 7.5, "y": 4.1},
- {"matrix": [7, 3], "x": 8.5, "y": 3.7},
- {"matrix": [7, 2], "x": 9.5, "y": 3.5}
- ]
- }
- }
-}
diff --git a/keyboards/obosob/arch_36/keyboard.json b/keyboards/obosob/arch_36/keyboard.json
new file mode 100644
index 00000000000..db3e356f3a7
--- /dev/null
+++ b/keyboards/obosob/arch_36/keyboard.json
@@ -0,0 +1,90 @@
+{
+ "keyboard_name": "Arch-36",
+ "manufacturer": "obosob",
+ "url": "",
+ "maintainer": "obosob",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x9CE3",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "oled": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "rgblight": {
+ "led_count": 12,
+ "led_map": [0, 1, 2, 3, 4, 5, 11, 10, 9, 8, 7, 6],
+ "split_count": [6, 6]
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "community_layouts": ["split_3x5_3"],
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.375},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+ {"matrix": [4, 4], "x": 9, "y": 0.5},
+ {"matrix": [4, 3], "x": 10, "y": 0.375},
+ {"matrix": [4, 2], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0.25},
+ {"matrix": [4, 0], "x": 13, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.375},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+ {"matrix": [5, 4], "x": 9, "y": 1.5},
+ {"matrix": [5, 3], "x": 10, "y": 1.375},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 1], "x": 12, "y": 1.25},
+ {"matrix": [5, 0], "x": 13, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.375},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+ {"matrix": [6, 4], "x": 9, "y": 2.5},
+ {"matrix": [6, 3], "x": 10, "y": 2.375},
+ {"matrix": [6, 2], "x": 11, "y": 2},
+ {"matrix": [6, 1], "x": 12, "y": 2.25},
+ {"matrix": [6, 0], "x": 13, "y": 3},
+
+ {"matrix": [3, 2], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 4.5, "y": 3.7},
+ {"matrix": [3, 4], "x": 5.5, "y": 4.1},
+
+ {"matrix": [7, 4], "x": 7.5, "y": 4.1},
+ {"matrix": [7, 3], "x": 8.5, "y": 3.7},
+ {"matrix": [7, 2], "x": 9.5, "y": 3.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/obosob/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk
deleted file mode 100644
index 7d311cd4058..00000000000
--- a/keyboards/obosob/arch_36/rules.mk
+++ /dev/null
@@ -1,14 +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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes # Split common
diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json
deleted file mode 100644
index e598ec33929..00000000000
--- a/keyboards/obosob/steal_this_keyboard/info.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "keyboard_name": "Steal This Keyboard!",
- "manufacturer": "Obosob",
- "url": "https://github.com/obosob/steal_this_keyboard",
- "maintainer": "@obosob",
- "usb": {
- "vid": "0xC2AB",
- "pid": "0x50AD",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "matrix_pins": {
- "direct": [
- ["F4", "F7", "B2", "D1", "D7"],
- ["F5", "B1", "B6", "D0", "E6"],
- ["F6", "B3", "D3", "D4", "B4"],
- ["C6", "B5", null, null, null]
- ]
- },
- "split": {
- "soft_serial_pin": "D2",
- "matrix_pins": {
- "right": {
- "direct": [
- ["D7", "D1", "B2", "F7", "F4"],
- ["E6", "D0", "B6", "B1", "F5"],
- ["B4", "D4", "D3", "B3", "F6"],
- ["B5", "C6", null, null, null]
- ]
- }
- }
- },
- "community_layouts": [
- "split_3x5_2"
- ],
- "layouts": {
- "LAYOUT_split_3x5_2": {
- "layout": [
- {"x": 0, "y": 0.93, "matrix": [0, 0]},
- {"x": 1, "y": 0.31, "matrix": [0, 1]},
- {"x": 2, "y": 0, "matrix": [0, 2]},
- {"x": 3, "y": 0.28, "matrix": [0, 3]},
- {"x": 4, "y": 0.42, "matrix": [0, 4]},
-
- {"x": 7, "y": 0.42, "matrix": [4, 0]},
- {"x": 8, "y": 0.28, "matrix": [4, 1]},
- {"x": 9, "y": 0, "matrix": [4, 2]},
- {"x": 10, "y": 0.31, "matrix": [4, 3]},
- {"x": 11, "y": 0.93, "matrix": [4, 4]},
-
- {"x": 0, "y": 1.93, "matrix": [1, 0]},
- {"x": 1, "y": 1.31, "matrix": [1, 1]},
- {"x": 2, "y": 1, "matrix": [1, 2]},
- {"x": 3, "y": 1.28, "matrix": [1, 3]},
- {"x": 4, "y": 1.42, "matrix": [1, 4]},
-
- {"x": 7, "y": 1.42, "matrix": [5, 0]},
- {"x": 8, "y": 1.28, "matrix": [5, 1]},
- {"x": 9, "y": 1, "matrix": [5, 2]},
- {"x": 10, "y": 1.31, "matrix": [5, 3]},
- {"x": 11, "y": 1.93, "matrix": [5, 4]},
-
- {"x": 0, "y": 2.93, "matrix": [2, 0]},
- {"x": 1, "y": 2.31, "matrix": [2, 1]},
- {"x": 2, "y": 2, "matrix": [2, 2]},
- {"x": 3, "y": 2.28, "matrix": [2, 3]},
- {"x": 4, "y": 2.42, "matrix": [2, 4]},
-
- {"x": 7, "y": 2.42, "matrix": [6, 0]},
- {"x": 8, "y": 2.28, "matrix": [6, 1]},
- {"x": 9, "y": 2, "matrix": [6, 2]},
- {"x": 10, "y": 2.31, "matrix": [6, 3]},
- {"x": 11, "y": 2.93, "matrix": [6, 4]},
-
- {"x": 3.5, "y": 3.75, "matrix": [3, 0]},
- {"x": 4.5, "y": 4, "matrix": [3, 1]},
-
- {"x": 6.5, "y": 4, "matrix": [7, 0]},
- {"x": 7.5, "y": 3.75, "matrix": [7, 1]}
- ]
- }
- }
-}
diff --git a/keyboards/obosob/steal_this_keyboard/keyboard.json b/keyboards/obosob/steal_this_keyboard/keyboard.json
new file mode 100644
index 00000000000..83de29d69c8
--- /dev/null
+++ b/keyboards/obosob/steal_this_keyboard/keyboard.json
@@ -0,0 +1,94 @@
+{
+ "keyboard_name": "Steal This Keyboard!",
+ "manufacturer": "Obosob",
+ "url": "https://github.com/obosob/steal_this_keyboard",
+ "maintainer": "@obosob",
+ "usb": {
+ "vid": "0xC2AB",
+ "pid": "0x50AD",
+ "device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "unicode": true
+ },
+ "matrix_pins": {
+ "direct": [
+ ["F4", "F7", "B2", "D1", "D7"],
+ ["F5", "B1", "B6", "D0", "E6"],
+ ["F6", "B3", "D3", "D4", "B4"],
+ ["C6", "B5", null, null, null]
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "matrix_pins": {
+ "right": {
+ "direct": [
+ ["D7", "D1", "B2", "F7", "F4"],
+ ["E6", "D0", "B6", "B1", "F5"],
+ ["B4", "D4", "D3", "B3", "F6"],
+ ["B5", "C6", null, null, null]
+ ]
+ }
+ }
+ },
+ "community_layouts": [
+ "split_3x5_2"
+ ],
+ "layouts": {
+ "LAYOUT_split_3x5_2": {
+ "layout": [
+ {"x": 0, "y": 0.93, "matrix": [0, 0]},
+ {"x": 1, "y": 0.31, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0.28, "matrix": [0, 3]},
+ {"x": 4, "y": 0.42, "matrix": [0, 4]},
+
+ {"x": 7, "y": 0.42, "matrix": [4, 0]},
+ {"x": 8, "y": 0.28, "matrix": [4, 1]},
+ {"x": 9, "y": 0, "matrix": [4, 2]},
+ {"x": 10, "y": 0.31, "matrix": [4, 3]},
+ {"x": 11, "y": 0.93, "matrix": [4, 4]},
+
+ {"x": 0, "y": 1.93, "matrix": [1, 0]},
+ {"x": 1, "y": 1.31, "matrix": [1, 1]},
+ {"x": 2, "y": 1, "matrix": [1, 2]},
+ {"x": 3, "y": 1.28, "matrix": [1, 3]},
+ {"x": 4, "y": 1.42, "matrix": [1, 4]},
+
+ {"x": 7, "y": 1.42, "matrix": [5, 0]},
+ {"x": 8, "y": 1.28, "matrix": [5, 1]},
+ {"x": 9, "y": 1, "matrix": [5, 2]},
+ {"x": 10, "y": 1.31, "matrix": [5, 3]},
+ {"x": 11, "y": 1.93, "matrix": [5, 4]},
+
+ {"x": 0, "y": 2.93, "matrix": [2, 0]},
+ {"x": 1, "y": 2.31, "matrix": [2, 1]},
+ {"x": 2, "y": 2, "matrix": [2, 2]},
+ {"x": 3, "y": 2.28, "matrix": [2, 3]},
+ {"x": 4, "y": 2.42, "matrix": [2, 4]},
+
+ {"x": 7, "y": 2.42, "matrix": [6, 0]},
+ {"x": 8, "y": 2.28, "matrix": [6, 1]},
+ {"x": 9, "y": 2, "matrix": [6, 2]},
+ {"x": 10, "y": 2.31, "matrix": [6, 3]},
+ {"x": 11, "y": 2.93, "matrix": [6, 4]},
+
+ {"x": 3.5, "y": 3.75, "matrix": [3, 0]},
+ {"x": 4.5, "y": 4, "matrix": [3, 1]},
+
+ {"x": 6.5, "y": 4, "matrix": [7, 0]},
+ {"x": 7.5, "y": 3.75, "matrix": [7, 1]}
+ ]
+ }
+ }
+}
diff --git a/keyboards/obosob/steal_this_keyboard/rules.mk b/keyboards/obosob/steal_this_keyboard/rules.mk
deleted file mode 100644
index 0ce5439c7b3..00000000000
--- a/keyboards/obosob/steal_this_keyboard/rules.mk
+++ /dev/null
@@ -1,14 +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
-UNICODE_ENABLE = yes # Unicode
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes # Use shared split_common code
diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json
index 8e21be5d690..8ec0cb69b21 100644
--- a/keyboards/oddball/info.json
+++ b/keyboards/oddball/info.json
@@ -8,6 +8,9 @@
"pid": "0xCA49",
"device_version": "0.0.1"
},
+ "split": {
+ "enabled": true
+ },
"processor": "atmega32u4",
"layouts": {
"LAYOUT": {
diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/rules.mk
index 50c2891bb8a..5a3becd82a6 100644
--- a/keyboards/oddball/rules.mk
+++ b/keyboards/oddball/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json
deleted file mode 100644
index 6c3feea0e05..00000000000
--- a/keyboards/ogre/ergo_single/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
- "keyboard_name": "Ogre Ergo Single",
- "manufacturer": "ctrlshiftba",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
- "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "rgblight": {
- "led_count": 14,
- "led_map": [0, 1, 2, 3, 4, 5, 6, 13, 12, 11, 10, 9, 8, 7],
- "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": {
- "pin": "B6"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [3, 6], "x": 0.25, "y": 0.5},
- {"matrix": [0, 0], "x": 1.25, "y": 0.5},
- {"matrix": [0, 1], "x": 2.25, "y": 0.5},
- {"matrix": [0, 2], "x": 3.25, "y": 0.25},
- {"matrix": [0, 3], "x": 4.25, "y": 0},
- {"matrix": [0, 4], "x": 5.25, "y": 0.25},
- {"matrix": [0, 5], "x": 6.25, "y": 0.5},
- {"matrix": [0, 6], "x": 7.25, "y": 0.5},
-
- {"matrix": [5, 6], "x": 11.25, "y": 0.5},
- {"matrix": [5, 5], "x": 12.25, "y": 0.5},
- {"matrix": [5, 4], "x": 13.25, "y": 0.25},
- {"matrix": [5, 3], "x": 14.25, "y": 0},
- {"matrix": [5, 2], "x": 15.25, "y": 0.25},
- {"matrix": [5, 1], "x": 16.25, "y": 0.5},
- {"matrix": [5, 0], "x": 17.25, "y": 0.5},
- {"matrix": [8, 6], "x": 18.25, "y": 0.5},
-
- {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5},
- {"matrix": [1, 1], "x": 2.25, "y": 1.5},
- {"matrix": [1, 2], "x": 3.25, "y": 1.25},
- {"matrix": [1, 3], "x": 4.25, "y": 1},
- {"matrix": [1, 4], "x": 5.25, "y": 1.25},
- {"matrix": [1, 5], "x": 6.25, "y": 1.5},
- {"matrix": [1, 6], "x": 7.25, "y": 1.5},
-
- {"matrix": [6, 6], "x": 11.25, "y": 1.5},
- {"matrix": [6, 5], "x": 12.25, "y": 1.5},
- {"matrix": [6, 4], "x": 13.25, "y": 1.25},
- {"matrix": [6, 3], "x": 14.25, "y": 1},
- {"matrix": [6, 2], "x": 15.25, "y": 1.25},
- {"matrix": [6, 1], "x": 16.25, "y": 1.5},
- {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75},
- {"matrix": [2, 1], "x": 2.25, "y": 2.5},
- {"matrix": [2, 2], "x": 3.25, "y": 2.25},
- {"matrix": [2, 3], "x": 4.25, "y": 2},
- {"matrix": [2, 4], "x": 5.25, "y": 2.25},
- {"matrix": [2, 5], "x": 6.25, "y": 2.5},
- {"matrix": [2, 6], "x": 7.25, "y": 2.5},
-
- {"matrix": [7, 6], "x": 11.25, "y": 2.5},
- {"matrix": [7, 5], "x": 12.25, "y": 2.5},
- {"matrix": [7, 4], "x": 13.25, "y": 2.25},
- {"matrix": [7, 3], "x": 14.25, "y": 2},
- {"matrix": [7, 2], "x": 15.25, "y": 2.25},
- {"matrix": [7, 1], "x": 16.25, "y": 2.5},
- {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3.5},
- {"matrix": [3, 2], "x": 3.25, "y": 3.25},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3.25},
- {"matrix": [3, 5], "x": 6.25, "y": 3.5},
-
- {"matrix": [8, 5], "x": 12.25, "y": 3.5},
- {"matrix": [8, 4], "x": 13.25, "y": 3.25},
- {"matrix": [8, 3], "x": 14.25, "y": 3},
- {"matrix": [8, 2], "x": 15.25, "y": 3.25},
- {"matrix": [8, 1], "x": 16.25, "y": 3.5},
- {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25},
-
- {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25},
- {"matrix": [4, 1], "x": 2.25, "y": 4.5},
- {"matrix": [4, 2], "x": 3.25, "y": 4.25},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25},
- {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75},
- {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2},
-
- {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5},
- {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2},
- {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25},
- {"matrix": [9, 3], "x": 14.25, "y": 4},
- {"matrix": [9, 2], "x": 15.25, "y": 4.25},
- {"matrix": [9, 1], "x": 16.25, "y": 4.5},
- {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/ogre/ergo_single/keyboard.json b/keyboards/ogre/ergo_single/keyboard.json
new file mode 100644
index 00000000000..3ebd88b0d28
--- /dev/null
+++ b/keyboards/ogre/ergo_single/keyboard.json
@@ -0,0 +1,131 @@
+{
+ "keyboard_name": "Ogre Ergo Single",
+ "manufacturer": "ctrlshiftba",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "rgblight": {
+ "led_count": 14,
+ "led_map": [0, 1, 2, 3, 4, 5, 6, 13, 12, 11, 10, 9, 8, 7],
+ "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": {
+ "pin": "B6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [3, 6], "x": 0.25, "y": 0.5},
+ {"matrix": [0, 0], "x": 1.25, "y": 0.5},
+ {"matrix": [0, 1], "x": 2.25, "y": 0.5},
+ {"matrix": [0, 2], "x": 3.25, "y": 0.25},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0.25},
+ {"matrix": [0, 5], "x": 6.25, "y": 0.5},
+ {"matrix": [0, 6], "x": 7.25, "y": 0.5},
+
+ {"matrix": [5, 6], "x": 11.25, "y": 0.5},
+ {"matrix": [5, 5], "x": 12.25, "y": 0.5},
+ {"matrix": [5, 4], "x": 13.25, "y": 0.25},
+ {"matrix": [5, 3], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0.25},
+ {"matrix": [5, 1], "x": 16.25, "y": 0.5},
+ {"matrix": [5, 0], "x": 17.25, "y": 0.5},
+ {"matrix": [8, 6], "x": 18.25, "y": 0.5},
+
+ {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5},
+ {"matrix": [1, 1], "x": 2.25, "y": 1.5},
+ {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 4.25, "y": 1},
+ {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 6.25, "y": 1.5},
+ {"matrix": [1, 6], "x": 7.25, "y": 1.5},
+
+ {"matrix": [6, 6], "x": 11.25, "y": 1.5},
+ {"matrix": [6, 5], "x": 12.25, "y": 1.5},
+ {"matrix": [6, 4], "x": 13.25, "y": 1.25},
+ {"matrix": [6, 3], "x": 14.25, "y": 1},
+ {"matrix": [6, 2], "x": 15.25, "y": 1.25},
+ {"matrix": [6, 1], "x": 16.25, "y": 1.5},
+ {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.25, "y": 2.5},
+ {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2.25},
+ {"matrix": [2, 5], "x": 6.25, "y": 2.5},
+ {"matrix": [2, 6], "x": 7.25, "y": 2.5},
+
+ {"matrix": [7, 6], "x": 11.25, "y": 2.5},
+ {"matrix": [7, 5], "x": 12.25, "y": 2.5},
+ {"matrix": [7, 4], "x": 13.25, "y": 2.25},
+ {"matrix": [7, 3], "x": 14.25, "y": 2},
+ {"matrix": [7, 2], "x": 15.25, "y": 2.25},
+ {"matrix": [7, 1], "x": 16.25, "y": 2.5},
+ {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3.5},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+
+ {"matrix": [8, 5], "x": 12.25, "y": 3.5},
+ {"matrix": [8, 4], "x": 13.25, "y": 3.25},
+ {"matrix": [8, 3], "x": 14.25, "y": 3},
+ {"matrix": [8, 2], "x": 15.25, "y": 3.25},
+ {"matrix": [8, 1], "x": 16.25, "y": 3.5},
+ {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75},
+ {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2},
+
+ {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5},
+ {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2},
+ {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25},
+ {"matrix": [9, 3], "x": 14.25, "y": 4},
+ {"matrix": [9, 2], "x": 15.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 16.25, "y": 4.5},
+ {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ogre/ergo_single/rules.mk b/keyboards/ogre/ergo_single/rules.mk
deleted file mode 100644
index a3964a74c08..00000000000
--- a/keyboards/ogre/ergo_single/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-SPLIT_KEYBOARD = no
diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json
deleted file mode 100644
index 7da3bb487a6..00000000000
--- a/keyboards/ogre/ergo_split/info.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
- "keyboard_name": "Ogre Ergo Split",
- "manufacturer": "ctrlshiftba",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
- "rows": ["C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D3"
- },
- "rgblight": {
- "led_count": 14,
- "led_map": [6, 5, 4, 3, 2, 1, 0, 13, 12, 11, 10, 9, 8, 7],
- "split_count": [7, 7],
- "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": {
- "pin": "B6"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [3, 6], "x": 0.25, "y": 0.5},
- {"matrix": [0, 0], "x": 1.25, "y": 0.5},
- {"matrix": [0, 1], "x": 2.25, "y": 0.5},
- {"matrix": [0, 2], "x": 3.25, "y": 0.25},
- {"matrix": [0, 3], "x": 4.25, "y": 0},
- {"matrix": [0, 4], "x": 5.25, "y": 0.25},
- {"matrix": [0, 5], "x": 6.25, "y": 0.5},
- {"matrix": [0, 6], "x": 7.25, "y": 0.5},
-
- {"matrix": [5, 6], "x": 11.25, "y": 0.5},
- {"matrix": [5, 5], "x": 12.25, "y": 0.5},
- {"matrix": [5, 4], "x": 13.25, "y": 0.25},
- {"matrix": [5, 3], "x": 14.25, "y": 0},
- {"matrix": [5, 2], "x": 15.25, "y": 0.25},
- {"matrix": [5, 1], "x": 16.25, "y": 0.5},
- {"matrix": [5, 0], "x": 17.25, "y": 0.5},
- {"matrix": [8, 6], "x": 18.25, "y": 0.5},
-
- {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5},
- {"matrix": [1, 1], "x": 2.25, "y": 1.5},
- {"matrix": [1, 2], "x": 3.25, "y": 1.25},
- {"matrix": [1, 3], "x": 4.25, "y": 1},
- {"matrix": [1, 4], "x": 5.25, "y": 1.25},
- {"matrix": [1, 5], "x": 6.25, "y": 1.5},
- {"matrix": [1, 6], "x": 7.25, "y": 1.5},
-
- {"matrix": [6, 6], "x": 11.25, "y": 1.5},
- {"matrix": [6, 5], "x": 12.25, "y": 1.5},
- {"matrix": [6, 4], "x": 13.25, "y": 1.25},
- {"matrix": [6, 3], "x": 14.25, "y": 1},
- {"matrix": [6, 2], "x": 15.25, "y": 1.25},
- {"matrix": [6, 1], "x": 16.25, "y": 1.5},
- {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75},
- {"matrix": [2, 1], "x": 2.25, "y": 2.5},
- {"matrix": [2, 2], "x": 3.25, "y": 2.25},
- {"matrix": [2, 3], "x": 4.25, "y": 2},
- {"matrix": [2, 4], "x": 5.25, "y": 2.25},
- {"matrix": [2, 5], "x": 6.25, "y": 2.5},
- {"matrix": [2, 6], "x": 7.25, "y": 2.5},
-
- {"matrix": [7, 6], "x": 11.25, "y": 2.5},
- {"matrix": [7, 5], "x": 12.25, "y": 2.5},
- {"matrix": [7, 4], "x": 13.25, "y": 2.25},
- {"matrix": [7, 3], "x": 14.25, "y": 2},
- {"matrix": [7, 2], "x": 15.25, "y": 2.25},
- {"matrix": [7, 1], "x": 16.25, "y": 2.5},
- {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3.5},
- {"matrix": [3, 2], "x": 3.25, "y": 3.25},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3.25},
- {"matrix": [3, 5], "x": 6.25, "y": 3.5},
-
- {"matrix": [8, 5], "x": 12.25, "y": 3.5},
- {"matrix": [8, 4], "x": 13.25, "y": 3.25},
- {"matrix": [8, 3], "x": 14.25, "y": 3},
- {"matrix": [8, 2], "x": 15.25, "y": 3.25},
- {"matrix": [8, 1], "x": 16.25, "y": 3.5},
- {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25},
-
- {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25},
- {"matrix": [4, 1], "x": 2.25, "y": 4.5},
- {"matrix": [4, 2], "x": 3.25, "y": 4.25},
- {"matrix": [4, 3], "x": 4.25, "y": 4},
- {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25},
- {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75},
- {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2},
-
- {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5},
- {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2},
- {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25},
- {"matrix": [9, 3], "x": 14.25, "y": 4},
- {"matrix": [9, 2], "x": 15.25, "y": 4.25},
- {"matrix": [9, 1], "x": 16.25, "y": 4.5},
- {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/ogre/ergo_split/keyboard.json b/keyboards/ogre/ergo_split/keyboard.json
new file mode 100644
index 00000000000..765bebc2fba
--- /dev/null
+++ b/keyboards/ogre/ergo_split/keyboard.json
@@ -0,0 +1,136 @@
+{
+ "keyboard_name": "Ogre Ergo Split",
+ "manufacturer": "ctrlshiftba",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3"
+ },
+ "rgblight": {
+ "led_count": 14,
+ "led_map": [6, 5, 4, 3, 2, 1, 0, 13, 12, 11, 10, 9, 8, 7],
+ "split_count": [7, 7],
+ "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": {
+ "pin": "B6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [3, 6], "x": 0.25, "y": 0.5},
+ {"matrix": [0, 0], "x": 1.25, "y": 0.5},
+ {"matrix": [0, 1], "x": 2.25, "y": 0.5},
+ {"matrix": [0, 2], "x": 3.25, "y": 0.25},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0.25},
+ {"matrix": [0, 5], "x": 6.25, "y": 0.5},
+ {"matrix": [0, 6], "x": 7.25, "y": 0.5},
+
+ {"matrix": [5, 6], "x": 11.25, "y": 0.5},
+ {"matrix": [5, 5], "x": 12.25, "y": 0.5},
+ {"matrix": [5, 4], "x": 13.25, "y": 0.25},
+ {"matrix": [5, 3], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0.25},
+ {"matrix": [5, 1], "x": 16.25, "y": 0.5},
+ {"matrix": [5, 0], "x": 17.25, "y": 0.5},
+ {"matrix": [8, 6], "x": 18.25, "y": 0.5},
+
+ {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5},
+ {"matrix": [1, 1], "x": 2.25, "y": 1.5},
+ {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 4.25, "y": 1},
+ {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 6.25, "y": 1.5},
+ {"matrix": [1, 6], "x": 7.25, "y": 1.5},
+
+ {"matrix": [6, 6], "x": 11.25, "y": 1.5},
+ {"matrix": [6, 5], "x": 12.25, "y": 1.5},
+ {"matrix": [6, 4], "x": 13.25, "y": 1.25},
+ {"matrix": [6, 3], "x": 14.25, "y": 1},
+ {"matrix": [6, 2], "x": 15.25, "y": 1.25},
+ {"matrix": [6, 1], "x": 16.25, "y": 1.5},
+ {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.25, "y": 2.5},
+ {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2.25},
+ {"matrix": [2, 5], "x": 6.25, "y": 2.5},
+ {"matrix": [2, 6], "x": 7.25, "y": 2.5},
+
+ {"matrix": [7, 6], "x": 11.25, "y": 2.5},
+ {"matrix": [7, 5], "x": 12.25, "y": 2.5},
+ {"matrix": [7, 4], "x": 13.25, "y": 2.25},
+ {"matrix": [7, 3], "x": 14.25, "y": 2},
+ {"matrix": [7, 2], "x": 15.25, "y": 2.25},
+ {"matrix": [7, 1], "x": 16.25, "y": 2.5},
+ {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3.5},
+ {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+ {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+
+ {"matrix": [8, 5], "x": 12.25, "y": 3.5},
+ {"matrix": [8, 4], "x": 13.25, "y": 3.25},
+ {"matrix": [8, 3], "x": 14.25, "y": 3},
+ {"matrix": [8, 2], "x": 15.25, "y": 3.25},
+ {"matrix": [8, 1], "x": 16.25, "y": 3.5},
+ {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4},
+ {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75},
+ {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2},
+
+ {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5},
+ {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2},
+ {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25},
+ {"matrix": [9, 3], "x": 14.25, "y": 4},
+ {"matrix": [9, 2], "x": 15.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 16.25, "y": 4.5},
+ {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ogre/ergo_split/rules.mk b/keyboards/ogre/ergo_split/rules.mk
deleted file mode 100644
index ce485aeb0a5..00000000000
--- a/keyboards/ogre/ergo_split/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/omkbd/ergodash/info.json b/keyboards/omkbd/ergodash/info.json
index 4369a041038..306a3970bb8 100644
--- a/keyboards/omkbd/ergodash/info.json
+++ b/keyboards/omkbd/ergodash/info.json
@@ -1,4 +1,7 @@
{
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "split": {
+ "enabled": true
+ }
}
diff --git a/keyboards/omkbd/ergodash/rules.mk b/keyboards/omkbd/ergodash/rules.mk
index 9a3cb950887..015ffcd8fb7 100644
--- a/keyboards/omkbd/ergodash/rules.mk
+++ b/keyboards/omkbd/ergodash/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes # Enables split keyboard support
-
DEFAULT_FOLDER = omkbd/ergodash/rev1
diff --git a/keyboards/omkbd/runner3680/info.json b/keyboards/omkbd/runner3680/info.json
index 4369a041038..306a3970bb8 100644
--- a/keyboards/omkbd/runner3680/info.json
+++ b/keyboards/omkbd/runner3680/info.json
@@ -1,4 +1,7 @@
{
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "split": {
+ "enabled": true
+ }
}
diff --git a/keyboards/omkbd/runner3680/rules.mk b/keyboards/omkbd/runner3680/rules.mk
index 5f16740e242..d90dd4adda3 100644
--- a/keyboards/omkbd/runner3680/rules.mk
+++ b/keyboards/omkbd/runner3680/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes # Enables split keyboard support
-
DEFAULT_FOLDER = omkbd/runner3680/5x8
diff --git a/keyboards/orthodox/info.json b/keyboards/orthodox/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/orthodox/info.json
@@ -0,0 +1,5 @@
+{
+ "split": {
+ "enabled": true
+ }
+}
diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk
index bb68468ec43..8fa7b0a404f 100644
--- a/keyboards/orthodox/rules.mk
+++ b/keyboards/orthodox/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = orthodox/rev3
diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json
index 2079750678a..c6a55a973af 100644
--- a/keyboards/phoenix/info.json
+++ b/keyboards/phoenix/info.json
@@ -14,6 +14,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "A9"
},
"processor": "STM32F401",
diff --git a/keyboards/phoenix/rules.mk b/keyboards/phoenix/rules.mk
index a83da5e996d..1e98eb214a5 100644
--- a/keyboards/phoenix/rules.mk
+++ b/keyboards/phoenix/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
STENO_ENABLE = no
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/pinky/info.json b/keyboards/pinky/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/pinky/info.json
@@ -0,0 +1,5 @@
+{
+ "split": {
+ "enabled": true
+ }
+}
diff --git a/keyboards/pinky/rules.mk b/keyboards/pinky/rules.mk
index 1b080863552..0329fc8dd57 100644
--- a/keyboards/pinky/rules.mk
+++ b/keyboards/pinky/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = pinky/3
diff --git a/keyboards/pisces/info.json b/keyboards/pisces/info.json
deleted file mode 100644
index e3dfef5ab7e..00000000000
--- a/keyboards/pisces/info.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "keyboard_name": "pisces",
- "manufacturer": "knaruo",
- "url": "https://github.com/knaruo/pisces",
- "maintainer": "knaruo",
- "usb": {
- "vid": "0x6B6E",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"],
- "rows": ["C4", "B0", "C7"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u2",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_split_3x6_1": {
- "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": [3, 5], "x": 9, "y": 0},
- {"matrix": [3, 4], "x": 10, "y": 0},
- {"matrix": [3, 3], "x": 11, "y": 0},
- {"matrix": [3, 2], "x": 12, "y": 0},
- {"matrix": [3, 1], "x": 13, "y": 0},
- {"matrix": [3, 0], "x": 14, "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": [4, 5], "x": 9, "y": 1},
- {"matrix": [4, 4], "x": 10, "y": 1},
- {"matrix": [4, 3], "x": 11, "y": 1},
- {"matrix": [4, 2], "x": 12, "y": 1},
- {"matrix": [4, 1], "x": 13, "y": 1},
- {"matrix": [4, 0], "x": 14, "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": [5, 6], "x": 8, "y": 2},
- {"matrix": [5, 5], "x": 9, "y": 2},
- {"matrix": [5, 4], "x": 10, "y": 2},
- {"matrix": [5, 3], "x": 11, "y": 2},
- {"matrix": [5, 2], "x": 12, "y": 2},
- {"matrix": [5, 1], "x": 13, "y": 2},
- {"matrix": [5, 0], "x": 14, "y": 2}
- ]
- }
- }
-}
diff --git a/keyboards/pisces/keyboard.json b/keyboards/pisces/keyboard.json
new file mode 100644
index 00000000000..2783f1085fd
--- /dev/null
+++ b/keyboards/pisces/keyboard.json
@@ -0,0 +1,79 @@
+{
+ "keyboard_name": "pisces",
+ "manufacturer": "knaruo",
+ "url": "https://github.com/knaruo/pisces",
+ "maintainer": "knaruo",
+ "usb": {
+ "vid": "0x6B6E",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"],
+ "rows": ["C4", "B0", "C7"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_split_3x6_1": {
+ "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": [3, 5], "x": 9, "y": 0},
+ {"matrix": [3, 4], "x": 10, "y": 0},
+ {"matrix": [3, 3], "x": 11, "y": 0},
+ {"matrix": [3, 2], "x": 12, "y": 0},
+ {"matrix": [3, 1], "x": 13, "y": 0},
+ {"matrix": [3, 0], "x": 14, "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": [4, 5], "x": 9, "y": 1},
+ {"matrix": [4, 4], "x": 10, "y": 1},
+ {"matrix": [4, 3], "x": 11, "y": 1},
+ {"matrix": [4, 2], "x": 12, "y": 1},
+ {"matrix": [4, 1], "x": 13, "y": 1},
+ {"matrix": [4, 0], "x": 14, "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": [5, 6], "x": 8, "y": 2},
+ {"matrix": [5, 5], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [5, 3], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [5, 1], "x": 13, "y": 2},
+ {"matrix": [5, 0], "x": 14, "y": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/pisces/rules.mk b/keyboards/pisces/rules.mk
deleted file mode 100644
index b3c916d3cea..00000000000
--- a/keyboards/pisces/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
-
-# Enable generic behavior for split boards
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
deleted file mode 100644
index 3668fc9a2b4..00000000000
--- a/keyboards/pluckey/info.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
- "keyboard_name": "pluckey",
- "manufacturer": "floookay",
- "url": "https://github.com/floookay/pluckey",
- "maintainer": "floookay",
- "usb": {
- "vid": "0xF100",
- "pid": "0x91CE",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "F7"],
- "rows": ["B4", "F5", "F6", "B6", "B5"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
- ]
- },
- "split": {
- "soft_serial_pin": "D2",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "B2", "pin_b": "B3", "resolution": 2}
- ]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_all"
- },
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.625, "w": 1.5},
- {"matrix": [0, 1], "x": 1.5, "y": 0.625},
- {"matrix": [0, 2], "x": 2.5, "y": 0.125},
- {"matrix": [0, 3], "x": 3.5, "y": 0},
- {"matrix": [0, 4], "x": 4.5, "y": 0.125},
- {"matrix": [0, 5], "x": 5.5, "y": 0.25},
- {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
- {"matrix": [5, 6], "x": 12, "y": 0.25},
- {"matrix": [5, 5], "x": 13, "y": 0.25},
- {"matrix": [5, 4], "x": 14, "y": 0.125},
- {"matrix": [5, 3], "x": 15, "y": 0},
- {"matrix": [5, 2], "x": 16, "y": 0.125},
- {"matrix": [5, 1], "x": 17, "y": 0.625},
- {"matrix": [5, 0], "x": 18, "y": 0.625, "w": 1.5},
-
- {"matrix": [1, 0], "x": 0, "y": 1.625, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1.625},
- {"matrix": [1, 2], "x": 2.5, "y": 1.125},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1.125},
- {"matrix": [1, 5], "x": 5.5, "y": 1.25},
- {"matrix": [1, 6], "x": 6.5, "y": 1.25},
-
- {"matrix": [6, 6], "x": 12, "y": 1.25},
- {"matrix": [6, 5], "x": 13, "y": 1.25},
- {"matrix": [6, 4], "x": 14, "y": 1.125},
- {"matrix": [6, 3], "x": 16, "y": 1.125},
- {"matrix": [6, 2], "x": 15, "y": 1},
- {"matrix": [6, 1], "x": 17, "y": 1.625},
- {"matrix": [6, 0], "x": 18, "y": 1.625, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.625, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.625},
- {"matrix": [2, 2], "x": 2.5, "y": 2.125},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2.125},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
-
- {"matrix": [7, 6], "x": 12, "y": 2.25},
- {"matrix": [7, 5], "x": 13, "y": 2.25},
- {"matrix": [7, 4], "x": 14, "y": 2.125},
- {"matrix": [7, 3], "x": 16, "y": 2.125},
- {"matrix": [7, 2], "x": 15, "y": 2},
- {"matrix": [7, 1], "x": 17, "y": 2.625},
- {"matrix": [7, 0], "x": 18, "y": 2.625, "w": 1.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.625, "w": 1.5},
- {"matrix": [3, 1], "x": 1.5, "y": 3.625},
- {"matrix": [3, 2], "x": 2.5, "y": 3.125},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3.125},
- {"matrix": [3, 5], "x": 5.5, "y": 3.25},
- {"matrix": [3, 6], "x": 6.5, "y": 3.25},
- {"matrix": [4, 1], "x": 7.5, "y": 3.75},
-
- {"matrix": [9, 1], "x": 11, "y": 3.75},
- {"matrix": [8, 6], "x": 12, "y": 3.25},
- {"matrix": [8, 5], "x": 13, "y": 3.25},
- {"matrix": [8, 4], "x": 14, "y": 3.125},
- {"matrix": [8, 3], "x": 15, "y": 3},
- {"matrix": [8, 2], "x": 16, "y": 3.125},
- {"matrix": [8, 1], "x": 17, "y": 3.625},
- {"matrix": [8, 0], "x": 18, "y": 3.625, "w": 1.5},
-
- {"matrix": [4, 2], "x": 2.5, "y": 4.125},
- {"matrix": [4, 3], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4.125},
- {"matrix": [4, 5], "x": 5.75, "y": 4.5, "w": 1.5},
- {"matrix": [4, 6], "x": 7.25, "y": 4.75},
-
- {"matrix": [9, 6], "x": 11.25, "y": 4.75},
- {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.5},
- {"matrix": [9, 4], "x": 14, "y": 4.125},
- {"matrix": [9, 3], "x": 15, "y": 4},
- {"matrix": [9, 2], "x": 16, "y": 4.125}
- ]
- },
- "LAYOUT_ergo": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.625, "w": 1.5},
- {"matrix": [0, 1], "x": 1.5, "y": 0.625},
- {"matrix": [0, 2], "x": 2.5, "y": 0.125},
- {"matrix": [0, 3], "x": 3.5, "y": 0},
- {"matrix": [0, 4], "x": 4.5, "y": 0.125},
- {"matrix": [0, 5], "x": 5.5, "y": 0.25},
- {"matrix": [0, 6], "x": 6.5, "y": 0.25},
-
- {"matrix": [5, 6], "x": 12, "y": 0.25},
- {"matrix": [5, 5], "x": 13, "y": 0.25},
- {"matrix": [5, 4], "x": 14, "y": 0.125},
- {"matrix": [5, 3], "x": 15, "y": 0},
- {"matrix": [5, 2], "x": 16, "y": 0.125},
- {"matrix": [5, 1], "x": 17, "y": 0.625},
- {"matrix": [5, 0], "x": 18, "y": 0.625, "w": 1.5},
-
- {"matrix": [1, 0], "x": 0, "y": 1.625, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1.625},
- {"matrix": [1, 2], "x": 2.5, "y": 1.125},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1.125},
- {"matrix": [1, 5], "x": 5.5, "y": 1.25},
- {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
-
- {"matrix": [6, 6], "x": 12, "y": 1.25, "h": 1.5},
- {"matrix": [6, 5], "x": 13, "y": 1.25},
- {"matrix": [6, 4], "x": 14, "y": 1.125},
- {"matrix": [6, 3], "x": 16, "y": 1.125},
- {"matrix": [6, 2], "x": 15, "y": 1},
- {"matrix": [6, 1], "x": 17, "y": 1.625},
- {"matrix": [6, 0], "x": 18, "y": 1.625, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.625, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.625},
- {"matrix": [2, 2], "x": 2.5, "y": 2.125},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2.125},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
- {"matrix": [7, 5], "x": 13, "y": 2.25},
- {"matrix": [7, 4], "x": 14, "y": 2.125},
- {"matrix": [7, 3], "x": 16, "y": 2.125},
- {"matrix": [7, 2], "x": 15, "y": 2},
- {"matrix": [7, 1], "x": 17, "y": 2.625},
- {"matrix": [7, 0], "x": 18, "y": 2.625, "w": 1.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.625, "w": 1.5},
- {"matrix": [3, 1], "x": 1.5, "y": 3.625},
- {"matrix": [3, 2], "x": 2.5, "y": 3.125},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3.125},
- {"matrix": [3, 5], "x": 5.5, "y": 3.25},
- {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
- {"matrix": [4, 1], "x": 7.5, "y": 3.75},
-
- {"matrix": [9, 1], "x": 11, "y": 3.75},
- {"matrix": [8, 6], "x": 12, "y": 2.75, "h": 1.5},
- {"matrix": [8, 5], "x": 13, "y": 3.25},
- {"matrix": [8, 4], "x": 14, "y": 3.125},
- {"matrix": [8, 3], "x": 15, "y": 3},
- {"matrix": [8, 2], "x": 16, "y": 3.125},
- {"matrix": [8, 1], "x": 17, "y": 3.625},
- {"matrix": [8, 0], "x": 18, "y": 3.625, "w": 1.5},
-
- {"matrix": [4, 2], "x": 2.5, "y": 4.125},
- {"matrix": [4, 3], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4.125},
- {"matrix": [4, 5], "x": 5.75, "y": 4.5, "w": 1.5},
- {"matrix": [4, 6], "x": 7.25, "y": 4.75},
-
- {"matrix": [9, 6], "x": 11.25, "y": 4.75},
- {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.5},
- {"matrix": [9, 4], "x": 14, "y": 4.125},
- {"matrix": [9, 3], "x": 15, "y": 4},
- {"matrix": [9, 2], "x": 16, "y": 4.125}
- ]
- }
- }
-}
diff --git a/keyboards/pluckey/keyboard.json b/keyboards/pluckey/keyboard.json
new file mode 100644
index 00000000000..52e951e875c
--- /dev/null
+++ b/keyboards/pluckey/keyboard.json
@@ -0,0 +1,208 @@
+{
+ "keyboard_name": "pluckey",
+ "manufacturer": "floookay",
+ "url": "https://github.com/floookay/pluckey",
+ "maintainer": "floookay",
+ "usb": {
+ "vid": "0xF100",
+ "pid": "0x91CE",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "F7"],
+ "rows": ["B4", "F5", "F6", "B6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "B3", "resolution": 2}
+ ]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_all"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.625, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0.625},
+ {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+ {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+ {"matrix": [5, 6], "x": 12, "y": 0.25},
+ {"matrix": [5, 5], "x": 13, "y": 0.25},
+ {"matrix": [5, 4], "x": 14, "y": 0.125},
+ {"matrix": [5, 3], "x": 15, "y": 0},
+ {"matrix": [5, 2], "x": 16, "y": 0.125},
+ {"matrix": [5, 1], "x": 17, "y": 0.625},
+ {"matrix": [5, 0], "x": 18, "y": 0.625, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.625, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.625},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+
+ {"matrix": [6, 6], "x": 12, "y": 1.25},
+ {"matrix": [6, 5], "x": 13, "y": 1.25},
+ {"matrix": [6, 4], "x": 14, "y": 1.125},
+ {"matrix": [6, 3], "x": 16, "y": 1.125},
+ {"matrix": [6, 2], "x": 15, "y": 1},
+ {"matrix": [6, 1], "x": 17, "y": 1.625},
+ {"matrix": [6, 0], "x": 18, "y": 1.625, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.625, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.625},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+ {"matrix": [7, 6], "x": 12, "y": 2.25},
+ {"matrix": [7, 5], "x": 13, "y": 2.25},
+ {"matrix": [7, 4], "x": 14, "y": 2.125},
+ {"matrix": [7, 3], "x": 16, "y": 2.125},
+ {"matrix": [7, 2], "x": 15, "y": 2},
+ {"matrix": [7, 1], "x": 17, "y": 2.625},
+ {"matrix": [7, 0], "x": 18, "y": 2.625, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.625, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3.625},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 3.25},
+ {"matrix": [4, 1], "x": 7.5, "y": 3.75},
+
+ {"matrix": [9, 1], "x": 11, "y": 3.75},
+ {"matrix": [8, 6], "x": 12, "y": 3.25},
+ {"matrix": [8, 5], "x": 13, "y": 3.25},
+ {"matrix": [8, 4], "x": 14, "y": 3.125},
+ {"matrix": [8, 3], "x": 15, "y": 3},
+ {"matrix": [8, 2], "x": 16, "y": 3.125},
+ {"matrix": [8, 1], "x": 17, "y": 3.625},
+ {"matrix": [8, 0], "x": 18, "y": 3.625, "w": 1.5},
+
+ {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+ {"matrix": [4, 5], "x": 5.75, "y": 4.5, "w": 1.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.75},
+
+ {"matrix": [9, 6], "x": 11.25, "y": 4.75},
+ {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.5},
+ {"matrix": [9, 4], "x": 14, "y": 4.125},
+ {"matrix": [9, 3], "x": 15, "y": 4},
+ {"matrix": [9, 2], "x": 16, "y": 4.125}
+ ]
+ },
+ "LAYOUT_ergo": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.625, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0.625},
+ {"matrix": [0, 2], "x": 2.5, "y": 0.125},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+ {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+ {"matrix": [5, 6], "x": 12, "y": 0.25},
+ {"matrix": [5, 5], "x": 13, "y": 0.25},
+ {"matrix": [5, 4], "x": 14, "y": 0.125},
+ {"matrix": [5, 3], "x": 15, "y": 0},
+ {"matrix": [5, 2], "x": 16, "y": 0.125},
+ {"matrix": [5, 1], "x": 17, "y": 0.625},
+ {"matrix": [5, 0], "x": 18, "y": 0.625, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.625, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.625},
+ {"matrix": [1, 2], "x": 2.5, "y": 1.125},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+ {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6.5, "y": 1.25, "h": 1.5},
+
+ {"matrix": [6, 6], "x": 12, "y": 1.25, "h": 1.5},
+ {"matrix": [6, 5], "x": 13, "y": 1.25},
+ {"matrix": [6, 4], "x": 14, "y": 1.125},
+ {"matrix": [6, 3], "x": 16, "y": 1.125},
+ {"matrix": [6, 2], "x": 15, "y": 1},
+ {"matrix": [6, 1], "x": 17, "y": 1.625},
+ {"matrix": [6, 0], "x": 18, "y": 1.625, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.625, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.625},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.125},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+ {"matrix": [7, 5], "x": 13, "y": 2.25},
+ {"matrix": [7, 4], "x": 14, "y": 2.125},
+ {"matrix": [7, 3], "x": 16, "y": 2.125},
+ {"matrix": [7, 2], "x": 15, "y": 2},
+ {"matrix": [7, 1], "x": 17, "y": 2.625},
+ {"matrix": [7, 0], "x": 18, "y": 2.625, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.625, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3.625},
+ {"matrix": [3, 2], "x": 2.5, "y": 3.125},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 2.75, "h": 1.5},
+ {"matrix": [4, 1], "x": 7.5, "y": 3.75},
+
+ {"matrix": [9, 1], "x": 11, "y": 3.75},
+ {"matrix": [8, 6], "x": 12, "y": 2.75, "h": 1.5},
+ {"matrix": [8, 5], "x": 13, "y": 3.25},
+ {"matrix": [8, 4], "x": 14, "y": 3.125},
+ {"matrix": [8, 3], "x": 15, "y": 3},
+ {"matrix": [8, 2], "x": 16, "y": 3.125},
+ {"matrix": [8, 1], "x": 17, "y": 3.625},
+ {"matrix": [8, 0], "x": 18, "y": 3.625, "w": 1.5},
+
+ {"matrix": [4, 2], "x": 2.5, "y": 4.125},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4.125},
+ {"matrix": [4, 5], "x": 5.75, "y": 4.5, "w": 1.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.75},
+
+ {"matrix": [9, 6], "x": 11.25, "y": 4.75},
+ {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.5},
+ {"matrix": [9, 4], "x": 14, "y": 4.125},
+ {"matrix": [9, 3], "x": 15, "y": 4},
+ {"matrix": [9, 2], "x": 16, "y": 4.125}
+ ]
+ }
+ }
+}
diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk
deleted file mode 100644
index 171b6139c2c..00000000000
--- a/keyboards/pluckey/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
-ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/pteron36/info.json b/keyboards/pteron36/info.json
deleted file mode 100644
index 76b6e596471..00000000000
--- a/keyboards/pteron36/info.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
- "keyboard_name": "Pteron36",
- "manufacturer": "Harshit Goel",
- "url": "",
- "maintainer": "harshitgoel96",
- "usb": {
- "vid": "0x4847",
- "pid": "0x5054",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F6", "F7", "B1", "B3", "B2"],
- "rows": ["E6", "D7", "B4", "B5"]
- },
- "diode_direction": "ROW2COL",
- "dynamic_keymap": {
- "layer_count": 7
- },
- "encoder": {
- "rotary": [
- {"pin_a": "F5", "pin_b": "F4"}
- ]
- },
- "split": {
- "soft_serial_pin": "D3",
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "F4", "pin_b": "F5"}
- ]
- }
- }
- },
- "rgblight": {
- "led_count": 10
- },
- "ws2812": {
- "pin": "B6"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "community_layouts": ["split_3x5_3"],
- "layouts": {
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 1},
- {"matrix": [0, 1], "x": 1, "y": 0.5},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.5},
- {"matrix": [0, 4], "x": 4, "y": 0.75},
-
- {"matrix": [4, 4], "x": 10, "y": 0.75},
- {"matrix": [4, 3], "x": 11, "y": 0.5},
- {"matrix": [4, 2], "x": 12, "y": 0},
- {"matrix": [4, 1], "x": 13, "y": 0.5},
- {"matrix": [4, 0], "x": 14, "y": 1},
-
- {"matrix": [1, 0], "x": 0, "y": 2},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"matrix": [1, 4], "x": 4, "y": 1.75},
-
- {"matrix": [5, 4], "x": 10, "y": 1.75},
- {"matrix": [5, 3], "x": 11, "y": 1.5},
- {"matrix": [5, 2], "x": 12, "y": 1},
- {"matrix": [5, 1], "x": 13, "y": 1.5},
- {"matrix": [5, 0], "x": 14, "y": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 3},
- {"matrix": [2, 1], "x": 1, "y": 2.5},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.5},
- {"matrix": [2, 4], "x": 4, "y": 2.75},
-
- {"matrix": [6, 4], "x": 10, "y": 2.75},
- {"matrix": [6, 3], "x": 11, "y": 2.5},
- {"matrix": [6, 2], "x": 12, "y": 2},
- {"matrix": [6, 1], "x": 13, "y": 2.5},
- {"matrix": [6, 0], "x": 14, "y": 3},
-
- {"matrix": [3, 0], "x": 4, "y": 4},
- {"matrix": [3, 1], "x": 5, "y": 4},
- {"matrix": [3, 2], "x": 6, "y": 4},
-
- {"matrix": [7, 2], "x": 8, "y": 4},
- {"matrix": [7, 1], "x": 9, "y": 4},
- {"matrix": [7, 0], "x": 10, "y": 4}
- ]
- },
- "LAYOUT_split_3x5_3_encoder": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 1},
- {"matrix": [0, 1], "x": 1, "y": 0.5},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.5},
- {"matrix": [0, 4], "x": 4, "y": 0.75},
-
- {"matrix": [4, 4], "x": 10, "y": 0.75},
- {"matrix": [4, 3], "x": 11, "y": 0.5},
- {"matrix": [4, 2], "x": 12, "y": 0},
- {"matrix": [4, 1], "x": 13, "y": 0.5},
- {"matrix": [4, 0], "x": 14, "y": 1},
-
- {"matrix": [1, 0], "x": 0, "y": 2},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"matrix": [1, 4], "x": 4, "y": 1.75},
-
- {"matrix": [5, 4], "x": 10, "y": 1.75},
- {"matrix": [5, 3], "x": 11, "y": 1.5},
- {"matrix": [5, 2], "x": 12, "y": 1},
- {"matrix": [5, 1], "x": 13, "y": 1.5},
- {"matrix": [5, 0], "x": 14, "y": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 3},
- {"matrix": [2, 1], "x": 1, "y": 2.5},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.5},
- {"matrix": [2, 4], "x": 4, "y": 2.75},
- {"matrix": [3, 4], "x": 5.5, "y": 2.75},
-
- {"matrix": [7, 4], "x": 8.5, "y": 2.75},
- {"matrix": [6, 4], "x": 10, "y": 2.75},
- {"matrix": [6, 3], "x": 11, "y": 2.5},
- {"matrix": [6, 2], "x": 12, "y": 2},
- {"matrix": [6, 1], "x": 13, "y": 2.5},
- {"matrix": [6, 0], "x": 14, "y": 3},
-
- {"matrix": [3, 0], "x": 4, "y": 4},
- {"matrix": [3, 1], "x": 5, "y": 4},
- {"matrix": [3, 2], "x": 6, "y": 4},
-
- {"matrix": [7, 2], "x": 8, "y": 4},
- {"matrix": [7, 1], "x": 9, "y": 4},
- {"matrix": [7, 0], "x": 10, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/pteron36/keyboard.json b/keyboards/pteron36/keyboard.json
new file mode 100644
index 00000000000..f4bab524196
--- /dev/null
+++ b/keyboards/pteron36/keyboard.json
@@ -0,0 +1,153 @@
+{
+ "keyboard_name": "Pteron36",
+ "manufacturer": "Harshit Goel",
+ "url": "",
+ "maintainer": "harshitgoel96",
+ "usb": {
+ "vid": "0x4847",
+ "pid": "0x5054",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "oled": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2"],
+ "rows": ["E6", "D7", "B4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
+ "dynamic_keymap": {
+ "layer_count": 7
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F5", "pin_b": "F4"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D3",
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "F4", "pin_b": "F5"}
+ ]
+ }
+ }
+ },
+ "rgblight": {
+ "led_count": 10
+ },
+ "ws2812": {
+ "pin": "B6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "community_layouts": ["split_3x5_3"],
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0.75},
+
+ {"matrix": [4, 4], "x": 10, "y": 0.75},
+ {"matrix": [4, 3], "x": 11, "y": 0.5},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 1], "x": 13, "y": 0.5},
+ {"matrix": [4, 0], "x": 14, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.75},
+
+ {"matrix": [5, 4], "x": 10, "y": 1.75},
+ {"matrix": [5, 3], "x": 11, "y": 1.5},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 1], "x": 13, "y": 1.5},
+ {"matrix": [5, 0], "x": 14, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.75},
+
+ {"matrix": [6, 4], "x": 10, "y": 2.75},
+ {"matrix": [6, 3], "x": 11, "y": 2.5},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 1], "x": 13, "y": 2.5},
+ {"matrix": [6, 0], "x": 14, "y": 3},
+
+ {"matrix": [3, 0], "x": 4, "y": 4},
+ {"matrix": [3, 1], "x": 5, "y": 4},
+ {"matrix": [3, 2], "x": 6, "y": 4},
+
+ {"matrix": [7, 2], "x": 8, "y": 4},
+ {"matrix": [7, 1], "x": 9, "y": 4},
+ {"matrix": [7, 0], "x": 10, "y": 4}
+ ]
+ },
+ "LAYOUT_split_3x5_3_encoder": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.5},
+ {"matrix": [0, 4], "x": 4, "y": 0.75},
+
+ {"matrix": [4, 4], "x": 10, "y": 0.75},
+ {"matrix": [4, 3], "x": 11, "y": 0.5},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 1], "x": 13, "y": 0.5},
+ {"matrix": [4, 0], "x": 14, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.75},
+
+ {"matrix": [5, 4], "x": 10, "y": 1.75},
+ {"matrix": [5, 3], "x": 11, "y": 1.5},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 1], "x": 13, "y": 1.5},
+ {"matrix": [5, 0], "x": 14, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.75},
+ {"matrix": [3, 4], "x": 5.5, "y": 2.75},
+
+ {"matrix": [7, 4], "x": 8.5, "y": 2.75},
+ {"matrix": [6, 4], "x": 10, "y": 2.75},
+ {"matrix": [6, 3], "x": 11, "y": 2.5},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 1], "x": 13, "y": 2.5},
+ {"matrix": [6, 0], "x": 14, "y": 3},
+
+ {"matrix": [3, 0], "x": 4, "y": 4},
+ {"matrix": [3, 1], "x": 5, "y": 4},
+ {"matrix": [3, 2], "x": 6, "y": 4},
+
+ {"matrix": [7, 2], "x": 8, "y": 4},
+ {"matrix": [7, 1], "x": 9, "y": 4},
+ {"matrix": [7, 0], "x": 10, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/pteron36/rules.mk b/keyboards/pteron36/rules.mk
deleted file mode 100644
index d07878747eb..00000000000
--- a/keyboards/pteron36/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-OLED_ENABLE = yes # OLED display
-ENCODER_ENABLE = yes # Encoder support
-SPLIT_KEYBOARD = yes # Split enable
diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json
index 2bec0c52af2..ca8434fdd7d 100644
--- a/keyboards/rate/pistachio/rev1/info.json
+++ b/keyboards/rate/pistachio/rev1/info.json
@@ -4,6 +4,9 @@
"led_count": 2,
"split_count": [1, 1]
},
+ "split": {
+ "enabled": true
+ },
"ws2812": {
"pin": "D2"
},
diff --git a/keyboards/rate/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk
index dda6154e66d..09f976d0e64 100644
--- a/keyboards/rate/pistachio/rev1/rules.mk
+++ b/keyboards/rate/pistachio/rev1/rules.mk
@@ -10,4 +10,3 @@ 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
-SPLIT_KEYBOARD = yes # Enable split keyboard
diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json
index 9f0c169b873..0bca53aca36 100644
--- a/keyboards/rate/pistachio/rev2/info.json
+++ b/keyboards/rate/pistachio/rev2/info.json
@@ -8,6 +8,9 @@
"max_brightness": 195,
"split_count": [38, 46]
},
+ "split": {
+ "enabled": true
+ },
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"],
"rows": ["B5", "B4", "E6", "D7", "C6", "D4"]
diff --git a/keyboards/rate/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk
index dda6154e66d..09f976d0e64 100644
--- a/keyboards/rate/pistachio/rev2/rules.mk
+++ b/keyboards/rate/pistachio/rev2/rules.mk
@@ -10,4 +10,3 @@ 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
-SPLIT_KEYBOARD = yes # Enable split keyboard
diff --git a/keyboards/recompile_keys/choco60/rev1/info.json b/keyboards/recompile_keys/choco60/rev1/info.json
index 3960f575ab9..2a4dd3f7f3d 100644
--- a/keyboards/recompile_keys/choco60/rev1/info.json
+++ b/keyboards/recompile_keys/choco60/rev1/info.json
@@ -5,6 +5,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"processor": "atmega32u4",
diff --git a/keyboards/recompile_keys/choco60/rev1/rules.mk b/keyboards/recompile_keys/choco60/rev1/rules.mk
index b74db0a672b..4d82dff69aa 100644
--- a/keyboards/recompile_keys/choco60/rev1/rules.mk
+++ b/keyboards/recompile_keys/choco60/rev1/rules.mk
@@ -10,5 +10,3 @@ 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
-
-SPLIT_KEYBOARD = yes # Enable split keyboard
diff --git a/keyboards/recompile_keys/choco60/rev2/info.json b/keyboards/recompile_keys/choco60/rev2/info.json
index c03e8678f6b..6565dc98347 100644
--- a/keyboards/recompile_keys/choco60/rev2/info.json
+++ b/keyboards/recompile_keys/choco60/rev2/info.json
@@ -5,6 +5,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"matrix_pins": {
"right": {
diff --git a/keyboards/recompile_keys/choco60/rev2/rules.mk b/keyboards/recompile_keys/choco60/rev2/rules.mk
index ca4dbbab2fa..fa6fbf34d9f 100644
--- a/keyboards/recompile_keys/choco60/rev2/rules.mk
+++ b/keyboards/recompile_keys/choco60/rev2/rules.mk
@@ -10,5 +10,3 @@ 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json
deleted file mode 100644
index 76a9302eff1..00000000000
--- a/keyboards/recompile_keys/cocoa40/info.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
- "keyboard_name": "Cocoa40",
- "manufacturer": "recompile keys",
- "url": "https://keys.recompile.net/projects/cocoa40/",
- "maintainer": "Naoto Takai",
- "usb": {
- "vid": "0xC0C0",
- "pid": "0x4000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
- "rows": ["F4", "F5", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [4, 0], "x": 7.25, "y": 0},
- {"matrix": [4, 1], "x": 8.25, "y": 0},
- {"matrix": [4, 2], "x": 9.25, "y": 0},
- {"matrix": [4, 3], "x": 10.25, "y": 0},
- {"matrix": [4, 4], "x": 11.25, "y": 0},
- {"matrix": [4, 5], "x": 12.25, "y": 0},
- {"matrix": [4, 6], "x": 13.25, "y": 0},
- {"matrix": [4, 7], "x": 14.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
-
- {"matrix": [5, 0], "x": 7.5, "y": 1},
- {"matrix": [5, 1], "x": 8.5, "y": 1},
- {"matrix": [5, 2], "x": 9.5, "y": 1},
- {"matrix": [5, 3], "x": 10.5, "y": 1},
- {"matrix": [5, 4], "x": 11.5, "y": 1},
- {"matrix": [5, 5], "x": 12.5, "y": 1},
- {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.75},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [6, 0], "x": 8, "y": 2},
- {"matrix": [6, 1], "x": 9, "y": 2},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 3], "x": 11, "y": 2},
- {"matrix": [6, 4], "x": 12, "y": 2},
- {"matrix": [6, 5], "x": 13, "y": 2, "w": 1.25},
- {"matrix": [6, 6], "x": 14.25, "y": 2},
-
- {"matrix": [3, 1], "x": 1.5, "y": 3},
- {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
- {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
-
- {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2.75},
- {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.5},
- {"matrix": [7, 3], "x": 11.75, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/recompile_keys/cocoa40/keyboard.json b/keyboards/recompile_keys/cocoa40/keyboard.json
new file mode 100644
index 00000000000..f964ff6621d
--- /dev/null
+++ b/keyboards/recompile_keys/cocoa40/keyboard.json
@@ -0,0 +1,89 @@
+{
+ "keyboard_name": "Cocoa40",
+ "manufacturer": "recompile keys",
+ "url": "https://keys.recompile.net/projects/cocoa40/",
+ "maintainer": "Naoto Takai",
+ "usb": {
+ "vid": "0xC0C0",
+ "pid": "0x4000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [4, 0], "x": 7.25, "y": 0},
+ {"matrix": [4, 1], "x": 8.25, "y": 0},
+ {"matrix": [4, 2], "x": 9.25, "y": 0},
+ {"matrix": [4, 3], "x": 10.25, "y": 0},
+ {"matrix": [4, 4], "x": 11.25, "y": 0},
+ {"matrix": [4, 5], "x": 12.25, "y": 0},
+ {"matrix": [4, 6], "x": 13.25, "y": 0},
+ {"matrix": [4, 7], "x": 14.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+
+ {"matrix": [5, 0], "x": 7.5, "y": 1},
+ {"matrix": [5, 1], "x": 8.5, "y": 1},
+ {"matrix": [5, 2], "x": 9.5, "y": 1},
+ {"matrix": [5, 3], "x": 10.5, "y": 1},
+ {"matrix": [5, 4], "x": 11.5, "y": 1},
+ {"matrix": [5, 5], "x": 12.5, "y": 1},
+ {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [6, 0], "x": 8, "y": 2},
+ {"matrix": [6, 1], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 4], "x": 12, "y": 2},
+ {"matrix": [6, 5], "x": 13, "y": 2, "w": 1.25},
+ {"matrix": [6, 6], "x": 14.25, "y": 2},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2.75},
+ {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.5},
+ {"matrix": [7, 3], "x": 11.75, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/recompile_keys/cocoa40/rules.mk b/keyboards/recompile_keys/cocoa40/rules.mk
deleted file mode 100644
index 10e75fed2e2..00000000000
--- a/keyboards/recompile_keys/cocoa40/rules.mk
+++ /dev/null
@@ -1,13 +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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/info.json
index 12e8f089b59..c4e890f5577 100644
--- a/keyboards/redox_media/info.json
+++ b/keyboards/redox_media/info.json
@@ -19,6 +19,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/redox_media/rules.mk b/keyboards/redox_media/rules.mk
index 786e3ac0293..5ad7700a767 100644
--- a/keyboards/redox_media/rules.mk
+++ b/keyboards/redox_media/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
# Disable unsupported hardware
AUDIO_SUPPORTED = no
diff --git a/keyboards/rgbkb/mun/rev1/keyboard.json b/keyboards/rgbkb/mun/rev1/keyboard.json
index 7374f6cd478..98265c6dd90 100644
--- a/keyboards/rgbkb/mun/rev1/keyboard.json
+++ b/keyboards/rgbkb/mun/rev1/keyboard.json
@@ -102,6 +102,7 @@
"tap_keycode_delay": 5
},
"split": {
+ "enabled": true,
"soft_serial_pin": "A9",
"transport": {
"sync": {
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index 4269e3b0a1f..04d4c554ad5 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -22,7 +22,6 @@ OLED_ENABLE = yes
ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
LTO_ENABLE = yes
OPT = 3
diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json
index 874b4ece22e..16b61d9e020 100644
--- a/keyboards/rgbkb/sol/rev1/info.json
+++ b/keyboards/rgbkb/sol/rev1/info.json
@@ -82,6 +82,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"tapping": {
diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json
index ac57e4e74eb..f7ec84cfce3 100644
--- a/keyboards/rgbkb/sol/rev2/info.json
+++ b/keyboards/rgbkb/sol/rev2/info.json
@@ -77,6 +77,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"tapping": {
diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk
index 2cacb68825d..c956bb9f5f1 100644
--- a/keyboards/rgbkb/sol/rules.mk
+++ b/keyboards/rgbkb/sol/rules.mk
@@ -1,7 +1,6 @@
# Custom local font file
OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
-SPLIT_KEYBOARD = yes
ENCODER_ENABLE = yes
DEFAULT_FOLDER = rgbkb/sol/rev2
diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json
index 96213156f0c..3b8b7d060c8 100644
--- a/keyboards/rgbkb/sol3/rev1/keyboard.json
+++ b/keyboards/rgbkb/sol3/rev1/keyboard.json
@@ -103,6 +103,7 @@
]
},
"split": {
+ "enabled": true,
"dip_switch": {
"right": {
"pins": ["A14", "B0"]
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 227219e3024..bf22130a55a 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -26,7 +26,6 @@ OLED_ENABLE = yes
ENCODER_ENABLE = yes
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
LTO_ENABLE = yes
OPT = 3
diff --git a/keyboards/rgbkb/zen/info.json b/keyboards/rgbkb/zen/info.json
new file mode 100644
index 00000000000..2b9790e84e6
--- /dev/null
+++ b/keyboards/rgbkb/zen/info.json
@@ -0,0 +1,5 @@
+{
+ "split": {
+ "enabled": true
+ }
+}
diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk
index 3c692c76fce..28653a7d5f8 100644
--- a/keyboards/rgbkb/zen/rules.mk
+++ b/keyboards/rgbkb/zen/rules.mk
@@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight
DEFAULT_FOLDER = rgbkb/zen/rev2
diff --git a/keyboards/rgbkb/zygomorph/rev1/keyboard.json b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
index 3bd412cc3b3..851842d0815 100644
--- a/keyboards/rgbkb/zygomorph/rev1/keyboard.json
+++ b/keyboards/rgbkb/zygomorph/rev1/keyboard.json
@@ -23,6 +23,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"rgblight": {
diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk
index bc168c39832..dfdffe3c3a8 100644
--- a/keyboards/rgbkb/zygomorph/rules.mk
+++ b/keyboards/rgbkb/zygomorph/rules.mk
@@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = rgbkb/zygomorph/rev1
# Disable unsupported hardware
diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json
index 591d6228b72..71bb374bfb7 100644
--- a/keyboards/rura66/rev1/info.json
+++ b/keyboards/rura66/rev1/info.json
@@ -30,6 +30,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk
index 1c7bdc0c3cd..ec47c1e0348 100644
--- a/keyboards/rura66/rev1/rules.mk
+++ b/keyboards/rura66/rev1/rules.mk
@@ -1,6 +1,5 @@
EXTRAKEY_ENABLE = yes # Audio control and System control
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-SPLIT_KEYBOARD = yes
RGB_MATRIX_ENABLE = no
ENCODER_ENABLE = no
LTO_ENABLE = yes
diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk
index c7eacfa19a9..4cbe55ac766 100644
--- a/keyboards/rura66/rules.mk
+++ b/keyboards/rura66/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes
-SPLIT_KEYBOARD = yes
LTO_ENABLE = yes
DEFAULT_FOLDER = rura66/rev1
diff --git a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
index 89e675db525..3ea79da589d 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"rgblight": {
diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
index 171b119b34d..09cad7556c4 100644
--- a/keyboards/salicylic_acid3/7skb/rules.mk
+++ b/keyboards/salicylic_acid3/7skb/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = salicylic_acid3/7skb/rev1
diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
deleted file mode 100644
index 35b3d7ec170..00000000000
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
- "keyboard_name": "7splus",
- "manufacturer": "Salicylic_Acid",
- "url": "https://salicylic-acid3.hatenablog.com/",
- "maintainer": "Salicylic_acid3",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEAE7",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
- "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 31,
- "split_count": [11, 20],
- "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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
-
- {"matrix": [0, 5], "x": 5.5, "y": 0},
- {"matrix": [7, 0], "x": 7.5, "y": 0},
- {"matrix": [7, 1], "x": 8.5, "y": 0},
- {"matrix": [7, 2], "x": 9.5, "y": 0},
-
- {"matrix": [7, 3], "x": 10.75, "y": 0},
- {"matrix": [7, 4], "x": 11.75, "y": 0},
- {"matrix": [7, 5], "x": 12.75, "y": 0},
- {"matrix": [7, 6], "x": 13.75, "y": 0},
-
- {"matrix": [7, 7], "x": 15, "y": 0},
- {"matrix": [13, 0], "x": 16, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
-
- {"matrix": [8, 0], "x": 7, "y": 1.25},
- {"matrix": [8, 1], "x": 8, "y": 1.25},
- {"matrix": [8, 2], "x": 9, "y": 1.25},
- {"matrix": [8, 3], "x": 10, "y": 1.25},
- {"matrix": [8, 4], "x": 11, "y": 1.25},
- {"matrix": [8, 5], "x": 12, "y": 1.25},
- {"matrix": [8, 6], "x": 13, "y": 1.25},
- {"matrix": [8, 7], "x": 14, "y": 1.25, "w": 2},
- {"matrix": [13, 2], "x": 16, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
-
- {"matrix": [9, 0], "x": 7.5, "y": 2.25},
- {"matrix": [9, 1], "x": 8.5, "y": 2.25},
- {"matrix": [9, 2], "x": 9.5, "y": 2.25},
- {"matrix": [9, 3], "x": 10.5, "y": 2.25},
- {"matrix": [9, 4], "x": 11.5, "y": 2.25},
- {"matrix": [9, 5], "x": 12.5, "y": 2.25},
- {"matrix": [9, 6], "x": 13.5, "y": 2.25},
- {"matrix": [9, 7], "x": 14.5, "y": 2.25, "w": 1.5},
- {"matrix": [13, 3], "x": 16, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"matrix": [3, 5], "x": 5.75, "y": 3.25},
-
- {"matrix": [10, 0], "x": 7.75, "y": 3.25},
- {"matrix": [10, 1], "x": 8.75, "y": 3.25},
- {"matrix": [10, 2], "x": 9.75, "y": 3.25},
- {"matrix": [10, 3], "x": 10.75, "y": 3.25},
- {"matrix": [10, 4], "x": 11.75, "y": 3.25},
- {"matrix": [10, 5], "x": 12.75, "y": 3.25},
- {"matrix": [10, 6], "x": 13.75, "y": 3.25, "w": 2.25},
- {"matrix": [10, 7], "x": 16, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [4, 1], "x": 2.25, "y": 4.25},
- {"matrix": [4, 2], "x": 3.25, "y": 4.25},
- {"matrix": [4, 3], "x": 4.25, "y": 4.25},
- {"matrix": [4, 4], "x": 5.25, "y": 4.25},
- {"matrix": [4, 5], "x": 6.25, "y": 4.25},
-
- {"matrix": [11, 0], "x": 8.25, "y": 4.25},
- {"matrix": [11, 1], "x": 9.25, "y": 4.25},
- {"matrix": [11, 2], "x": 10.25, "y": 4.25},
- {"matrix": [11, 3], "x": 11.25, "y": 4.25},
- {"matrix": [11, 4], "x": 12.25, "y": 4.25},
- {"matrix": [11, 5], "x": 13.25, "y": 4.25, "w": 1.75},
- {"matrix": [11, 7], "x": 15, "y": 4.25},
- {"matrix": [12, 7], "x": 16, "y": 4.25},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2},
- {"matrix": [5, 5], "x": 5.75, "y": 5.25},
-
- {"matrix": [12, 0], "x": 7.75, "y": 5.25},
- {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 2.75},
- {"matrix": [12, 3], "x": 11.5, "y": 5.25, "w": 1.25},
- {"matrix": [12, 4], "x": 12.75, "y": 5.25, "w": 1.25},
- {"matrix": [12, 5], "x": 14, "y": 5.25},
- {"matrix": [12, 6], "x": 15, "y": 5.25},
- {"matrix": [13, 4], "x": 16, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/salicylic_acid3/7splus/keyboard.json b/keyboards/salicylic_acid3/7splus/keyboard.json
new file mode 100644
index 00000000000..38ca750cd47
--- /dev/null
+++ b/keyboards/salicylic_acid3/7splus/keyboard.json
@@ -0,0 +1,156 @@
+{
+ "keyboard_name": "7splus",
+ "manufacturer": "Salicylic_Acid",
+ "url": "https://salicylic-acid3.hatenablog.com/",
+ "maintainer": "Salicylic_acid3",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEAE7",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
+ "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 31,
+ "split_count": [11, 20],
+ "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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [7, 0], "x": 7.5, "y": 0},
+ {"matrix": [7, 1], "x": 8.5, "y": 0},
+ {"matrix": [7, 2], "x": 9.5, "y": 0},
+
+ {"matrix": [7, 3], "x": 10.75, "y": 0},
+ {"matrix": [7, 4], "x": 11.75, "y": 0},
+ {"matrix": [7, 5], "x": 12.75, "y": 0},
+ {"matrix": [7, 6], "x": 13.75, "y": 0},
+
+ {"matrix": [7, 7], "x": 15, "y": 0},
+ {"matrix": [13, 0], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [8, 0], "x": 7, "y": 1.25},
+ {"matrix": [8, 1], "x": 8, "y": 1.25},
+ {"matrix": [8, 2], "x": 9, "y": 1.25},
+ {"matrix": [8, 3], "x": 10, "y": 1.25},
+ {"matrix": [8, 4], "x": 11, "y": 1.25},
+ {"matrix": [8, 5], "x": 12, "y": 1.25},
+ {"matrix": [8, 6], "x": 13, "y": 1.25},
+ {"matrix": [8, 7], "x": 14, "y": 1.25, "w": 2},
+ {"matrix": [13, 2], "x": 16, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 2.25},
+ {"matrix": [9, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [9, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [9, 3], "x": 10.5, "y": 2.25},
+ {"matrix": [9, 4], "x": 11.5, "y": 2.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [9, 6], "x": 13.5, "y": 2.25},
+ {"matrix": [9, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+ {"matrix": [13, 3], "x": 16, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+
+ {"matrix": [10, 0], "x": 7.75, "y": 3.25},
+ {"matrix": [10, 1], "x": 8.75, "y": 3.25},
+ {"matrix": [10, 2], "x": 9.75, "y": 3.25},
+ {"matrix": [10, 3], "x": 10.75, "y": 3.25},
+ {"matrix": [10, 4], "x": 11.75, "y": 3.25},
+ {"matrix": [10, 5], "x": 12.75, "y": 3.25},
+ {"matrix": [10, 6], "x": 13.75, "y": 3.25, "w": 2.25},
+ {"matrix": [10, 7], "x": 16, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+
+ {"matrix": [11, 0], "x": 8.25, "y": 4.25},
+ {"matrix": [11, 1], "x": 9.25, "y": 4.25},
+ {"matrix": [11, 2], "x": 10.25, "y": 4.25},
+ {"matrix": [11, 3], "x": 11.25, "y": 4.25},
+ {"matrix": [11, 4], "x": 12.25, "y": 4.25},
+ {"matrix": [11, 5], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"matrix": [11, 7], "x": 15, "y": 4.25},
+ {"matrix": [12, 7], "x": 16, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2},
+ {"matrix": [5, 5], "x": 5.75, "y": 5.25},
+
+ {"matrix": [12, 0], "x": 7.75, "y": 5.25},
+ {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 2.75},
+ {"matrix": [12, 3], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 4], "x": 12.75, "y": 5.25, "w": 1.25},
+ {"matrix": [12, 5], "x": 14, "y": 5.25},
+ {"matrix": [12, 6], "x": 15, "y": 5.25},
+ {"matrix": [13, 4], "x": 16, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/salicylic_acid3/7splus/rules.mk b/keyboards/salicylic_acid3/7splus/rules.mk
deleted file mode 100644
index 124c57ba15a..00000000000
--- a/keyboards/salicylic_acid3/7splus/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 = yes # 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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json
deleted file mode 100644
index c802635334f..00000000000
--- a/keyboards/salicylic_acid3/ajisai74/info.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
- "keyboard_name": "ajisai74",
- "manufacturer": "Salicylic_Acid",
- "url": "https://salicylic-acid3.hatenablog.com/",
- "maintainer": "Salicylic_acid3",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEB54",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 6.75, "y": 0},
- {"matrix": [5, 1], "x": 7.75, "y": 0},
- {"matrix": [5, 2], "x": 8.75, "y": 0},
- {"matrix": [5, 3], "x": 9.75, "y": 0},
- {"matrix": [5, 4], "x": 10.75, "y": 0},
- {"matrix": [5, 5], "x": 11.75, "y": 0},
- {"matrix": [5, 6], "x": 12.75, "y": 0},
- {"matrix": [5, 7], "x": 13.75, "y": 0},
- {"matrix": [5, 8], "x": 14.75, "y": 0},
- {"matrix": [6, 8], "x": 15.75, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
-
- {"matrix": [6, 0], "x": 7.25, "y": 1},
- {"matrix": [6, 1], "x": 8.25, "y": 1},
- {"matrix": [6, 2], "x": 9.25, "y": 1},
- {"matrix": [6, 3], "x": 10.25, "y": 1},
- {"matrix": [6, 4], "x": 11.25, "y": 1},
- {"matrix": [6, 5], "x": 12.25, "y": 1},
- {"matrix": [6, 6], "x": 13.25, "y": 1},
- {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
- {"matrix": [7, 8], "x": 15.75, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [7, 0], "x": 7.5, "y": 2},
- {"matrix": [7, 1], "x": 8.5, "y": 2},
- {"matrix": [7, 2], "x": 9.5, "y": 2},
- {"matrix": [7, 3], "x": 10.5, "y": 2},
- {"matrix": [7, 4], "x": 11.5, "y": 2},
- {"matrix": [7, 5], "x": 12.5, "y": 2},
- {"matrix": [7, 6], "x": 13.5, "y": 2},
- {"matrix": [7, 7], "x": 14.5, "y": 2, "w": 1.25},
- {"matrix": [8, 8], "x": 15.75, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [4, 5], "x": 1.25, "y": 3},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
-
- {"matrix": [8, 0], "x": 8, "y": 3},
- {"matrix": [8, 1], "x": 9, "y": 3},
- {"matrix": [8, 2], "x": 10, "y": 3},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
- {"matrix": [8, 6], "x": 14.75, "y": 3},
- {"matrix": [8, 7], "x": 15.75, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
- {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25},
-
- {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25},
- {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25},
- {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 11.25, "y": 4},
- {"matrix": [9, 4], "x": 12.25, "y": 4},
-
- {"matrix": [9, 6], "x": 13.75, "y": 4},
- {"matrix": [9, 7], "x": 14.75, "y": 4},
- {"matrix": [9, 8], "x": 15.75, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/salicylic_acid3/ajisai74/keyboard.json b/keyboards/salicylic_acid3/ajisai74/keyboard.json
new file mode 100644
index 00000000000..b29c5bf178c
--- /dev/null
+++ b/keyboards/salicylic_acid3/ajisai74/keyboard.json
@@ -0,0 +1,120 @@
+{
+ "keyboard_name": "ajisai74",
+ "manufacturer": "Salicylic_Acid",
+ "url": "https://salicylic-acid3.hatenablog.com/",
+ "maintainer": "Salicylic_acid3",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEB54",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 6.75, "y": 0},
+ {"matrix": [5, 1], "x": 7.75, "y": 0},
+ {"matrix": [5, 2], "x": 8.75, "y": 0},
+ {"matrix": [5, 3], "x": 9.75, "y": 0},
+ {"matrix": [5, 4], "x": 10.75, "y": 0},
+ {"matrix": [5, 5], "x": 11.75, "y": 0},
+ {"matrix": [5, 6], "x": 12.75, "y": 0},
+ {"matrix": [5, 7], "x": 13.75, "y": 0},
+ {"matrix": [5, 8], "x": 14.75, "y": 0},
+ {"matrix": [6, 8], "x": 15.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.25, "y": 1},
+ {"matrix": [6, 1], "x": 8.25, "y": 1},
+ {"matrix": [6, 2], "x": 9.25, "y": 1},
+ {"matrix": [6, 3], "x": 10.25, "y": 1},
+ {"matrix": [6, 4], "x": 11.25, "y": 1},
+ {"matrix": [6, 5], "x": 12.25, "y": 1},
+ {"matrix": [6, 6], "x": 13.25, "y": 1},
+ {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
+ {"matrix": [7, 8], "x": 15.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2},
+ {"matrix": [7, 1], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [7, 3], "x": 10.5, "y": 2},
+ {"matrix": [7, 4], "x": 11.5, "y": 2},
+ {"matrix": [7, 5], "x": 12.5, "y": 2},
+ {"matrix": [7, 6], "x": 13.5, "y": 2},
+ {"matrix": [7, 7], "x": 14.5, "y": 2, "w": 1.25},
+ {"matrix": [8, 8], "x": 15.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [4, 5], "x": 1.25, "y": 3},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
+ {"matrix": [8, 6], "x": 14.75, "y": 3},
+ {"matrix": [8, 7], "x": 15.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 11.25, "y": 4},
+ {"matrix": [9, 4], "x": 12.25, "y": 4},
+
+ {"matrix": [9, 6], "x": 13.75, "y": 4},
+ {"matrix": [9, 7], "x": 14.75, "y": 4},
+ {"matrix": [9, 8], "x": 15.75, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/salicylic_acid3/ajisai74/rules.mk b/keyboards/salicylic_acid3/ajisai74/rules.mk
deleted file mode 100644
index 8ea05b5f74a..00000000000
--- a/keyboards/salicylic_acid3/ajisai74/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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
deleted file mode 100644
index 3b4df223632..00000000000
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
- "keyboard_name": "ergoarrows",
- "manufacturer": "Salicylic_Acid",
- "url": "https://salicylic-acid3.hatenablog.com/",
- "maintainer": "Salicylic_acid3",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEA54",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
- "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 86,
- "split_count": [43, 43],
- "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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375},
- {"matrix": [0, 1], "x": 1, "y": 0.375},
- {"matrix": [0, 2], "x": 2, "y": 0.125},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.125},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
- {"matrix": [0, 6], "x": 6, "y": 0.5},
-
- {"matrix": [6, 6], "x": 8.8, "y": 0.5},
- {"matrix": [6, 5], "x": 9.8, "y": 0.25},
- {"matrix": [6, 4], "x": 10.8, "y": 0.125},
- {"matrix": [6, 3], "x": 11.8, "y": 0},
- {"matrix": [6, 2], "x": 12.8, "y": 0.125},
- {"matrix": [6, 1], "x": 13.8, "y": 0.375},
- {"matrix": [6, 0], "x": 14.8, "y": 0.375},
-
- {"matrix": [1, 0], "x": 0, "y": 1.375},
- {"matrix": [1, 1], "x": 1, "y": 1.375},
- {"matrix": [1, 2], "x": 2, "y": 1.125},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.125},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
-
- {"matrix": [7, 6], "x": 8.8, "y": 1.5},
- {"matrix": [7, 5], "x": 9.8, "y": 1.25},
- {"matrix": [7, 4], "x": 10.8, "y": 1.125},
- {"matrix": [7, 3], "x": 11.8, "y": 1},
- {"matrix": [7, 2], "x": 12.8, "y": 1.125},
- {"matrix": [7, 1], "x": 13.8, "y": 1.375},
- {"matrix": [7, 0], "x": 14.8, "y": 1.375},
-
- {"matrix": [2, 0], "x": 0, "y": 2.375},
- {"matrix": [2, 1], "x": 1, "y": 2.375},
- {"matrix": [2, 2], "x": 2, "y": 2.125},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.125},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
- {"matrix": [2, 6], "x": 6, "y": 2.5},
-
- {"matrix": [8, 6], "x": 8.8, "y": 2.5},
- {"matrix": [8, 5], "x": 9.8, "y": 2.25},
- {"matrix": [8, 4], "x": 10.8, "y": 2.125},
- {"matrix": [8, 3], "x": 11.8, "y": 2},
- {"matrix": [8, 2], "x": 12.8, "y": 2.125},
- {"matrix": [8, 1], "x": 13.8, "y": 2.375},
- {"matrix": [8, 0], "x": 14.8, "y": 2.375},
-
- {"matrix": [3, 0], "x": 0, "y": 3.375},
- {"matrix": [3, 1], "x": 1, "y": 3.375},
- {"matrix": [3, 2], "x": 2, "y": 3.125},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3.125},
- {"matrix": [3, 5], "x": 5, "y": 3.25},
- {"matrix": [3, 6], "x": 6, "y": 3.5},
-
- {"matrix": [9, 6], "x": 8.8, "y": 3.5},
- {"matrix": [9, 5], "x": 9.8, "y": 3.25},
- {"matrix": [9, 4], "x": 10.8, "y": 3.125},
- {"matrix": [9, 3], "x": 11.8, "y": 3},
- {"matrix": [9, 2], "x": 12.8, "y": 3.125},
- {"matrix": [9, 1], "x": 13.8, "y": 3.375},
- {"matrix": [9, 0], "x": 14.8, "y": 3.375},
-
- {"matrix": [4, 0], "x": 0, "y": 4.375},
- {"matrix": [4, 1], "x": 1, "y": 4.375},
- {"matrix": [4, 2], "x": 2.125, "y": 4.5},
- {"matrix": [4, 3], "x": 3.25, "y": 4.375},
- {"matrix": [4, 4], "x": 4.25, "y": 4.375},
- {"matrix": [4, 5], "x": 5.35, "y": 4.625},
- {"matrix": [4, 6], "x": 6.4, "y": 5.125},
-
- {"matrix": [10, 6], "x": 8.4, "y": 5.125},
- {"matrix": [10, 5], "x": 9.45, "y": 4.625},
- {"matrix": [10, 4], "x": 10.55, "y": 4.375},
- {"matrix": [10, 3], "x": 11.55, "y": 4.375},
- {"matrix": [10, 2], "x": 12.675, "y": 4.5},
- {"matrix": [10, 1], "x": 13.8, "y": 4.375},
- {"matrix": [10, 0], "x": 14.8, "y": 4.375},
-
- {"matrix": [5, 1], "x": 1.125, "y": 5.5},
- {"matrix": [5, 2], "x": 2.125, "y": 5.5},
- {"matrix": [5, 3], "x": 3.125, "y": 5.5},
-
- {"matrix": [11, 3], "x": 11.675, "y": 5.5},
- {"matrix": [11, 2], "x": 12.675, "y": 5.5},
- {"matrix": [11, 1], "x": 13.675, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/salicylic_acid3/ergoarrows/keyboard.json b/keyboards/salicylic_acid3/ergoarrows/keyboard.json
new file mode 100644
index 00000000000..bb9956a2d07
--- /dev/null
+++ b/keyboards/salicylic_acid3/ergoarrows/keyboard.json
@@ -0,0 +1,144 @@
+{
+ "keyboard_name": "ergoarrows",
+ "manufacturer": "Salicylic_Acid",
+ "url": "https://salicylic-acid3.hatenablog.com/",
+ "maintainer": "Salicylic_acid3",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEA54",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 86,
+ "split_count": [43, 43],
+ "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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+ {"matrix": [6, 6], "x": 8.8, "y": 0.5},
+ {"matrix": [6, 5], "x": 9.8, "y": 0.25},
+ {"matrix": [6, 4], "x": 10.8, "y": 0.125},
+ {"matrix": [6, 3], "x": 11.8, "y": 0},
+ {"matrix": [6, 2], "x": 12.8, "y": 0.125},
+ {"matrix": [6, 1], "x": 13.8, "y": 0.375},
+ {"matrix": [6, 0], "x": 14.8, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+ {"matrix": [7, 6], "x": 8.8, "y": 1.5},
+ {"matrix": [7, 5], "x": 9.8, "y": 1.25},
+ {"matrix": [7, 4], "x": 10.8, "y": 1.125},
+ {"matrix": [7, 3], "x": 11.8, "y": 1},
+ {"matrix": [7, 2], "x": 12.8, "y": 1.125},
+ {"matrix": [7, 1], "x": 13.8, "y": 1.375},
+ {"matrix": [7, 0], "x": 14.8, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.5},
+
+ {"matrix": [8, 6], "x": 8.8, "y": 2.5},
+ {"matrix": [8, 5], "x": 9.8, "y": 2.25},
+ {"matrix": [8, 4], "x": 10.8, "y": 2.125},
+ {"matrix": [8, 3], "x": 11.8, "y": 2},
+ {"matrix": [8, 2], "x": 12.8, "y": 2.125},
+ {"matrix": [8, 1], "x": 13.8, "y": 2.375},
+ {"matrix": [8, 0], "x": 14.8, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 3.5},
+
+ {"matrix": [9, 6], "x": 8.8, "y": 3.5},
+ {"matrix": [9, 5], "x": 9.8, "y": 3.25},
+ {"matrix": [9, 4], "x": 10.8, "y": 3.125},
+ {"matrix": [9, 3], "x": 11.8, "y": 3},
+ {"matrix": [9, 2], "x": 12.8, "y": 3.125},
+ {"matrix": [9, 1], "x": 13.8, "y": 3.375},
+ {"matrix": [9, 0], "x": 14.8, "y": 3.375},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.375},
+ {"matrix": [4, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 2], "x": 2.125, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.375},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.375},
+ {"matrix": [4, 5], "x": 5.35, "y": 4.625},
+ {"matrix": [4, 6], "x": 6.4, "y": 5.125},
+
+ {"matrix": [10, 6], "x": 8.4, "y": 5.125},
+ {"matrix": [10, 5], "x": 9.45, "y": 4.625},
+ {"matrix": [10, 4], "x": 10.55, "y": 4.375},
+ {"matrix": [10, 3], "x": 11.55, "y": 4.375},
+ {"matrix": [10, 2], "x": 12.675, "y": 4.5},
+ {"matrix": [10, 1], "x": 13.8, "y": 4.375},
+ {"matrix": [10, 0], "x": 14.8, "y": 4.375},
+
+ {"matrix": [5, 1], "x": 1.125, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.125, "y": 5.5},
+ {"matrix": [5, 3], "x": 3.125, "y": 5.5},
+
+ {"matrix": [11, 3], "x": 11.675, "y": 5.5},
+ {"matrix": [11, 2], "x": 12.675, "y": 5.5},
+ {"matrix": [11, 1], "x": 13.675, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/salicylic_acid3/ergoarrows/rules.mk b/keyboards/salicylic_acid3/ergoarrows/rules.mk
deleted file mode 100644
index a876de5b539..00000000000
--- a/keyboards/salicylic_acid3/ergoarrows/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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
index e3d884bdb1b..ccfe99ad18f 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"rgblight": {
diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
index a496323b5d3..f90f3d9c07c 100644
--- a/keyboards/salicylic_acid3/jisplit89/rules.mk
+++ b/keyboards/salicylic_acid3/jisplit89/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
index 8712957dfaa..9b6b7a048f7 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
VIA_ENABLE = yes
-
SPLIT_KEYBOARD = no
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
index 49bb80ca31e..88b5b8b0ade 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
@@ -1,5 +1,4 @@
RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = yes
VIA_ENABLE = yes
-
SPLIT_KEYBOARD = no
diff --git a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
index f0aa33b9625..da82c1a16c1 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json
@@ -17,6 +17,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"matrix_pins": {
"right": {
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
index 033ade5a497..fd9a93f5030 100644
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/rules.mk
@@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = no
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = salicylic_acid3/naked48/rev1
diff --git a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
index a8ba1431841..f5d53c001d4 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"matrix_pins": {
"right": {
diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
index e4bce8739b7..2210ae765c9 100644
--- a/keyboards/salicylic_acid3/naked60/rules.mk
+++ b/keyboards/salicylic_acid3/naked60/rules.mk
@@ -11,6 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = salicylic_acid3/naked60/rev1
diff --git a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
index a95f8d60fe0..2034b7d9ab4 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json
@@ -14,6 +14,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"matrix_pins": {
"right": {
diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
index 70e97d797de..03a0fe22c08 100644
--- a/keyboards/salicylic_acid3/naked64/rules.mk
+++ b/keyboards/salicylic_acid3/naked64/rules.mk
@@ -13,6 +13,4 @@ RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
OLED_ENABLE = no
USE_I2C = no
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = salicylic_acid3/naked64/rev1
diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
deleted file mode 100644
index fad22122f6c..00000000000
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
- "keyboard_name": "nknl7en",
- "manufacturer": "Salicylic_Acid",
- "url": "https://salicylic-acid3.hatenablog.com/",
- "maintainer": "Salicylic_acid3",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEA56",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 21,
- "split_count": [9, 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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 6.75, "y": 0},
- {"matrix": [5, 1], "x": 7.75, "y": 0},
- {"matrix": [5, 2], "x": 8.75, "y": 0},
- {"matrix": [5, 3], "x": 9.75, "y": 0},
- {"matrix": [5, 4], "x": 10.75, "y": 0},
- {"matrix": [5, 5], "x": 11.75, "y": 0},
- {"matrix": [5, 6], "x": 12.75, "y": 0},
- {"matrix": [5, 7], "x": 13.75, "y": 0, "w": 2},
-
- {"matrix": [5, 8], "x": 16.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
-
- {"matrix": [6, 0], "x": 7.25, "y": 1},
- {"matrix": [6, 1], "x": 8.25, "y": 1},
- {"matrix": [6, 2], "x": 9.25, "y": 1},
- {"matrix": [6, 3], "x": 10.25, "y": 1},
- {"matrix": [6, 4], "x": 11.25, "y": 1},
- {"matrix": [6, 5], "x": 12.25, "y": 1},
- {"matrix": [6, 6], "x": 13.25, "y": 1},
- {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
-
- {"matrix": [6, 8], "x": 16.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [7, 0], "x": 7.5, "y": 2},
- {"matrix": [7, 1], "x": 8.5, "y": 2},
- {"matrix": [7, 2], "x": 9.5, "y": 2},
- {"matrix": [7, 3], "x": 10.5, "y": 2},
- {"matrix": [7, 4], "x": 11.5, "y": 2},
- {"matrix": [7, 5], "x": 12.5, "y": 2},
- {"matrix": [7, 6], "x": 13.5, "y": 2, "w": 2.25},
-
- {"matrix": [7, 8], "x": 16.25, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
-
- {"matrix": [8, 0], "x": 8, "y": 3},
- {"matrix": [8, 1], "x": 9, "y": 3},
- {"matrix": [8, 2], "x": 10, "y": 3},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
-
- {"matrix": [8, 6], "x": 15, "y": 3.25},
-
- {"matrix": [8, 8], "x": 16.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2},
- {"matrix": [4, 4], "x": 5.75, "y": 4},
-
- {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 2.75},
- {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 12.75, "y": 4},
-
- {"matrix": [9, 6], "x": 14, "y": 4.25},
- {"matrix": [8, 7], "x": 15, "y": 4.25},
- {"matrix": [9, 7], "x": 16, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/salicylic_acid3/nknl7en/keyboard.json b/keyboards/salicylic_acid3/nknl7en/keyboard.json
new file mode 100644
index 00000000000..4d6b494b9fb
--- /dev/null
+++ b/keyboards/salicylic_acid3/nknl7en/keyboard.json
@@ -0,0 +1,142 @@
+{
+ "keyboard_name": "nknl7en",
+ "manufacturer": "Salicylic_Acid",
+ "url": "https://salicylic-acid3.hatenablog.com/",
+ "maintainer": "Salicylic_acid3",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEA56",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 21,
+ "split_count": [9, 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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 6.75, "y": 0},
+ {"matrix": [5, 1], "x": 7.75, "y": 0},
+ {"matrix": [5, 2], "x": 8.75, "y": 0},
+ {"matrix": [5, 3], "x": 9.75, "y": 0},
+ {"matrix": [5, 4], "x": 10.75, "y": 0},
+ {"matrix": [5, 5], "x": 11.75, "y": 0},
+ {"matrix": [5, 6], "x": 12.75, "y": 0},
+ {"matrix": [5, 7], "x": 13.75, "y": 0, "w": 2},
+
+ {"matrix": [5, 8], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.25, "y": 1},
+ {"matrix": [6, 1], "x": 8.25, "y": 1},
+ {"matrix": [6, 2], "x": 9.25, "y": 1},
+ {"matrix": [6, 3], "x": 10.25, "y": 1},
+ {"matrix": [6, 4], "x": 11.25, "y": 1},
+ {"matrix": [6, 5], "x": 12.25, "y": 1},
+ {"matrix": [6, 6], "x": 13.25, "y": 1},
+ {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 8], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2},
+ {"matrix": [7, 1], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [7, 3], "x": 10.5, "y": 2},
+ {"matrix": [7, 4], "x": 11.5, "y": 2},
+ {"matrix": [7, 5], "x": 12.5, "y": 2},
+ {"matrix": [7, 6], "x": 13.5, "y": 2, "w": 2.25},
+
+ {"matrix": [7, 8], "x": 16.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75},
+
+ {"matrix": [8, 6], "x": 15, "y": 3.25},
+
+ {"matrix": [8, 8], "x": 16.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2},
+ {"matrix": [4, 4], "x": 5.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 12.75, "y": 4},
+
+ {"matrix": [9, 6], "x": 14, "y": 4.25},
+ {"matrix": [8, 7], "x": 15, "y": 4.25},
+ {"matrix": [9, 7], "x": 16, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/salicylic_acid3/nknl7en/rules.mk b/keyboards/salicylic_acid3/nknl7en/rules.mk
deleted file mode 100644
index a876de5b539..00000000000
--- a/keyboards/salicylic_acid3/nknl7en/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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
deleted file mode 100644
index 7bafe46d9a0..00000000000
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
- "keyboard_name": "nknl7jp",
- "manufacturer": "Salicylic_Acid",
- "url": "https://salicylic-acid3.hatenablog.com/",
- "maintainer": "Salicylic_acid3",
- "usb": {
- "vid": "0x04D8",
- "pid": "0xEA55",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 20,
- "split_count": [9, 11],
- "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": {
- "pin": "D3"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 6.75, "y": 0},
- {"matrix": [5, 1], "x": 7.75, "y": 0},
- {"matrix": [5, 2], "x": 8.75, "y": 0},
- {"matrix": [5, 3], "x": 9.75, "y": 0},
- {"matrix": [5, 4], "x": 10.75, "y": 0},
- {"matrix": [5, 5], "x": 11.75, "y": 0},
- {"matrix": [5, 6], "x": 12.75, "y": 0},
- {"matrix": [5, 7], "x": 13.75, "y": 0},
- {"matrix": [5, 8], "x": 14.75, "y": 0},
-
- {"matrix": [6, 8], "x": 16.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
-
- {"matrix": [6, 0], "x": 7.25, "y": 1},
- {"matrix": [6, 1], "x": 8.25, "y": 1},
- {"matrix": [6, 2], "x": 9.25, "y": 1},
- {"matrix": [6, 3], "x": 10.25, "y": 1},
- {"matrix": [6, 4], "x": 11.25, "y": 1},
- {"matrix": [6, 5], "x": 12.25, "y": 1},
- {"matrix": [6, 6], "x": 13.25, "y": 1},
- {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [7, 8], "x": 16.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [7, 0], "x": 7.5, "y": 2},
- {"matrix": [7, 1], "x": 8.5, "y": 2},
- {"matrix": [7, 2], "x": 9.5, "y": 2},
- {"matrix": [7, 3], "x": 10.5, "y": 2},
- {"matrix": [7, 4], "x": 11.5, "y": 2},
- {"matrix": [7, 5], "x": 12.5, "y": 2},
- {"matrix": [7, 6], "x": 13.5, "y": 2},
-
- {"matrix": [7, 7], "x": 16.25, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
-
- {"matrix": [8, 0], "x": 8, "y": 3},
- {"matrix": [8, 1], "x": 9, "y": 3},
- {"matrix": [8, 2], "x": 10, "y": 3},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 5], "x": 13, "y": 3},
- {"matrix": [8, 6], "x": 14, "y": 3},
-
- {"matrix": [8, 7], "x": 15.25, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 5.75, "y": 4},
-
- {"matrix": [9, 0], "x": 7.5, "y": 4},
- {"matrix": [9, 1], "x": 8.5, "y": 4, "w": 1.75},
- {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25},
-
- {"matrix": [9, 7], "x": 14.25, "y": 4.25},
- {"matrix": [8, 8], "x": 15.25, "y": 4.25},
- {"matrix": [9, 8], "x": 16.25, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/salicylic_acid3/nknl7jp/keyboard.json b/keyboards/salicylic_acid3/nknl7jp/keyboard.json
new file mode 100644
index 00000000000..0f260cdfdd7
--- /dev/null
+++ b/keyboards/salicylic_acid3/nknl7jp/keyboard.json
@@ -0,0 +1,144 @@
+{
+ "keyboard_name": "nknl7jp",
+ "manufacturer": "Salicylic_Acid",
+ "url": "https://salicylic-acid3.hatenablog.com/",
+ "maintainer": "Salicylic_acid3",
+ "usb": {
+ "vid": "0x04D8",
+ "pid": "0xEA55",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 20,
+ "split_count": [9, 11],
+ "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": {
+ "pin": "D3"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 6.75, "y": 0},
+ {"matrix": [5, 1], "x": 7.75, "y": 0},
+ {"matrix": [5, 2], "x": 8.75, "y": 0},
+ {"matrix": [5, 3], "x": 9.75, "y": 0},
+ {"matrix": [5, 4], "x": 10.75, "y": 0},
+ {"matrix": [5, 5], "x": 11.75, "y": 0},
+ {"matrix": [5, 6], "x": 12.75, "y": 0},
+ {"matrix": [5, 7], "x": 13.75, "y": 0},
+ {"matrix": [5, 8], "x": 14.75, "y": 0},
+
+ {"matrix": [6, 8], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.25, "y": 1},
+ {"matrix": [6, 1], "x": 8.25, "y": 1},
+ {"matrix": [6, 2], "x": 9.25, "y": 1},
+ {"matrix": [6, 3], "x": 10.25, "y": 1},
+ {"matrix": [6, 4], "x": 11.25, "y": 1},
+ {"matrix": [6, 5], "x": 12.25, "y": 1},
+ {"matrix": [6, 6], "x": 13.25, "y": 1},
+ {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [7, 8], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2},
+ {"matrix": [7, 1], "x": 8.5, "y": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 2},
+ {"matrix": [7, 3], "x": 10.5, "y": 2},
+ {"matrix": [7, 4], "x": 11.5, "y": 2},
+ {"matrix": [7, 5], "x": 12.5, "y": 2},
+ {"matrix": [7, 6], "x": 13.5, "y": 2},
+
+ {"matrix": [7, 7], "x": 16.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3},
+ {"matrix": [8, 6], "x": 14, "y": 3},
+
+ {"matrix": [8, 7], "x": 15.25, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.75, "y": 4},
+
+ {"matrix": [9, 0], "x": 7.5, "y": 4},
+ {"matrix": [9, 1], "x": 8.5, "y": 4, "w": 1.75},
+ {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 7], "x": 14.25, "y": 4.25},
+ {"matrix": [8, 8], "x": 15.25, "y": 4.25},
+ {"matrix": [9, 8], "x": 16.25, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/salicylic_acid3/nknl7jp/rules.mk b/keyboards/salicylic_acid3/nknl7jp/rules.mk
deleted file mode 100644
index a876de5b539..00000000000
--- a/keyboards/salicylic_acid3/nknl7jp/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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/info.json
deleted file mode 100644
index 7c76e98f644..00000000000
--- a/keyboards/scatter42/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "keyboard_name": "scatter42",
- "manufacturer": "bbrfkr",
- "url": "https://github.com/bbrfkr/keyboards/tree/master/scatter42",
- "maintainer": "bbrfkr",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3B47",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
- "rows": ["D4", "C6", "D7", "E6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.5},
- {"matrix": [0, 1], "x": 1, "y": 0.25},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.25},
- {"matrix": [0, 4], "x": 4, "y": 0.5},
-
- {"matrix": [4, 4], "x": 9, "y": 0.5},
- {"matrix": [4, 3], "x": 10, "y": 0.25},
- {"matrix": [4, 2], "x": 11, "y": 0},
- {"matrix": [4, 1], "x": 12, "y": 0.25},
- {"matrix": [4, 0], "x": 13, "y": 0.5},
-
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
-
- {"matrix": [5, 4], "x": 9, "y": 1.5},
- {"matrix": [5, 3], "x": 10, "y": 1.25},
- {"matrix": [5, 2], "x": 11, "y": 1},
- {"matrix": [5, 1], "x": 12, "y": 1.25},
- {"matrix": [5, 0], "x": 13, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5},
- {"matrix": [2, 1], "x": 1, "y": 2.25},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.25},
- {"matrix": [2, 4], "x": 4, "y": 2.5},
-
- {"matrix": [6, 4], "x": 9, "y": 2.5},
- {"matrix": [6, 3], "x": 10, "y": 2.25},
- {"matrix": [6, 2], "x": 11, "y": 2},
- {"matrix": [6, 1], "x": 12, "y": 2.25},
- {"matrix": [6, 0], "x": 13, "y": 2.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5},
- {"matrix": [3, 1], "x": 1, "y": 3.25},
- {"matrix": [3, 2], "x": 2, "y": 3},
- {"matrix": [3, 3], "x": 3.5, "y": 3.625},
- {"matrix": [3, 4], "x": 4.5, "y": 3.875},
- {"matrix": [3, 5], "x": 5.5, "y": 4.125},
-
- {"matrix": [7, 5], "x": 7.45, "y": 4.125},
- {"matrix": [7, 4], "x": 8.45, "y": 3.875},
- {"matrix": [7, 3], "x": 9.45, "y": 3.625},
- {"matrix": [7, 2], "x": 11, "y": 3},
- {"matrix": [7, 1], "x": 12, "y": 3.25},
- {"matrix": [7, 0], "x": 13, "y": 3.5}
- ]
- }
- }
-}
diff --git a/keyboards/scatter42/keyboard.json b/keyboards/scatter42/keyboard.json
new file mode 100644
index 00000000000..7ccf9cb9fcf
--- /dev/null
+++ b/keyboards/scatter42/keyboard.json
@@ -0,0 +1,85 @@
+{
+ "keyboard_name": "scatter42",
+ "manufacturer": "bbrfkr",
+ "url": "https://github.com/bbrfkr/keyboards/tree/master/scatter42",
+ "maintainer": "bbrfkr",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3B47",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+ {"matrix": [4, 4], "x": 9, "y": 0.5},
+ {"matrix": [4, 3], "x": 10, "y": 0.25},
+ {"matrix": [4, 2], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0.25},
+ {"matrix": [4, 0], "x": 13, "y": 0.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+ {"matrix": [5, 4], "x": 9, "y": 1.5},
+ {"matrix": [5, 3], "x": 10, "y": 1.25},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 1], "x": 12, "y": 1.25},
+ {"matrix": [5, 0], "x": 13, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+ {"matrix": [6, 4], "x": 9, "y": 2.5},
+ {"matrix": [6, 3], "x": 10, "y": 2.25},
+ {"matrix": [6, 2], "x": 11, "y": 2},
+ {"matrix": [6, 1], "x": 12, "y": 2.25},
+ {"matrix": [6, 0], "x": 13, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.625},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.875},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.125},
+
+ {"matrix": [7, 5], "x": 7.45, "y": 4.125},
+ {"matrix": [7, 4], "x": 8.45, "y": 3.875},
+ {"matrix": [7, 3], "x": 9.45, "y": 3.625},
+ {"matrix": [7, 2], "x": 11, "y": 3},
+ {"matrix": [7, 1], "x": 12, "y": 3.25},
+ {"matrix": [7, 0], "x": 13, "y": 3.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/scatter42/rules.mk b/keyboards/scatter42/rules.mk
deleted file mode 100644
index db5c82928c7..00000000000
--- a/keyboards/scatter42/rules.mk
+++ /dev/null
@@ -1,13 +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
-SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/info.json
index c213e1e26f8..833cd747895 100644
--- a/keyboards/sekigon/grs_70ec/info.json
+++ b/keyboards/sekigon/grs_70ec/info.json
@@ -9,6 +9,7 @@
"device_version": "0.0.1"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"processor": "atmega32u4",
diff --git a/keyboards/sekigon/grs_70ec/rules.mk b/keyboards/sekigon/grs_70ec/rules.mk
index 4bd93ef25bb..ac989e7ea83 100644
--- a/keyboards/sekigon/grs_70ec/rules.mk
+++ b/keyboards/sekigon/grs_70ec/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
CUSTOM_MATRIX = lite
-SPLIT_KEYBOARD = yes
ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index fe45ad86c5c..e232fdba3e8 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -44,6 +44,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk
index ed06e173de0..95e92dce2a4 100644
--- a/keyboards/silverbullet44/rules.mk
+++ b/keyboards/silverbullet44/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = no
AUDIO_ENABLE = yes # Audio output
-SPLIT_KEYBOARD = yes
LTO_ENABLE = yes
diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json
deleted file mode 100644
index f15b7696494..00000000000
--- a/keyboards/sparrow62/info.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
- "keyboard_name": "sparrow62",
- "manufacturer": "Atsushi_Morimoto_74th",
- "url": "https://github.com/74th/sparrow62-buildguide",
- "maintainer": "Atsushi Morimoto (@74th)",
- "usb": {
- "vid": "0xDA74",
- "pid": "0x7461",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 6], "x": 0, "y": 0.5},
- {"matrix": [0, 5], "x": 1, "y": 0.38},
- {"matrix": [0, 4], "x": 2, "y": 0.13},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0.13},
- {"matrix": [0, 1], "x": 5, "y": 0.25},
-
- {"matrix": [5, 1], "x": 9, "y": 0.25},
- {"matrix": [5, 2], "x": 10, "y": 0.13},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0.13},
- {"matrix": [5, 5], "x": 13, "y": 0.38},
- {"matrix": [5, 6], "x": 14, "y": 0.5},
-
- {"matrix": [1, 6], "x": 0, "y": 1.5},
- {"matrix": [1, 5], "x": 1, "y": 1.38},
- {"matrix": [1, 4], "x": 2, "y": 1.13},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 2], "x": 4, "y": 1.13},
- {"matrix": [1, 1], "x": 5, "y": 1.25},
- {"matrix": [0, 0], "x": 6, "y": 0.75},
-
- {"matrix": [5, 0], "x": 8, "y": 0.75},
- {"matrix": [6, 1], "x": 9, "y": 1.25},
- {"matrix": [6, 2], "x": 10, "y": 1.13},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1.13},
- {"matrix": [6, 5], "x": 13, "y": 1.38},
- {"matrix": [6, 6], "x": 14, "y": 1.5},
-
- {"matrix": [2, 6], "x": 0, "y": 2.5},
- {"matrix": [2, 5], "x": 1, "y": 2.38},
- {"matrix": [2, 4], "x": 2, "y": 2.13},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 2], "x": 4, "y": 2.13},
- {"matrix": [2, 1], "x": 5, "y": 2.25},
- {"matrix": [1, 0], "x": 6, "y": 1.75},
-
- {"matrix": [6, 0], "x": 8, "y": 1.75},
- {"matrix": [7, 1], "x": 9, "y": 2.25},
- {"matrix": [7, 2], "x": 10, "y": 2.13},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2.13},
- {"matrix": [7, 5], "x": 13, "y": 2.38},
- {"matrix": [7, 6], "x": 14, "y": 2.5},
-
- {"matrix": [3, 6], "x": 0, "y": 3.5},
- {"matrix": [3, 5], "x": 1, "y": 3.38},
- {"matrix": [3, 4], "x": 2, "y": 3.13},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 2], "x": 4, "y": 3.13},
- {"matrix": [3, 1], "x": 5, "y": 3.25},
- {"matrix": [2, 0], "x": 6, "y": 2.75},
-
- {"matrix": [7, 0], "x": 8, "y": 2.75},
- {"matrix": [8, 1], "x": 9, "y": 3.25},
- {"matrix": [8, 2], "x": 10, "y": 3.13},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3.13},
- {"matrix": [8, 5], "x": 13, "y": 3.38},
- {"matrix": [8, 6], "x": 14, "y": 3.5},
-
- {"matrix": [4, 3], "x": 2.5, "y": 4.13},
- {"matrix": [4, 2], "x": 3.5, "y": 4.13},
- {"matrix": [4, 1], "x": 4.5, "y": 4.25},
- {"matrix": [3, 0], "x": 5.75, "y": 4.5, "w": 1.25},
-
- {"matrix": [8, 0], "x": 8, "y": 4.5, "w": 1.25},
- {"matrix": [9, 1], "x": 9.5, "y": 4.25},
- {"matrix": [9, 2], "x": 10.5, "y": 4.13},
- {"matrix": [9, 3], "x": 11.5, "y": 4.13}
- ]
- }
- }
-}
diff --git a/keyboards/sparrow62/keyboard.json b/keyboards/sparrow62/keyboard.json
new file mode 100644
index 00000000000..e551bb48517
--- /dev/null
+++ b/keyboards/sparrow62/keyboard.json
@@ -0,0 +1,107 @@
+{
+ "keyboard_name": "sparrow62",
+ "manufacturer": "Atsushi_Morimoto_74th",
+ "url": "https://github.com/74th/sparrow62-buildguide",
+ "maintainer": "Atsushi Morimoto (@74th)",
+ "usb": {
+ "vid": "0xDA74",
+ "pid": "0x7461",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 6], "x": 0, "y": 0.5},
+ {"matrix": [0, 5], "x": 1, "y": 0.38},
+ {"matrix": [0, 4], "x": 2, "y": 0.13},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0.13},
+ {"matrix": [0, 1], "x": 5, "y": 0.25},
+
+ {"matrix": [5, 1], "x": 9, "y": 0.25},
+ {"matrix": [5, 2], "x": 10, "y": 0.13},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0.13},
+ {"matrix": [5, 5], "x": 13, "y": 0.38},
+ {"matrix": [5, 6], "x": 14, "y": 0.5},
+
+ {"matrix": [1, 6], "x": 0, "y": 1.5},
+ {"matrix": [1, 5], "x": 1, "y": 1.38},
+ {"matrix": [1, 4], "x": 2, "y": 1.13},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1.13},
+ {"matrix": [1, 1], "x": 5, "y": 1.25},
+ {"matrix": [0, 0], "x": 6, "y": 0.75},
+
+ {"matrix": [5, 0], "x": 8, "y": 0.75},
+ {"matrix": [6, 1], "x": 9, "y": 1.25},
+ {"matrix": [6, 2], "x": 10, "y": 1.13},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1.13},
+ {"matrix": [6, 5], "x": 13, "y": 1.38},
+ {"matrix": [6, 6], "x": 14, "y": 1.5},
+
+ {"matrix": [2, 6], "x": 0, "y": 2.5},
+ {"matrix": [2, 5], "x": 1, "y": 2.38},
+ {"matrix": [2, 4], "x": 2, "y": 2.13},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2.13},
+ {"matrix": [2, 1], "x": 5, "y": 2.25},
+ {"matrix": [1, 0], "x": 6, "y": 1.75},
+
+ {"matrix": [6, 0], "x": 8, "y": 1.75},
+ {"matrix": [7, 1], "x": 9, "y": 2.25},
+ {"matrix": [7, 2], "x": 10, "y": 2.13},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2.13},
+ {"matrix": [7, 5], "x": 13, "y": 2.38},
+ {"matrix": [7, 6], "x": 14, "y": 2.5},
+
+ {"matrix": [3, 6], "x": 0, "y": 3.5},
+ {"matrix": [3, 5], "x": 1, "y": 3.38},
+ {"matrix": [3, 4], "x": 2, "y": 3.13},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3.13},
+ {"matrix": [3, 1], "x": 5, "y": 3.25},
+ {"matrix": [2, 0], "x": 6, "y": 2.75},
+
+ {"matrix": [7, 0], "x": 8, "y": 2.75},
+ {"matrix": [8, 1], "x": 9, "y": 3.25},
+ {"matrix": [8, 2], "x": 10, "y": 3.13},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3.13},
+ {"matrix": [8, 5], "x": 13, "y": 3.38},
+ {"matrix": [8, 6], "x": 14, "y": 3.5},
+
+ {"matrix": [4, 3], "x": 2.5, "y": 4.13},
+ {"matrix": [4, 2], "x": 3.5, "y": 4.13},
+ {"matrix": [4, 1], "x": 4.5, "y": 4.25},
+ {"matrix": [3, 0], "x": 5.75, "y": 4.5, "w": 1.25},
+
+ {"matrix": [8, 0], "x": 8, "y": 4.5, "w": 1.25},
+ {"matrix": [9, 1], "x": 9.5, "y": 4.25},
+ {"matrix": [9, 2], "x": 10.5, "y": 4.13},
+ {"matrix": [9, 3], "x": 11.5, "y": 4.13}
+ ]
+ }
+ }
+}
diff --git a/keyboards/sparrow62/rules.mk b/keyboards/sparrow62/rules.mk
deleted file mode 100644
index 8ea05b5f74a..00000000000
--- a/keyboards/sparrow62/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
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/info.json
index 4c6bd2d1da3..6748321ff37 100644
--- a/keyboards/supersplit/info.json
+++ b/keyboards/supersplit/info.json
@@ -24,6 +24,7 @@
"vid": "0xFEED"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"layouts": {
diff --git a/keyboards/supersplit/rules.mk b/keyboards/supersplit/rules.mk
index 65e2c2165eb..a4f16a0b6be 100644
--- a/keyboards/supersplit/rules.mk
+++ b/keyboards/supersplit/rules.mk
@@ -1,4 +1 @@
-# This file intentionally left blank
-SPLIT_KEYBOARD = yes
-
SERIAL_DRIVER = bitbang
diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h
deleted file mode 100755
index b9449c4714b..00000000000
--- a/keyboards/tada68/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/tada68/info.json b/keyboards/tada68/info.json
deleted file mode 100644
index 1311017d361..00000000000
--- a/keyboards/tada68/info.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
- "keyboard_name": "TADA68",
- "manufacturer": "TADA",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x5441",
- "pid": "0x0001",
- "device_version": "0.0.3"
- },
- "matrix_pins": {
- "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
- "rows": ["D0", "D1", "F6", "F7", "D5"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B6",
- "levels": 4,
- "breathing": true
- },
- "indicators": {
- "caps_lock": "B2",
- "on_state": 0
- },
- "processor": "atmega32u4",
- "bootloader": "lufa-ms",
- "community_layouts": ["65_ansi", "65_iso"],
- "layout_aliases": {
- "LAYOUT_ansi": "LAYOUT_65_ansi",
- "LAYOUT_iso": "LAYOUT_65_iso"
- },
- "layouts": {
- "LAYOUT_65_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [1, 13], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_ansi_split_enter": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/tada68/keyboard.json b/keyboards/tada68/keyboard.json
new file mode 100644
index 00000000000..641def01a31
--- /dev/null
+++ b/keyboards/tada68/keyboard.json
@@ -0,0 +1,278 @@
+{
+ "keyboard_name": "TADA68",
+ "manufacturer": "TADA",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x5441",
+ "pid": "0x0001",
+ "device_version": "0.0.3"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+ "rows": ["D0", "D1", "F6", "F7", "D5"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B6",
+ "levels": 4,
+ "breathing": true
+ },
+ "indicators": {
+ "caps_lock": "B2",
+ "on_state": 0
+ },
+ "processor": "atmega32u4",
+ "bootloader": "lufa-ms",
+ "community_layouts": ["65_ansi", "65_iso"],
+ "layout_aliases": {
+ "LAYOUT_ansi": "LAYOUT_65_ansi",
+ "LAYOUT_iso": "LAYOUT_65_iso"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [1, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi_split_enter": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h
index 21ddfa1850e..363a41accd6 100755
--- a/keyboards/tada68/keymaps/rgb/config.h
+++ b/keyboards/tada68/keymaps/rgb/config.h
@@ -1,4 +1,4 @@
-#include "../../config.h"
+#pragma once
/* WS2812B RGB Underglow LED */
#define WS2812_DI_PIN F5 // See readme.md for wiring your led's
diff --git a/keyboards/tada68/keymaps/rgb/rules.mk b/keyboards/tada68/keymaps/rgb/rules.mk
index 7cffca44fad..c777cb1b9ff 100644
--- a/keyboards/tada68/keymaps/rgb/rules.mk
+++ b/keyboards/tada68/keymaps/rgb/rules.mk
@@ -1,18 +1 @@
-# Build Options
-# change to "no" to disable the options, or define them in the Makefile in
-# the appropriate keymap folder that will get included automatically
-#
-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 = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-MIDI_ENABLE = no # MIDI controls
-AUDIO_ENABLE = no # Audio output on port C6
-UNICODE_ENABLE = no # Unicode
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
-SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk
index 01310bd4ea0..e22d5248895 100755
--- a/keyboards/tada68/rules.mk
+++ b/keyboards/tada68/rules.mk
@@ -1,15 +1,2 @@
# This board uses the older unsafe 6k version of lufa-ms
BOOTLOADER_SIZE = 6144
-
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
deleted file mode 100644
index 7b4e38bd964..00000000000
--- a/keyboards/takashicompany/compacx/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 takashicompany
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json
deleted file mode 100644
index ba90f9fdd7d..00000000000
--- a/keyboards/takashicompany/compacx/info.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
- "keyboard_name": "Compacx",
- "manufacturer": "takashicompany",
- "url": "https://github.com/takashicompany/compacx",
- "maintainer": "takashicompany",
- "usb": {
- "vid": "0x7463",
- "pid": "0x0014",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 12,
- "sleep": true,
- "split_count": [6, 6],
- "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": {
- "pin": "D3"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
- "rows": ["D1", "D0", "D4", "C6", "D7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "E6", "pin_b": "B4"},
- {"pin_a": "B6", "pin_b": "B5"}
- ]
- },
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [1, 6], "x": 7, "y": 0},
-
- {"matrix": [5, 0], "x": 9, "y": 0},
- {"matrix": [5, 1], "x": 10, "y": 0},
- {"matrix": [5, 2], "x": 11, "y": 0},
- {"matrix": [5, 3], "x": 12, "y": 0},
- {"matrix": [5, 4], "x": 13, "y": 0},
- {"matrix": [5, 5], "x": 14, "y": 0},
- {"matrix": [5, 6], "x": 15, "y": 0},
- {"matrix": [6, 6], "x": 16, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5},
- {"matrix": [6, 1], "x": 10.5, "y": 1},
- {"matrix": [6, 2], "x": 11.5, "y": 1},
- {"matrix": [6, 3], "x": 12.5, "y": 1},
- {"matrix": [6, 4], "x": 13.5, "y": 1},
- {"matrix": [6, 5], "x": 14.5, "y": 1},
- {"matrix": [7, 6], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [7, 0], "x": 9, "y": 2, "w": 1.75},
- {"matrix": [7, 1], "x": 10.75, "y": 2},
- {"matrix": [7, 2], "x": 11.75, "y": 2},
- {"matrix": [7, 3], "x": 12.75, "y": 2},
- {"matrix": [7, 4], "x": 13.75, "y": 2},
- {"matrix": [7, 5], "x": 14.75, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
- {"matrix": [3, 1], "x": 2, "y": 3},
- {"matrix": [3, 2], "x": 3, "y": 3},
- {"matrix": [3, 3], "x": 4, "y": 3},
- {"matrix": [3, 4], "x": 5, "y": 3},
- {"matrix": [3, 5], "x": 6, "y": 3},
- {"matrix": [3, 6], "x": 7, "y": 3},
-
- {"matrix": [8, 0], "x": 9, "y": 3, "w": 2},
- {"matrix": [8, 1], "x": 11, "y": 3},
- {"matrix": [8, 2], "x": 12, "y": 3},
- {"matrix": [8, 3], "x": 13, "y": 3},
- {"matrix": [8, 4], "x": 14, "y": 3},
- {"matrix": [8, 5], "x": 15, "y": 3},
- {"matrix": [8, 6], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 7, "y": 4},
-
- {"matrix": [9, 0], "x": 9, "y": 4},
- {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [9, 3], "x": 12.5, "y": 4},
- {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
- {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25},
- {"matrix": [9, 6], "x": 16, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/takashicompany/compacx/keyboard.json b/keyboards/takashicompany/compacx/keyboard.json
new file mode 100644
index 00000000000..b4460cce770
--- /dev/null
+++ b/keyboards/takashicompany/compacx/keyboard.json
@@ -0,0 +1,152 @@
+{
+ "keyboard_name": "Compacx",
+ "manufacturer": "takashicompany",
+ "url": "https://github.com/takashicompany/compacx",
+ "maintainer": "takashicompany",
+ "usb": {
+ "vid": "0x7463",
+ "pid": "0x0014",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 12,
+ "sleep": true,
+ "split_count": [6, 6],
+ "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": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D1", "D0", "D4", "C6", "D7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "E6", "pin_b": "B4"},
+ {"pin_a": "B6", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [1, 6], "x": 7, "y": 0},
+
+ {"matrix": [5, 0], "x": 9, "y": 0},
+ {"matrix": [5, 1], "x": 10, "y": 0},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 4], "x": 13, "y": 0},
+ {"matrix": [5, 5], "x": 14, "y": 0},
+ {"matrix": [5, 6], "x": 15, "y": 0},
+ {"matrix": [6, 6], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5},
+ {"matrix": [6, 1], "x": 10.5, "y": 1},
+ {"matrix": [6, 2], "x": 11.5, "y": 1},
+ {"matrix": [6, 3], "x": 12.5, "y": 1},
+ {"matrix": [6, 4], "x": 13.5, "y": 1},
+ {"matrix": [6, 5], "x": 14.5, "y": 1},
+ {"matrix": [7, 6], "x": 15.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 9, "y": 2, "w": 1.75},
+ {"matrix": [7, 1], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 3], "x": 12.75, "y": 2},
+ {"matrix": [7, 4], "x": 13.75, "y": 2},
+ {"matrix": [7, 5], "x": 14.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3},
+ {"matrix": [3, 5], "x": 6, "y": 3},
+ {"matrix": [3, 6], "x": 7, "y": 3},
+
+ {"matrix": [8, 0], "x": 9, "y": 3, "w": 2},
+ {"matrix": [8, 1], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 4], "x": 14, "y": 3},
+ {"matrix": [8, 5], "x": 15, "y": 3},
+ {"matrix": [8, 6], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 7, "y": 4},
+
+ {"matrix": [9, 0], "x": 9, "y": 4},
+ {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 12.5, "y": 4},
+ {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 16, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/takashicompany/compacx/rules.mk b/keyboards/takashicompany/compacx/rules.mk
deleted file mode 100644
index 8e0e5ffd1ab..00000000000
--- a/keyboards/takashicompany/compacx/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD=yes
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json
deleted file mode 100644
index da5a95b8957..00000000000
--- a/keyboards/takashicompany/spreadwriter/info.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
- "manufacturer": "takashicompany",
- "keyboard_name": "Spreadwriter",
- "maintainer": "takashicompany",
- "bootloader": "caterina",
- "diode_direction": "COL2ROW",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],
- "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
- },
- "processor": "atmega32u4",
- "url": "https://github.com/takashicompany/spreadwriter",
- "usb": {
- "device_version": "1.0.0",
- "pid": "0x0023",
- "vid": "0x7463"
- },
- "encoder": {
- "rotary": [
- {"pin_a": "D1", "pin_b": "D0"}
- ]
- },
- "rgblight": {
- "led_count": 53,
- "hue_steps": 10,
- "saturation_steps": 17,
- "brightness_steps": 17,
- "animations": {
- "alternating": true,
- "breathing": true,
- "christmas": true,
- "knight": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "rgb_test": true,
- "snake": true,
- "static_gradient": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "pin": "D3"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.5},
- {"matrix": [0, 1], "x": 1, "y": 0.5},
- {"matrix": [0, 2], "x": 2, "y": 0.25},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [4, 1], "x": 10, "y": 0},
- {"matrix": [4, 2], "x": 11, "y": 0},
- {"matrix": [4, 3], "x": 12, "y": 0},
- {"matrix": [4, 4], "x": 13, "y": 0.25},
- {"matrix": [4, 5], "x": 14, "y": 0.5},
- {"matrix": [4, 6], "x": 15, "y": 0.5},
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"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": 7.5, "y": 1},
- {"matrix": [5, 1], "x": 10, "y": 1},
- {"matrix": [5, 2], "x": 11, "y": 1},
- {"matrix": [5, 3], "x": 12, "y": 1},
- {"matrix": [5, 4], "x": 13, "y": 1.25},
- {"matrix": [5, 5], "x": 14, "y": 1.5},
- {"matrix": [5, 6], "x": 15, "y": 1.5},
- {"matrix": [2, 0], "x": 0, "y": 2.5},
- {"matrix": [2, 1], "x": 1, "y": 2.5},
- {"matrix": [2, 2], "x": 2, "y": 2.25},
- {"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": [6, 0], "x": 9, "y": 2},
- {"matrix": [6, 1], "x": 10, "y": 2},
- {"matrix": [6, 2], "x": 11, "y": 2},
- {"matrix": [6, 3], "x": 12, "y": 2},
- {"matrix": [6, 4], "x": 13, "y": 2.25},
- {"matrix": [6, 5], "x": 14, "y": 2.5},
- {"matrix": [6, 6], "x": 15, "y": 2.5},
- {"matrix": [3, 0], "x": 0, "y": 3.5},
- {"matrix": [3, 1], "x": 1, "y": 3.5},
- {"matrix": [3, 2], "x": 2, "y": 3.25},
- {"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": [5, 0], "x": 7.5, "y": 3},
- {"matrix": [7, 0], "x": 9, "y": 3},
- {"matrix": [7, 1], "x": 10, "y": 3},
- {"matrix": [7, 2], "x": 11, "y": 3},
- {"matrix": [7, 3], "x": 12, "y": 3},
- {"matrix": [7, 4], "x": 13, "y": 3.25},
- {"matrix": [7, 5], "x": 14, "y": 3.5},
- {"matrix": [7, 6], "x": 15, "y": 3.5}
- ]
- }
- }
-}
diff --git a/keyboards/takashicompany/spreadwriter/keyboard.json b/keyboards/takashicompany/spreadwriter/keyboard.json
new file mode 100644
index 00000000000..2c9fcd1619a
--- /dev/null
+++ b/keyboards/takashicompany/spreadwriter/keyboard.json
@@ -0,0 +1,112 @@
+{
+ "manufacturer": "takashicompany",
+ "keyboard_name": "Spreadwriter",
+ "maintainer": "takashicompany",
+ "bootloader": "caterina",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],
+ "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "processor": "atmega32u4",
+ "url": "https://github.com/takashicompany/spreadwriter",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0023",
+ "vid": "0x7463"
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D1", "pin_b": "D0"}
+ ]
+ },
+ "rgblight": {
+ "led_count": 53,
+ "hue_steps": 10,
+ "saturation_steps": 17,
+ "brightness_steps": 17,
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.5},
+ {"matrix": [0, 1], "x": 1, "y": 0.5},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [4, 1], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 4], "x": 13, "y": 0.25},
+ {"matrix": [4, 5], "x": 14, "y": 0.5},
+ {"matrix": [4, 6], "x": 15, "y": 0.5},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"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": 7.5, "y": 1},
+ {"matrix": [5, 1], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 4], "x": 13, "y": 1.25},
+ {"matrix": [5, 5], "x": 14, "y": 1.5},
+ {"matrix": [5, 6], "x": 15, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"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": [6, 0], "x": 9, "y": 2},
+ {"matrix": [6, 1], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 4], "x": 13, "y": 2.25},
+ {"matrix": [6, 5], "x": 14, "y": 2.5},
+ {"matrix": [6, 6], "x": 15, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"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": [5, 0], "x": 7.5, "y": 3},
+ {"matrix": [7, 0], "x": 9, "y": 3},
+ {"matrix": [7, 1], "x": 10, "y": 3},
+ {"matrix": [7, 2], "x": 11, "y": 3},
+ {"matrix": [7, 3], "x": 12, "y": 3},
+ {"matrix": [7, 4], "x": 13, "y": 3.25},
+ {"matrix": [7, 5], "x": 14, "y": 3.5},
+ {"matrix": [7, 6], "x": 15, "y": 3.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/takashicompany/spreadwriter/rules.mk b/keyboards/takashicompany/spreadwriter/rules.mk
deleted file mode 100644
index 248f19320f0..00000000000
--- a/keyboards/takashicompany/spreadwriter/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ENCODER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
deleted file mode 100644
index 1c14611b2b9..00000000000
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2018 takashiski
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-//#define USE_I2C
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/*
-#define USE_I2C
-#define MASTER_LEFT
-#define EEHANDS
-*/
diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
deleted file mode 100644
index a7b470ce880..00000000000
--- a/keyboards/takashiski/hecomi/alpha/info.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
- "keyboard_name": "hecomi_alpha",
- "manufacturer": "takashiski",
- "url": "https://skyhigh-works.hatenablog.com/entry/2019/02/25/221959",
- "maintainer": "takashiski",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 16,
- "split_count": [8, 8]
- },
- "ws2812": {
- "pin": "D4"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 8.25, "y": 0},
- {"matrix": [5, 1], "x": 9.25, "y": 0},
- {"matrix": [5, 2], "x": 10.25, "y": 0},
- {"matrix": [5, 3], "x": 11.25, "y": 0},
- {"matrix": [5, 4], "x": 12.25, "y": 0},
- {"matrix": [5, 5], "x": 13.25, "y": 0},
- {"matrix": [5, 6], "x": 14.25, "y": 0},
- {"matrix": [5, 7], "x": 15.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
-
- {"matrix": [6, 0], "x": 7.75, "y": 1},
- {"matrix": [6, 1], "x": 8.75, "y": 1},
- {"matrix": [6, 2], "x": 9.75, "y": 1},
- {"matrix": [6, 3], "x": 10.75, "y": 1},
- {"matrix": [6, 4], "x": 11.75, "y": 1},
- {"matrix": [6, 5], "x": 12.75, "y": 1},
- {"matrix": [6, 6], "x": 13.75, "y": 1},
- {"matrix": [6, 7], "x": 14.75, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [7, 1], "x": 8, "y": 2},
- {"matrix": [7, 2], "x": 9, "y": 2},
- {"matrix": [7, 3], "x": 10, "y": 2},
- {"matrix": [7, 4], "x": 11, "y": 2},
- {"matrix": [7, 5], "x": 12, "y": 2},
- {"matrix": [7, 6], "x": 13, "y": 2},
- {"matrix": [7, 7], "x": 14, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
-
- {"matrix": [8, 0], "x": 7.5, "y": 3},
- {"matrix": [8, 1], "x": 8.5, "y": 3},
- {"matrix": [8, 2], "x": 9.5, "y": 3},
- {"matrix": [8, 3], "x": 10.5, "y": 3},
- {"matrix": [8, 4], "x": 11.5, "y": 3},
- {"matrix": [8, 5], "x": 12.5, "y": 3},
- {"matrix": [8, 6], "x": 13.5, "y": 3, "w": 1.75},
- {"matrix": [8, 7], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4},
- {"matrix": [4, 3], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4},
- {"matrix": [4, 5], "x": 5.5, "y": 4},
-
- {"matrix": [9, 2], "x": 7.75, "y": 4},
- {"matrix": [9, 3], "x": 8.75, "y": 4},
- {"matrix": [9, 4], "x": 9.75, "y": 4},
- {"matrix": [9, 5], "x": 10.75, "y": 4},
- {"matrix": [9, 6], "x": 11.75, "y": 4},
- {"matrix": [9, 7], "x": 12.75, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/takashiski/hecomi/alpha/keyboard.json b/keyboards/takashiski/hecomi/alpha/keyboard.json
new file mode 100644
index 00000000000..0a6bf513f0c
--- /dev/null
+++ b/keyboards/takashiski/hecomi/alpha/keyboard.json
@@ -0,0 +1,130 @@
+{
+ "keyboard_name": "hecomi_alpha",
+ "manufacturer": "takashiski",
+ "url": "https://skyhigh-works.hatenablog.com/entry/2019/02/25/221959",
+ "maintainer": "takashiski",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D1"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 16,
+ "split_count": [8, 8]
+ },
+ "ws2812": {
+ "pin": "D4"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 8.25, "y": 0},
+ {"matrix": [5, 1], "x": 9.25, "y": 0},
+ {"matrix": [5, 2], "x": 10.25, "y": 0},
+ {"matrix": [5, 3], "x": 11.25, "y": 0},
+ {"matrix": [5, 4], "x": 12.25, "y": 0},
+ {"matrix": [5, 5], "x": 13.25, "y": 0},
+ {"matrix": [5, 6], "x": 14.25, "y": 0},
+ {"matrix": [5, 7], "x": 15.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.75, "y": 1},
+ {"matrix": [6, 1], "x": 8.75, "y": 1},
+ {"matrix": [6, 2], "x": 9.75, "y": 1},
+ {"matrix": [6, 3], "x": 10.75, "y": 1},
+ {"matrix": [6, 4], "x": 11.75, "y": 1},
+ {"matrix": [6, 5], "x": 12.75, "y": 1},
+ {"matrix": [6, 6], "x": 13.75, "y": 1},
+ {"matrix": [6, 7], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 1], "x": 8, "y": 2},
+ {"matrix": [7, 2], "x": 9, "y": 2},
+ {"matrix": [7, 3], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 5], "x": 12, "y": 2},
+ {"matrix": [7, 6], "x": 13, "y": 2},
+ {"matrix": [7, 7], "x": 14, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 7.5, "y": 3},
+ {"matrix": [8, 1], "x": 8.5, "y": 3},
+ {"matrix": [8, 2], "x": 9.5, "y": 3},
+ {"matrix": [8, 3], "x": 10.5, "y": 3},
+ {"matrix": [8, 4], "x": 11.5, "y": 3},
+ {"matrix": [8, 5], "x": 12.5, "y": 3},
+ {"matrix": [8, 6], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [8, 7], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 5], "x": 5.5, "y": 4},
+
+ {"matrix": [9, 2], "x": 7.75, "y": 4},
+ {"matrix": [9, 3], "x": 8.75, "y": 4},
+ {"matrix": [9, 4], "x": 9.75, "y": 4},
+ {"matrix": [9, 5], "x": 10.75, "y": 4},
+ {"matrix": [9, 6], "x": 11.75, "y": 4},
+ {"matrix": [9, 7], "x": 12.75, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/takashiski/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk
deleted file mode 100644
index adea9f5950d..00000000000
--- a/keyboards/takashiski/hecomi/alpha/rules.mk
+++ /dev/null
@@ -1,13 +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 = 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 = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json
deleted file mode 100644
index 2c65d48a3cd..00000000000
--- a/keyboards/takashiski/otaku_split/rev0/info.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "keyboard_name": "otaku split rev.0",
- "manufacturer": "takashiski",
- "url": "",
- "maintainer": "takashiski",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
- "rows": ["B5", "B4", "E6", "D7", "C6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 9.75, "y": 0},
- {"matrix": [5, 1], "x": 10.75, "y": 0},
- {"matrix": [5, 2], "x": 11.75, "y": 0},
- {"matrix": [5, 3], "x": 12.75, "y": 0},
- {"matrix": [5, 4], "x": 13.75, "y": 0},
- {"matrix": [5, 5], "x": 14.75, "y": 0},
- {"matrix": [5, 6], "x": 15.75, "y": 0},
- {"matrix": [5, 7], "x": 16.75, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
-
- {"matrix": [6, 0], "x": 9.25, "y": 1},
- {"matrix": [6, 1], "x": 10.25, "y": 1},
- {"matrix": [6, 2], "x": 11.25, "y": 1},
- {"matrix": [6, 3], "x": 12.25, "y": 1},
- {"matrix": [6, 4], "x": 13.25, "y": 1},
- {"matrix": [6, 5], "x": 14.25, "y": 1},
- {"matrix": [6, 6], "x": 15.25, "y": 1},
- {"matrix": [6, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [7, 0], "x": 9.5, "y": 2},
- {"matrix": [7, 1], "x": 10.5, "y": 2},
- {"matrix": [7, 2], "x": 11.5, "y": 2},
- {"matrix": [7, 3], "x": 12.5, "y": 2},
- {"matrix": [7, 4], "x": 13.5, "y": 2},
- {"matrix": [7, 5], "x": 14.5, "y": 2},
- {"matrix": [7, 6], "x": 15.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
-
- {"matrix": [8, 0], "x": 9, "y": 3},
- {"matrix": [8, 1], "x": 10, "y": 3},
- {"matrix": [8, 2], "x": 11, "y": 3},
- {"matrix": [8, 3], "x": 12, "y": 3},
- {"matrix": [8, 4], "x": 13, "y": 3},
- {"matrix": [8, 5], "x": 14, "y": 3},
- {"matrix": [8, 6], "x": 15, "y": 3},
- {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
- {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 4.5, "y": 4},
- {"matrix": [4, 4], "x": 5.5, "y": 4},
- {"matrix": [4, 5], "x": 6.5, "y": 4},
-
- {"matrix": [9, 0], "x": 8.75, "y": 4},
- {"matrix": [9, 1], "x": 9.75, "y": 4},
- {"matrix": [9, 2], "x": 10.75, "y": 4},
- {"matrix": [9, 3], "x": 11.75, "y": 4},
- {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25},
- {"matrix": [9, 5], "x": 14, "y": 4, "w": 1.25},
- {"matrix": [9, 6], "x": 15.25, "y": 4, "w": 1.25},
- {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/takashiski/otaku_split/rev0/keyboard.json b/keyboards/takashiski/otaku_split/rev0/keyboard.json
new file mode 100644
index 00000000000..db577c22606
--- /dev/null
+++ b/keyboards/takashiski/otaku_split/rev0/keyboard.json
@@ -0,0 +1,116 @@
+{
+ "keyboard_name": "otaku split rev.0",
+ "manufacturer": "takashiski",
+ "url": "",
+ "maintainer": "takashiski",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["B5", "B4", "E6", "D7", "C6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 9.75, "y": 0},
+ {"matrix": [5, 1], "x": 10.75, "y": 0},
+ {"matrix": [5, 2], "x": 11.75, "y": 0},
+ {"matrix": [5, 3], "x": 12.75, "y": 0},
+ {"matrix": [5, 4], "x": 13.75, "y": 0},
+ {"matrix": [5, 5], "x": 14.75, "y": 0},
+ {"matrix": [5, 6], "x": 15.75, "y": 0},
+ {"matrix": [5, 7], "x": 16.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [6, 1], "x": 10.25, "y": 1},
+ {"matrix": [6, 2], "x": 11.25, "y": 1},
+ {"matrix": [6, 3], "x": 12.25, "y": 1},
+ {"matrix": [6, 4], "x": 13.25, "y": 1},
+ {"matrix": [6, 5], "x": 14.25, "y": 1},
+ {"matrix": [6, 6], "x": 15.25, "y": 1},
+ {"matrix": [6, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 2},
+ {"matrix": [7, 1], "x": 10.5, "y": 2},
+ {"matrix": [7, 2], "x": 11.5, "y": 2},
+ {"matrix": [7, 3], "x": 12.5, "y": 2},
+ {"matrix": [7, 4], "x": 13.5, "y": 2},
+ {"matrix": [7, 5], "x": 14.5, "y": 2},
+ {"matrix": [7, 6], "x": 15.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 9, "y": 3},
+ {"matrix": [8, 1], "x": 10, "y": 3},
+ {"matrix": [8, 2], "x": 11, "y": 3},
+ {"matrix": [8, 3], "x": 12, "y": 3},
+ {"matrix": [8, 4], "x": 13, "y": 3},
+ {"matrix": [8, 5], "x": 14, "y": 3},
+ {"matrix": [8, 6], "x": 15, "y": 3},
+ {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4},
+ {"matrix": [4, 4], "x": 5.5, "y": 4},
+ {"matrix": [4, 5], "x": 6.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.75, "y": 4},
+ {"matrix": [9, 1], "x": 9.75, "y": 4},
+ {"matrix": [9, 2], "x": 10.75, "y": 4},
+ {"matrix": [9, 3], "x": 11.75, "y": 4},
+ {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 14, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 15.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/takashiski/otaku_split/rev0/rules.mk b/keyboards/takashiski/otaku_split/rev0/rules.mk
deleted file mode 100644
index d43bca5db2a..00000000000
--- a/keyboards/takashiski/otaku_split/rev0/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 = 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
-SPLIT_KEYBOARD=yes
diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json
deleted file mode 100644
index 2c15c414e11..00000000000
--- a/keyboards/takashiski/otaku_split/rev1/info.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
- "keyboard_name": "otaku split rev.1",
- "manufacturer": "takashiski",
- "url": "http",
- "maintainer": "takashiski",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["C6", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0",
- "matrix_pins": {
- "right": {
- "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
- "rows": ["B5", "B4", "E6", "D7", "C6"]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [5, 0], "x": 8.75, "y": 0},
- {"matrix": [5, 1], "x": 9.75, "y": 0},
- {"matrix": [5, 2], "x": 10.75, "y": 0},
- {"matrix": [5, 3], "x": 11.75, "y": 0},
- {"matrix": [5, 4], "x": 12.75, "y": 0},
- {"matrix": [5, 5], "x": 13.75, "y": 0},
- {"matrix": [5, 6], "x": 14.75, "y": 0},
- {"matrix": [5, 7], "x": 15.75, "y": 0},
- {"matrix": [6, 7], "x": 16.75, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
-
- {"matrix": [6, 0], "x": 9.25, "y": 1},
- {"matrix": [6, 1], "x": 10.25, "y": 1},
- {"matrix": [6, 2], "x": 11.25, "y": 1},
- {"matrix": [6, 3], "x": 12.25, "y": 1},
- {"matrix": [6, 4], "x": 13.25, "y": 1},
- {"matrix": [6, 5], "x": 14.25, "y": 1},
- {"matrix": [6, 6], "x": 15.25, "y": 1},
- {"matrix": [7, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [7, 0], "x": 9.5, "y": 2},
- {"matrix": [7, 1], "x": 10.5, "y": 2},
- {"matrix": [7, 2], "x": 11.5, "y": 2},
- {"matrix": [7, 3], "x": 12.5, "y": 2},
- {"matrix": [7, 4], "x": 13.5, "y": 2},
- {"matrix": [7, 5], "x": 14.5, "y": 2},
- {"matrix": [7, 6], "x": 15.5, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
-
- {"matrix": [8, 0], "x": 9, "y": 3},
- {"matrix": [8, 1], "x": 10, "y": 3},
- {"matrix": [8, 2], "x": 11, "y": 3},
- {"matrix": [8, 3], "x": 12, "y": 3},
- {"matrix": [8, 4], "x": 13, "y": 3},
- {"matrix": [8, 5], "x": 14, "y": 3},
- {"matrix": [8, 6], "x": 15, "y": 3},
- {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4},
- {"matrix": [4, 5], "x": 5.5, "y": 4},
- {"matrix": [4, 6], "x": 6.5, "y": 4},
-
- {"matrix": [9, 0], "x": 8.75, "y": 4},
- {"matrix": [9, 1], "x": 9.75, "y": 4},
- {"matrix": [9, 2], "x": 10.75, "y": 4},
- {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
- {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25},
- {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25},
- {"matrix": [9, 6], "x": 15.5, "y": 4},
- {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/takashiski/otaku_split/rev1/keyboard.json b/keyboards/takashiski/otaku_split/rev1/keyboard.json
new file mode 100644
index 00000000000..0c83593eea6
--- /dev/null
+++ b/keyboards/takashiski/otaku_split/rev1/keyboard.json
@@ -0,0 +1,124 @@
+{
+ "keyboard_name": "otaku split rev.1",
+ "manufacturer": "takashiski",
+ "url": "http",
+ "maintainer": "takashiski",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["B5", "B4", "E6", "D7", "C6"]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [5, 0], "x": 8.75, "y": 0},
+ {"matrix": [5, 1], "x": 9.75, "y": 0},
+ {"matrix": [5, 2], "x": 10.75, "y": 0},
+ {"matrix": [5, 3], "x": 11.75, "y": 0},
+ {"matrix": [5, 4], "x": 12.75, "y": 0},
+ {"matrix": [5, 5], "x": 13.75, "y": 0},
+ {"matrix": [5, 6], "x": 14.75, "y": 0},
+ {"matrix": [5, 7], "x": 15.75, "y": 0},
+ {"matrix": [6, 7], "x": 16.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 9.25, "y": 1},
+ {"matrix": [6, 1], "x": 10.25, "y": 1},
+ {"matrix": [6, 2], "x": 11.25, "y": 1},
+ {"matrix": [6, 3], "x": 12.25, "y": 1},
+ {"matrix": [6, 4], "x": 13.25, "y": 1},
+ {"matrix": [6, 5], "x": 14.25, "y": 1},
+ {"matrix": [6, 6], "x": 15.25, "y": 1},
+ {"matrix": [7, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 2},
+ {"matrix": [7, 1], "x": 10.5, "y": 2},
+ {"matrix": [7, 2], "x": 11.5, "y": 2},
+ {"matrix": [7, 3], "x": 12.5, "y": 2},
+ {"matrix": [7, 4], "x": 13.5, "y": 2},
+ {"matrix": [7, 5], "x": 14.5, "y": 2},
+ {"matrix": [7, 6], "x": 15.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 9, "y": 3},
+ {"matrix": [8, 1], "x": 10, "y": 3},
+ {"matrix": [8, 2], "x": 11, "y": 3},
+ {"matrix": [8, 3], "x": 12, "y": 3},
+ {"matrix": [8, 4], "x": 13, "y": 3},
+ {"matrix": [8, 5], "x": 14, "y": 3},
+ {"matrix": [8, 6], "x": 15, "y": 3},
+ {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 5], "x": 5.5, "y": 4},
+ {"matrix": [4, 6], "x": 6.5, "y": 4},
+
+ {"matrix": [9, 0], "x": 8.75, "y": 4},
+ {"matrix": [9, 1], "x": 9.75, "y": 4},
+ {"matrix": [9, 2], "x": 10.75, "y": 4},
+ {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 15.5, "y": 4},
+ {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/takashiski/otaku_split/rev1/rules.mk b/keyboards/takashiski/otaku_split/rev1/rules.mk
deleted file mode 100644
index d43bca5db2a..00000000000
--- a/keyboards/takashiski/otaku_split/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 = 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
-SPLIT_KEYBOARD=yes
diff --git a/keyboards/telophase/info.json b/keyboards/telophase/info.json
deleted file mode 100644
index 2dd6c5dc783..00000000000
--- a/keyboards/telophase/info.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "keyboard_name": "Telophase",
- "manufacturer": "Unknown",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x6060",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "community_layouts": ["ortho_4x12"],
- "layout_aliases": {
- "LAYOUT": "LAYOUT_ortho_4x12"
- },
- "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": 7, "y": 0},
- {"matrix": [0, 7], "x": 8, "y": 0},
- {"matrix": [0, 8], "x": 9, "y": 0},
- {"matrix": [0, 9], "x": 10, "y": 0},
- {"matrix": [0, 10], "x": 11, "y": 0},
- {"matrix": [0, 11], "x": 12, "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": 7, "y": 1},
- {"matrix": [1, 7], "x": 8, "y": 1},
- {"matrix": [1, 8], "x": 9, "y": 1},
- {"matrix": [1, 9], "x": 10, "y": 1},
- {"matrix": [1, 10], "x": 11, "y": 1},
- {"matrix": [1, 11], "x": 12, "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": 7, "y": 2},
- {"matrix": [2, 7], "x": 8, "y": 2},
- {"matrix": [2, 8], "x": 9, "y": 2},
- {"matrix": [2, 9], "x": 10, "y": 2},
- {"matrix": [2, 10], "x": 11, "y": 2},
- {"matrix": [2, 11], "x": 12, "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": 7, "y": 3},
- {"matrix": [3, 7], "x": 8, "y": 3},
- {"matrix": [3, 8], "x": 9, "y": 3},
- {"matrix": [3, 9], "x": 10, "y": 3},
- {"matrix": [3, 10], "x": 11, "y": 3},
- {"matrix": [3, 11], "x": 12, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/telophase/keyboard.json b/keyboards/telophase/keyboard.json
new file mode 100644
index 00000000000..8efbae55195
--- /dev/null
+++ b/keyboards/telophase/keyboard.json
@@ -0,0 +1,82 @@
+{
+ "keyboard_name": "Telophase",
+ "manufacturer": "Unknown",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "community_layouts": ["ortho_4x12"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_4x12"
+ },
+ "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": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
+ {"matrix": [0, 11], "x": 12, "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": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "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": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "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": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/telophase/rules.mk b/keyboards/telophase/rules.mk
index 706d6106538..ae63f87e079 100644
--- a/keyboards/telophase/rules.mk
+++ b/keyboards/telophase/rules.mk
@@ -1,18 +1,4 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
CUSTOM_MATRIX = lite
-
-# project specific files
SRC += matrix.c
UART_DRIVER_REQUIRED = yes
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
deleted file mode 100644
index 4f908c83e62..00000000000
--- a/keyboards/tkc/portico/info.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
- "keyboard_name": "Portico",
- "manufacturer": "TKC",
- "url": "",
- "maintainer": "TerryMathews",
- "usb": {
- "vid": "0x544B",
- "pid": "0x0008",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true
- },
- "driver": "is31fl3731",
- "led_flush_limit": 26,
- "led_process_limit": 4,
- "max_brightness": 200,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
- "rows": ["B6", "C6", "C7", "F7", "D2"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_blocker"
- },
- "community_layouts": ["65_ansi_blocker"],
- "layouts": {
- "LAYOUT_65_ansi_blocker": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/tkc/portico/keyboard.json b/keyboards/tkc/portico/keyboard.json
new file mode 100644
index 00000000000..29b7d8246b2
--- /dev/null
+++ b/keyboards/tkc/portico/keyboard.json
@@ -0,0 +1,142 @@
+{
+ "keyboard_name": "Portico",
+ "manufacturer": "TKC",
+ "url": "",
+ "maintainer": "TerryMathews",
+ "usb": {
+ "vid": "0x544B",
+ "pid": "0x0008",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true
+ },
+ "driver": "is31fl3731",
+ "led_flush_limit": 26,
+ "led_process_limit": 4,
+ "max_brightness": 200,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
+ "rows": ["B6", "C6", "C7", "F7", "D2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_blocker"
+ },
+ "community_layouts": ["65_ansi_blocker"],
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk
index 6bc05372aff..4263ceb1684 100644
--- a/keyboards/tkc/portico/rules.mk
+++ b/keyboards/tkc/portico/rules.mk
@@ -1,22 +1,8 @@
-# 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 = yes # 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 = no
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC += keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
deleted file mode 100644
index fa2a24951fa..00000000000
--- a/keyboards/tkc/portico75/info.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
- "keyboard_name": "Portico75",
- "manufacturer": "TKC",
- "url": "",
- "maintainer": "TerryMathews",
- "usb": {
- "vid": "0x544B",
- "pid": "0x0011",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true
- },
- "driver": "is31fl3741",
- "led_flush_limit": 26,
- "led_process_limit": 4,
- "max_brightness": 200,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
- "rows": ["B0", "E6", "F0", "F1", "D3", "D2"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B1", "pin_b": "B2", "resolution": 2}
- ]
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "layouts": {
- "LAYOUT_75_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.5, "y": 0},
- {"matrix": [0, 6], "x": 6.5, "y": 0},
- {"matrix": [0, 7], "x": 7.5, "y": 0},
- {"matrix": [0, 8], "x": 8.5, "y": 0},
- {"matrix": [0, 9], "x": 9.75, "y": 0},
- {"matrix": [0, 10], "x": 10.75, "y": 0},
- {"matrix": [0, 11], "x": 11.75, "y": 0},
- {"matrix": [0, 12], "x": 12.75, "y": 0},
- {"matrix": [0, 13], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1.25},
- {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"matrix": [1, 7], "x": 7, "y": 1.25},
- {"matrix": [1, 8], "x": 8, "y": 1.25},
- {"matrix": [1, 9], "x": 9, "y": 1.25},
- {"matrix": [1, 10], "x": 10, "y": 1.25},
- {"matrix": [1, 11], "x": 11, "y": 1.25},
- {"matrix": [1, 12], "x": 12, "y": 1.25},
- {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
- {"matrix": [1, 14], "x": 15, "y": 1.25},
-
- {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
- {"matrix": [2, 14], "x": 15, "y": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [4, 1], "x": 2.25, "y": 4.25},
- {"matrix": [4, 2], "x": 3.25, "y": 4.25},
- {"matrix": [4, 3], "x": 4.25, "y": 4.25},
- {"matrix": [4, 4], "x": 5.25, "y": 4.25},
- {"matrix": [4, 5], "x": 6.25, "y": 4.25},
- {"matrix": [4, 6], "x": 7.25, "y": 4.25},
- {"matrix": [4, 7], "x": 8.25, "y": 4.25},
- {"matrix": [4, 8], "x": 9.25, "y": 4.25},
- {"matrix": [4, 9], "x": 10.25, "y": 4.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4.25},
- {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
- {"matrix": [4, 12], "x": 14.25, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
- {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
- {"matrix": [5, 11], "x": 13.25, "y": 5.5},
- {"matrix": [5, 12], "x": 14.25, "y": 5.5},
- {"matrix": [5, 13], "x": 15.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/tkc/portico75/keyboard.json b/keyboards/tkc/portico75/keyboard.json
new file mode 100644
index 00000000000..79ead697648
--- /dev/null
+++ b/keyboards/tkc/portico75/keyboard.json
@@ -0,0 +1,159 @@
+{
+ "keyboard_name": "Portico75",
+ "manufacturer": "TKC",
+ "url": "",
+ "maintainer": "TerryMathews",
+ "usb": {
+ "vid": "0x544B",
+ "pid": "0x0011",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true
+ },
+ "driver": "is31fl3741",
+ "led_flush_limit": 26,
+ "led_process_limit": 4,
+ "max_brightness": 200,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
+ "rows": ["B0", "E6", "F0", "F1", "D3", "D2"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B1", "pin_b": "B2", "resolution": 2}
+ ]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "layouts": {
+ "LAYOUT_75_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 12], "x": 14.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 11], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 12], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 15.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/tkc/portico75/keymaps/via/rules.mk b/keyboards/tkc/portico75/keymaps/via/rules.mk
index 1706771222e..81628aba6ba 100644
--- a/keyboards/tkc/portico75/keymaps/via/rules.mk
+++ b/keyboards/tkc/portico75/keymaps/via/rules.mk
@@ -10,3 +10,4 @@ SRC += keyboards/wilba_tech/wt_main.c \
drivers/led/issi/is31fl3741.c
I2C_DRIVER_REQUIRED = yes
+CIE1931_CURVE = yes
diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk
deleted file mode 100644
index 36e22b992da..00000000000
--- a/keyboards/tkc/portico75/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 = yes # 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
-CIE1931_CURVE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json
index e9cfeee1399..13bc1e7acf5 100644
--- a/keyboards/tkw/grandiceps/info.json
+++ b/keyboards/tkw/grandiceps/info.json
@@ -4,7 +4,19 @@
"maintainer": "vattern",
"usb": {
"vid": "0xFEED",
- "pid": "0x7812"
+ "pid": "0x7812",
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "rgblight": true
},
"ws2812": {
"pin": "B1",
@@ -39,6 +51,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "A15",
"matrix_pins": {
"right": {
diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/keyboard.json
similarity index 100%
rename from keyboards/tkw/grandiceps/rev2/info.json
rename to keyboards/tkw/grandiceps/rev2/keyboard.json
diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk
index 86483ba9207..01fa5217635 100644
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@@ -1,21 +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 = yes # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes # Enable rotary encoder support
-AUDIO_ENABLE = no # Audio output
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
-OLED_ENABLE = yes
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
DEFAULT_FOLDER = tkw/grandiceps/rev1
diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
deleted file mode 100644
index 9d7a60a4b97..00000000000
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ /dev/null
@@ -1,264 +0,0 @@
-{
- "keyboard_name": "stoutgat",
- "manufacturer": "TKW",
- "url": "https://github.com/vattern/stoutgat",
- "maintainer": "vattern",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x7811",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
- "rows": ["D1", "D0", "A0", "A1", "A2"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "B3"},
- {"pin_a": "B0", "pin_b": "B1"}
- ]
- },
- "qmk": {
- "tap_keycode_delay": 10
- },
- "processor": "atmega32a",
- "bootloader": "usbasploader",
- "community_layouts": ["65_iso", "65_ansi"],
- "layouts": {
- "LAYOUT_65_ansi": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
- {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
- {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
- {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_iso": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2},
- {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
- {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
- {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
- {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
- {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_encoder": {
- "layout": [
- {"label": "K44", "matrix": [4, 4], "x": 1, "y": 0},
-
- {"label": "K48", "matrix": [4, 8], "x": 14, "y": 0},
-
- {"label": "K00", "matrix": [0, 0], "x": 0, "y": 1},
- {"label": "K01", "matrix": [0, 1], "x": 1, "y": 1},
- {"label": "K02", "matrix": [0, 2], "x": 2, "y": 1},
- {"label": "K03", "matrix": [0, 3], "x": 3, "y": 1},
- {"label": "K04", "matrix": [0, 4], "x": 4, "y": 1},
- {"label": "K05", "matrix": [0, 5], "x": 5, "y": 1},
- {"label": "K06", "matrix": [0, 6], "x": 6, "y": 1},
- {"label": "K07", "matrix": [0, 7], "x": 7, "y": 1},
- {"label": "K08", "matrix": [0, 8], "x": 8, "y": 1},
- {"label": "K09", "matrix": [0, 9], "x": 9, "y": 1},
- {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 1},
- {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 1},
- {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 1},
- {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 1, "w": 2},
- {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 1},
-
- {"label": "K10", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
- {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 2},
- {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 2},
- {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 2},
- {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 2},
- {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 2},
- {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 2},
- {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 2},
- {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 2},
- {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 2},
- {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 2},
- {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 2},
- {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 2},
- {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 2},
-
- {"label": "K20", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
- {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 3},
- {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 3},
- {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 3},
- {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 3},
- {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 3},
- {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 3},
- {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 3},
- {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 3},
- {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 3},
- {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 3},
- {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 3},
- {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 3},
- {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
- {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 3},
-
- {"label": "K30", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 4},
- {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 4},
- {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 4},
- {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 4},
- {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 4},
- {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 4},
- {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 4},
- {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 4},
- {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 4},
- {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 4},
- {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 4},
- {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 4},
- {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 4},
-
- {"label": "K40", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
- {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
- {"label": "K49", "matrix": [4, 9], "x": 10, "y": 5},
- {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 5},
- {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 5},
- {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 5},
- {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 5},
- {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/tkw/stoutgat/v1/keyboard.json b/keyboards/tkw/stoutgat/v1/keyboard.json
new file mode 100644
index 00000000000..2dd46af4947
--- /dev/null
+++ b/keyboards/tkw/stoutgat/v1/keyboard.json
@@ -0,0 +1,271 @@
+{
+ "keyboard_name": "stoutgat",
+ "manufacturer": "TKW",
+ "url": "https://github.com/vattern/stoutgat",
+ "maintainer": "vattern",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x7811",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"],
+ "rows": ["D1", "D0", "A0", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B3"},
+ {"pin_a": "B0", "pin_b": "B1"}
+ ]
+ },
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
+ "community_layouts": ["65_iso", "65_ansi"],
+ "layouts": {
+ "LAYOUT_65_ansi": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+ {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+ {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+ {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_iso": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2},
+ {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+ {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+ {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+ {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_encoder": {
+ "layout": [
+ {"label": "K44", "matrix": [4, 4], "x": 1, "y": 0},
+
+ {"label": "K48", "matrix": [4, 8], "x": 14, "y": 0},
+
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 1},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 1},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 1},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 1},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 1},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 1},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 1},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 1},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 1},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 1},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 1},
+ {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 1},
+ {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 1},
+ {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 1, "w": 2},
+ {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 1},
+
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 2},
+ {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 2},
+ {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 2},
+ {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 2},
+ {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 2},
+ {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 2},
+ {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 2},
+ {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 2},
+ {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 2},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 2},
+ {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 2},
+ {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 2},
+ {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 2},
+
+ {"label": "K20", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 3},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 3},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 3},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 3},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 3},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 3},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 3},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 3},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 3},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 3},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 3},
+ {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 3},
+ {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 3},
+
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 4},
+ {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 4},
+ {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 4},
+ {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 4},
+ {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 4},
+ {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 4},
+ {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 4},
+ {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 4},
+ {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 4},
+ {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 4},
+ {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 4},
+ {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 4},
+ {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 4},
+
+ {"label": "K40", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"label": "K49", "matrix": [4, 9], "x": 10, "y": 5},
+ {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 5},
+ {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 5},
+ {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 5},
+ {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 5},
+ {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk
index 8dca0665f77..c2ee0bc86f9 100644
--- a/keyboards/tkw/stoutgat/v1/rules.mk
+++ b/keyboards/tkw/stoutgat/v1/rules.mk
@@ -1,16 +1,2 @@
# Processor frequency
F_CPU = 16000000
-
-# 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
-ENCODER_ENABLE = yes
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index b1232f6816e..dbb227b0fdc 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -8,6 +8,14 @@
"pid": "0x7811",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"ws2812": {
"pin": "B1",
"driver": "pwm"
diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk
index 477d680add8..1a660af26c9 100644
--- a/keyboards/tkw/stoutgat/v2/rules.mk
+++ b/keyboards/tkw/stoutgat/v2/rules.mk
@@ -1,18 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-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
-ENCODER_ENABLE = yes # Enable rotary encoder support
-AUDIO_ENABLE = no # Audio output
-
-OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
-
DEFAULT_FOLDER = tkw/stoutgat/v2/f411
diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/info.json
deleted file mode 100644
index 7b2f198e596..00000000000
--- a/keyboards/tokyokeyboard/alix40/info.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- "keyboard_name": "alix40",
- "manufacturer": "quadcube",
- "url": "https://tokyokeyboard.com/",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x5143",
- "pid": "0x4134",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"],
- "rows": ["D7", "C6", "C7", "B5"]
- },
- "diode_direction": "ROW2COL",
- "bluetooth": {
- "driver": "bluefruit_le"
- },
- "backlight": {
- "pin": "B7",
- "levels": 31,
- "breathing": true
- },
- "rgblight": {
- "hue_steps": 10,
- "saturation_steps": 10,
- "brightness_steps": 10,
- "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": {
- "pin": "B0"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_40_alix": {
- "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": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
- {"matrix": [0, 9], "x": 10.5, "y": 0},
- {"matrix": [0, 10], "x": 11.5, "y": 0},
- {"matrix": [0, 11], "x": 12.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0.25, "y": 1},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
-
- {"matrix": [1, 6], "x": 7.75, "y": 1},
- {"matrix": [1, 7], "x": 8.75, "y": 1},
- {"matrix": [1, 8], "x": 9.75, "y": 1},
- {"matrix": [1, 9], "x": 10.75, "y": 1},
- {"matrix": [1, 10], "x": 11.75, "y": 1},
- {"matrix": [1, 11], "x": 12.75, "y": 1},
-
- {"matrix": [2, 0], "x": 0.75, "y": 2},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [2, 6], "x": 7.25, "y": 2},
- {"matrix": [2, 7], "x": 8.25, "y": 2},
- {"matrix": [2, 8], "x": 9.25, "y": 2},
- {"matrix": [2, 9], "x": 10.25, "y": 2},
- {"matrix": [2, 10], "x": 11.25, "y": 2},
- {"matrix": [2, 11], "x": 12.25, "y": 2},
-
- {"matrix": [3, 0], "x": 0.5, "y": 3},
- {"matrix": [3, 1], "x": 1.5, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
-
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 11.5, "y": 3},
- {"matrix": [3, 11], "x": 12.5, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/tokyokeyboard/alix40/keyboard.json b/keyboards/tokyokeyboard/alix40/keyboard.json
new file mode 100644
index 00000000000..e4c27aaec21
--- /dev/null
+++ b/keyboards/tokyokeyboard/alix40/keyboard.json
@@ -0,0 +1,114 @@
+{
+ "keyboard_name": "alix40",
+ "manufacturer": "quadcube",
+ "url": "https://tokyokeyboard.com/",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x5143",
+ "pid": "0x4134",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bluetooth": true,
+ "bootmagic": true,
+ "command": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"],
+ "rows": ["D7", "C6", "C7", "B5"]
+ },
+ "diode_direction": "ROW2COL",
+ "bluetooth": {
+ "driver": "bluefruit_le"
+ },
+ "backlight": {
+ "pin": "B7",
+ "levels": 31,
+ "breathing": true
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "saturation_steps": 10,
+ "brightness_steps": 10,
+ "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": {
+ "pin": "B0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_40_alix": {
+ "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": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+
+ {"matrix": [1, 6], "x": 7.75, "y": 1},
+ {"matrix": [1, 7], "x": 8.75, "y": 1},
+ {"matrix": [1, 8], "x": 9.75, "y": 1},
+ {"matrix": [1, 9], "x": 10.75, "y": 1},
+ {"matrix": [1, 10], "x": 11.75, "y": 1},
+ {"matrix": [1, 11], "x": 12.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+ {"matrix": [2, 7], "x": 8.25, "y": 2},
+ {"matrix": [2, 8], "x": 9.25, "y": 2},
+ {"matrix": [2, 9], "x": 10.25, "y": 2},
+ {"matrix": [2, 10], "x": 11.25, "y": 2},
+ {"matrix": [2, 11], "x": 12.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0.5, "y": 3},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.5, "y": 3},
+ {"matrix": [3, 11], "x": 12.5, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/tokyokeyboard/alix40/rules.mk b/keyboards/tokyokeyboard/alix40/rules.mk
index 5d6d78ae10a..3437a35bdf1 100644
--- a/keyboards/tokyokeyboard/alix40/rules.mk
+++ b/keyboards/tokyokeyboard/alix40/rules.mk
@@ -1,16 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = 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
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/info.json
deleted file mode 100644
index be22362de21..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
- "keyboard_name": "Littlefoot LX",
- "manufacturer": "tominabox1",
- "url": "",
- "maintainer": "tominabox1",
- "usb": {
- "vid": "0x7431",
- "pid": "0x6C78",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"],
- "rows": ["D5", "F4", "D3", "F1", "F0"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [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": [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": [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": [4, 5], "x": 1.5, "y": 4, "w": 7}
- ]
- },
- "LAYOUT_split": {
- "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": [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": [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": [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": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
- {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
- {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
- {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json
new file mode 100644
index 00000000000..b021ba9c8d4
--- /dev/null
+++ b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json
@@ -0,0 +1,127 @@
+{
+ "keyboard_name": "Littlefoot LX",
+ "manufacturer": "tominabox1",
+ "url": "",
+ "maintainer": "tominabox1",
+ "usb": {
+ "vid": "0x7431",
+ "pid": "0x6C78",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"],
+ "rows": ["D5", "F4", "D3", "F1", "F0"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [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": [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": [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": [4, 5], "x": 1.5, "y": 4, "w": 7}
+ ]
+ },
+ "LAYOUT_split": {
+ "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": [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": [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": [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": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk
deleted file mode 100644
index 964fd155399..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/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 = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/info.json
deleted file mode 100644
index 6a48b5076b4..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
- "keyboard_name": "Littlefoot LX",
- "manufacturer": "tominabox1",
- "url": "",
- "maintainer": "tominabox1",
- "usb": {
- "vid": "0x7431",
- "pid": "0x6C78",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"],
- "rows": ["D5", "F4", "D3", "F1", "F0"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [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": [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": [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": [4, 5], "x": 1.5, "y": 4, "w": 7}
- ]
- },
- "LAYOUT_split": {
- "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": [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": [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": [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": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
- {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
- {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
- {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json
new file mode 100644
index 00000000000..fe1cf6e5960
--- /dev/null
+++ b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json
@@ -0,0 +1,127 @@
+{
+ "keyboard_name": "Littlefoot LX",
+ "manufacturer": "tominabox1",
+ "url": "",
+ "maintainer": "tominabox1",
+ "usb": {
+ "vid": "0x7431",
+ "pid": "0x6C78",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"],
+ "rows": ["D5", "F4", "D3", "F1", "F0"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [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": [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": [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": [4, 5], "x": 1.5, "y": 4, "w": 7}
+ ]
+ },
+ "LAYOUT_split": {
+ "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": [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": [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": [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": [4, 2], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 3, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk
deleted file mode 100644
index 964fd155399..00000000000
--- a/keyboards/tominabox1/littlefoot_lx/rev2/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 = no # 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
diff --git a/keyboards/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h
deleted file mode 100644
index 333d0a100eb..00000000000
--- a/keyboards/tominabox1/underscore33/rev1/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/info.json
deleted file mode 100644
index c52c1b13730..00000000000
--- a/keyboards/tominabox1/underscore33/rev1/info.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
- "keyboard_name": "underscore33",
- "manufacturer": "tominabox1",
- "url": "",
- "maintainer": "tominabox1",
- "usb": {
- "vid": "0x7431",
- "pid": "0x3301",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"],
- "rows": ["F5", "F6", "C6", "D0"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_33_big_space": {
- "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": [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": [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": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
- {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
- {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
- ]
- },
- "LAYOUT_33_split_space": {
- "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": [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": [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": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
- {"matrix": [3, 2], "x": 1.9, "y": 3, "w": 2.25},
- {"matrix": [3, 4], "x": 4.15, "y": 3, "w": 1.75},
- {"matrix": [3, 6], "x": 5.9, "y": 3, "w": 2.25},
- {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/tominabox1/underscore33/rev1/keyboard.json b/keyboards/tominabox1/underscore33/rev1/keyboard.json
new file mode 100644
index 00000000000..221ecccb041
--- /dev/null
+++ b/keyboards/tominabox1/underscore33/rev1/keyboard.json
@@ -0,0 +1,114 @@
+{
+ "keyboard_name": "underscore33",
+ "manufacturer": "tominabox1",
+ "url": "",
+ "maintainer": "tominabox1",
+ "usb": {
+ "vid": "0x7431",
+ "pid": "0x3301",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"],
+ "rows": ["F5", "F6", "C6", "D0"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_33_big_space": {
+ "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": [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": [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": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
+ {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_33_split_space": {
+ "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": [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": [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": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 1.9, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.15, "y": 3, "w": 1.75},
+ {"matrix": [3, 6], "x": 5.9, "y": 3, "w": 2.25},
+ {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/tominabox1/underscore33/rev1/rules.mk b/keyboards/tominabox1/underscore33/rev1/rules.mk
deleted file mode 100644
index 3b6a1809db1..00000000000
--- a/keyboards/tominabox1/underscore33/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 = yes # 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/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
deleted file mode 100644
index 333d0a100eb..00000000000
--- a/keyboards/tominabox1/underscore33/rev2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json
deleted file mode 100644
index b9c8b87b502..00000000000
--- a/keyboards/tominabox1/underscore33/rev2/info.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
- "keyboard_name": "underscore33",
- "manufacturer": "tominabox1",
- "url": "",
- "maintainer": "tominabox1",
- "usb": {
- "vid": "0x7431",
- "pid": "0x3302",
- "device_version": "0.0.2"
- },
- "rgblight": {
- "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": {
- "pin": "D6"
- },
- "matrix_pins": {
- "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "C2", "D0"],
- "rows": ["C4", "B0", "B1", "B2"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u2",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_33_big_space": {
- "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": [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": [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": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
- {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
- {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
- ]
- },
- "LAYOUT_33_split_space": {
- "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": [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": [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": [3, 1], "x": 0.65, "y": 3},
- {"matrix": [3, 2], "x": 1.65, "y": 3, "w": 1.25},
- {"matrix": [3, 3], "x": 2.9, "y": 3, "w": 2.25},
- {"matrix": [3, 5], "x": 5.15, "y": 3, "w": 2},
- {"matrix": [3, 7], "x": 7.15, "y": 3, "w": 1.25},
- {"matrix": [3, 8], "x": 8.4, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/tominabox1/underscore33/rev2/keyboard.json b/keyboards/tominabox1/underscore33/rev2/keyboard.json
new file mode 100644
index 00000000000..4375116963f
--- /dev/null
+++ b/keyboards/tominabox1/underscore33/rev2/keyboard.json
@@ -0,0 +1,133 @@
+{
+ "keyboard_name": "underscore33",
+ "manufacturer": "tominabox1",
+ "url": "",
+ "maintainer": "tominabox1",
+ "usb": {
+ "vid": "0x7431",
+ "pid": "0x3302",
+ "device_version": "0.0.2"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgblight": {
+ "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": {
+ "pin": "D6"
+ },
+ "matrix_pins": {
+ "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "C2", "D0"],
+ "rows": ["C4", "B0", "B1", "B2"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u2",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_33_big_space": {
+ "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": [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": [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": [3, 1], "x": 0.65, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 1.9, "y": 3, "w": 6.25},
+ {"matrix": [3, 8], "x": 8.15, "y": 3, "w": 1.25}
+ ]
+ },
+ "LAYOUT_33_split_space": {
+ "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": [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": [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": [3, 1], "x": 0.65, "y": 3},
+ {"matrix": [3, 2], "x": 1.65, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 2.9, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 5.15, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7.15, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 8.4, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/tominabox1/underscore33/rev2/rules.mk b/keyboards/tominabox1/underscore33/rev2/rules.mk
deleted file mode 100644
index dd8f1a5ae7d..00000000000
--- a/keyboards/tominabox1/underscore33/rev2/rules.mk
+++ /dev/null
@@ -1,13 +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
-
diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json
deleted file mode 100644
index c1b83188f06..00000000000
--- a/keyboards/torn/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "keyboard_name": "Torn",
- "manufacturer": "richard.titmuss",
- "url": "https://github.com/rtitmuss/torn",
- "maintainer": "rtitmuss",
- "usb": {
- "vid": "0x7274",
- "pid": "0x0001",
- "device_version": "0.0.1",
- "max_power": 100
- },
- "encoder": {
- "rotary": [
- {"pin_a": "B2", "pin_b": "B1"}
- ]
- },
- "processor": "atmega328p",
- "bootloader": "usbasploader",
- "layouts": {
- "LAYOUT_split_3x6_4": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0.375},
- {"matrix": [0, 1], "x": 1, "y": 0.375},
- {"matrix": [0, 2], "x": 2, "y": 0.125},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0.125},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
-
- {"matrix": [0, 6], "x": 9, "y": 0.25},
- {"matrix": [0, 7], "x": 10, "y": 0.125},
- {"matrix": [0, 8], "x": 11, "y": 0},
- {"matrix": [0, 9], "x": 12, "y": 0.125},
- {"matrix": [0, 10], "x": 13, "y": 0.375},
- {"matrix": [0, 11], "x": 14, "y": 0.375},
-
- {"matrix": [1, 0], "x": 0, "y": 1.375},
- {"matrix": [1, 1], "x": 1, "y": 1.375},
- {"matrix": [1, 2], "x": 2, "y": 1.125},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1.125},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
-
- {"matrix": [1, 6], "x": 9, "y": 1.25},
- {"matrix": [1, 7], "x": 10, "y": 1.125},
- {"matrix": [1, 8], "x": 11, "y": 1},
- {"matrix": [1, 9], "x": 12, "y": 1.125},
- {"matrix": [1, 10], "x": 13, "y": 1.375},
- {"matrix": [1, 11], "x": 14, "y": 1.375},
-
- {"matrix": [2, 0], "x": 0, "y": 2.375},
- {"matrix": [2, 1], "x": 1, "y": 2.375},
- {"matrix": [2, 2], "x": 2, "y": 2.125},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2.125},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
-
- {"matrix": [2, 6], "x": 9, "y": 2.25},
- {"matrix": [2, 7], "x": 10, "y": 2.125},
- {"matrix": [2, 8], "x": 11, "y": 2},
- {"matrix": [2, 9], "x": 12, "y": 2.125},
- {"matrix": [2, 10], "x": 13, "y": 2.375},
- {"matrix": [2, 11], "x": 14, "y": 2.375},
-
- {"matrix": [3, 2], "x": 3, "y": 3.1},
- {"matrix": [3, 3], "x": 4, "y": 3.25},
- {"matrix": [3, 4], "x": 5, "y": 3.4},
- {"matrix": [3, 5], "x": 6, "y": 3.55},
-
- {"matrix": [3, 6], "x": 8, "y": 3.55},
- {"matrix": [3, 7], "x": 9, "y": 3.4},
- {"matrix": [3, 8], "x": 10, "y": 3.25},
- {"matrix": [3, 9], "x": 11, "y": 3.1}
- ]
- }
- }
-}
diff --git a/keyboards/torn/keyboard.json b/keyboards/torn/keyboard.json
new file mode 100644
index 00000000000..162e7d08c0e
--- /dev/null
+++ b/keyboards/torn/keyboard.json
@@ -0,0 +1,84 @@
+{
+ "keyboard_name": "Torn",
+ "manufacturer": "richard.titmuss",
+ "url": "https://github.com/rtitmuss/torn",
+ "maintainer": "rtitmuss",
+ "usb": {
+ "vid": "0x7274",
+ "pid": "0x0001",
+ "device_version": "0.0.1",
+ "max_power": 100
+ },
+ "features": {
+ "bootmagic": false,
+ "encoder": true,
+ "extrakey": false,
+ "mousekey": false,
+ "oled": true,
+ "wpm": true
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "B1"}
+ ]
+ },
+ "processor": "atmega328p",
+ "bootloader": "usbasploader",
+ "layouts": {
+ "LAYOUT_split_3x6_4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+ {"matrix": [0, 6], "x": 9, "y": 0.25},
+ {"matrix": [0, 7], "x": 10, "y": 0.125},
+ {"matrix": [0, 8], "x": 11, "y": 0},
+ {"matrix": [0, 9], "x": 12, "y": 0.125},
+ {"matrix": [0, 10], "x": 13, "y": 0.375},
+ {"matrix": [0, 11], "x": 14, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+ {"matrix": [1, 6], "x": 9, "y": 1.25},
+ {"matrix": [1, 7], "x": 10, "y": 1.125},
+ {"matrix": [1, 8], "x": 11, "y": 1},
+ {"matrix": [1, 9], "x": 12, "y": 1.125},
+ {"matrix": [1, 10], "x": 13, "y": 1.375},
+ {"matrix": [1, 11], "x": 14, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+ {"matrix": [2, 6], "x": 9, "y": 2.25},
+ {"matrix": [2, 7], "x": 10, "y": 2.125},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2.125},
+ {"matrix": [2, 10], "x": 13, "y": 2.375},
+ {"matrix": [2, 11], "x": 14, "y": 2.375},
+
+ {"matrix": [3, 2], "x": 3, "y": 3.1},
+ {"matrix": [3, 3], "x": 4, "y": 3.25},
+ {"matrix": [3, 4], "x": 5, "y": 3.4},
+ {"matrix": [3, 5], "x": 6, "y": 3.55},
+
+ {"matrix": [3, 6], "x": 8, "y": 3.55},
+ {"matrix": [3, 7], "x": 9, "y": 3.4},
+ {"matrix": [3, 8], "x": 10, "y": 3.25},
+ {"matrix": [3, 9], "x": 11, "y": 3.1}
+ ]
+ }
+ }
+}
diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk
index f855a651a55..213b5db8ab8 100644
--- a/keyboards/torn/rules.mk
+++ b/keyboards/torn/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes # Enable rotary encoder
-OLED_ENABLE = yes
-WPM_ENABLE = yes
CUSTOM_MATRIX = lite
SRC += matrix.c \
diff --git a/keyboards/touchpad/config.h b/keyboards/touchpad/config.h
index d499fb795c3..f6f58cc5a12 100644
--- a/keyboards/touchpad/config.h
+++ b/keyboards/touchpad/config.h
@@ -17,28 +17,6 @@ along with this program. If not, see .
#pragma once
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 6
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/touchpad/info.json b/keyboards/touchpad/info.json
deleted file mode 100644
index 7b3cc0950d9..00000000000
--- a/keyboards/touchpad/info.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "keyboard_name": "TouchPad",
- "manufacturer": "JacoBurge",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x16D0",
- "pid": "0x0DB8",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT_ortho_6x6": {
- "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5},
- {"matrix": [5, 1], "x": 1, "y": 5},
- {"matrix": [5, 2], "x": 2, "y": 5},
- {"matrix": [5, 3], "x": 3, "y": 5},
- {"matrix": [5, 4], "x": 4, "y": 5},
- {"matrix": [5, 5], "x": 5, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/touchpad/keyboard.json b/keyboards/touchpad/keyboard.json
new file mode 100644
index 00000000000..5429b5844db
--- /dev/null
+++ b/keyboards/touchpad/keyboard.json
@@ -0,0 +1,73 @@
+{
+ "keyboard_name": "TouchPad",
+ "manufacturer": "JacoBurge",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x16D0",
+ "pid": "0x0DB8",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_ortho_6x6": {
+ "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [5, 1], "x": 1, "y": 5},
+ {"matrix": [5, 2], "x": 2, "y": 5},
+ {"matrix": [5, 3], "x": 3, "y": 5},
+ {"matrix": [5, 4], "x": 4, "y": 5},
+ {"matrix": [5, 5], "x": 5, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/touchpad/rules.mk b/keyboards/touchpad/rules.mk
index b9fb83c48c7..42be966784a 100644
--- a/keyboards/touchpad/rules.mk
+++ b/keyboards/touchpad/rules.mk
@@ -1,15 +1,3 @@
-# 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 = yes # 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
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
CUSTOM_MATRIX = yes
SRC += matrix.c
diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lotus58/nanoboot/info.json
rename to keyboards/tweetydabird/lotus58/nanoboot/keyboard.json
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
similarity index 100%
rename from keyboards/tweetydabird/lotus58/rp2040_ce/info.json
rename to keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json
diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/info.json
deleted file mode 100644
index d9d0ea30edd..00000000000
--- a/keyboards/ungodly/launch_pad/info.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
- "keyboard_name": "Launch Pad",
- "manufacturer": "Ungodly Design",
- "url": "https://ungodly.design/products/launch-pad",
- "maintainer": "Ungodly Design",
- "usb": {
- "vid": "0x5544",
- "pid": "0x4C50",
- "device_version": "99.9.9"
- },
- "rgb_matrix": {
- "animations": {
- "gradient_left_right": true,
- "cycle_pinwheel": true
- },
- "default": {
- "animation": "cycle_pinwheel"
- },
- "driver": "ws2812",
- "max_brightness": 150,
- "sat_steps": 8,
- "val_steps": 8,
- "speed_steps": 10,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["B0", "B1", "B2", "B3"],
- "rows": ["D4", "D6", "D7", "B4", "B5"]
- },
- "ws2812": {
- "pin": "F7"
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "C6", "pin_b": "B6", "resolution": 2}
- ]
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_ortho_5x4": {
- "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/ungodly/launch_pad/keyboard.json b/keyboards/ungodly/launch_pad/keyboard.json
new file mode 100644
index 00000000000..50b6c2bcbf6
--- /dev/null
+++ b/keyboards/ungodly/launch_pad/keyboard.json
@@ -0,0 +1,87 @@
+{
+ "keyboard_name": "Launch Pad",
+ "manufacturer": "Ungodly Design",
+ "url": "https://ungodly.design/products/launch-pad",
+ "maintainer": "Ungodly Design",
+ "usb": {
+ "vid": "0x5544",
+ "pid": "0x4C50",
+ "device_version": "99.9.9"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "midi": true,
+ "mousekey": false,
+ "nkro": true,
+ "oled": true,
+ "rgb_matrix": true,
+ "magic": false,
+ "grave_esc": false,
+ "space_cadet": false
+ },
+ "rgb_matrix": {
+ "animations": {
+ "gradient_left_right": true,
+ "cycle_pinwheel": true
+ },
+ "default": {
+ "animation": "cycle_pinwheel"
+ },
+ "driver": "ws2812",
+ "max_brightness": 150,
+ "sat_steps": 8,
+ "val_steps": 8,
+ "speed_steps": 10,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B2", "B3"],
+ "rows": ["D4", "D6", "D7", "B4", "B5"]
+ },
+ "ws2812": {
+ "pin": "F7"
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "C6", "pin_b": "B6", "resolution": 2}
+ ]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_ortho_5x4": {
+ "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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk
index 31fabc928ca..cc588202788 100644
--- a/keyboards/ungodly/launch_pad/rules.mk
+++ b/keyboards/ungodly/launch_pad/rules.mk
@@ -1,22 +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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-MIDI_ENABLE = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
-SPACE_CADET_ENABLE = no
-MAGIC_ENABLE = no
-GRAVE_ESC_ENABLE = no
-LTO_ENABLE = yes
-
ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json
index f92299e9fa4..98138b87dd7 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json
@@ -5,7 +5,10 @@
"usb": {
"vid": "0x16C0",
"pid": "0x27DB",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json
deleted file mode 100644
index 13615db22d4..00000000000
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "keyboard_name": "Unicomp Classic / Ultra Classic / New M (post-2013)",
- "manufacturer": "Unicomp/Purdea Andrei",
- "maintainer": "purdeaandrei",
- "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
- "indicators": {
- "caps_lock": "C11",
- "num_lock": "C12",
- "scroll_lock": "C10"
- },
- "processor": "STM32F446",
- "bootloader": "stm32-dfu",
- "diode_direction": "ROW2COL",
- "matrix_pins": {
- // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
- // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
- "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
- "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
- }
-}
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..0ef2cc4d5ed
--- /dev/null
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,27 @@
+{
+ "keyboard_name": "Unicomp Classic / Ultra Classic / New M (post-2013)",
+ "manufacturer": "Unicomp/Purdea Andrei",
+ "maintainer": "purdeaandrei",
+ "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "haptic": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "indicators": {
+ "caps_lock": "C11",
+ "num_lock": "C12",
+ "scroll_lock": "C10"
+ },
+ "processor": "STM32F446",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "ROW2COL",
+ "matrix_pins": {
+ // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+ // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+ "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+ "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+ }
+}
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# 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
-ENCODER_ENABLE = no # Enable rotary encoder support
-AUDIO_ENABLE = no # Audio output
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
index a8dcd9418fb..3072222ea6e 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
@@ -5,7 +5,10 @@
"usb": {
"vid": "0x16C0",
"pid": "0x27DB",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"community_layouts": ["fullsize_ansi", "fullsize_iso"],
"layouts": {
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json
deleted file mode 100644
index 1c2f5b300bd..00000000000
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "keyboard_name": "Unicomp Classic / Ultra Classic (pre-2013)",
- "manufacturer": "Unicomp/Purdea Andrei",
- "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
- "maintainer": "purdeaandrei",
- "indicators": {
- "caps_lock": "C11",
- "num_lock": "C12",
- "scroll_lock": "C10"
- },
- "processor": "STM32F446", // RET6
- "bootloader": "stm32-dfu",
- "diode_direction": "ROW2COL",
- "matrix_pins": {
- // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
- // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
- "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
- "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
- }
-}
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..30264dd537d
--- /dev/null
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,27 @@
+{
+ "keyboard_name": "Unicomp Classic / Ultra Classic (pre-2013)",
+ "manufacturer": "Unicomp/Purdea Andrei",
+ "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+ "maintainer": "purdeaandrei",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "haptic": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "indicators": {
+ "caps_lock": "C11",
+ "num_lock": "C12",
+ "scroll_lock": "C10"
+ },
+ "processor": "STM32F446", // RET6
+ "bootloader": "stm32-dfu",
+ "diode_direction": "ROW2COL",
+ "matrix_pins": {
+ // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+ // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+ "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+ "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+ }
+}
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# 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
-ENCODER_ENABLE = no # Enable rotary encoder support
-AUDIO_ENABLE = no # Audio output
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json
index 162495c25b8..0847f665043 100644
--- a/keyboards/unicomp/pc122/info.json
+++ b/keyboards/unicomp/pc122/info.json
@@ -5,7 +5,10 @@
"usb": {
"vid": "0x16C0",
"pid": "0x27DB",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/info.json b/keyboards/unicomp/pc122/overnumpad_1xb/info.json
deleted file mode 100644
index 16e39168231..00000000000
--- a/keyboards/unicomp/pc122/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "keyboard_name": "Unicomp PC122",
- "manufacturer": "Unicomp/Purdea Andrei",
- "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
- "maintainer": "purdeaandrei",
- "indicators": {
- "caps_lock": "C11",
- "num_lock": "C12",
- "scroll_lock": "C10"
- },
- "processor": "STM32F446", // RET6
- "bootloader": "stm32-dfu",
- "diode_direction": "ROW2COL",
- "matrix_pins": {
- // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
- // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
- "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
- "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
- }
-}
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..936e286af1d
--- /dev/null
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json
@@ -0,0 +1,27 @@
+{
+ "keyboard_name": "Unicomp PC122",
+ "manufacturer": "Unicomp/Purdea Andrei",
+ "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+ "maintainer": "purdeaandrei",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "haptic": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "indicators": {
+ "caps_lock": "C11",
+ "num_lock": "C12",
+ "scroll_lock": "C10"
+ },
+ "processor": "STM32F446", // RET6
+ "bootloader": "stm32-dfu",
+ "diode_direction": "ROW2COL",
+ "matrix_pins": {
+ // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+ // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+ "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+ "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+ }
+}
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# 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
-ENCODER_ENABLE = no # Enable rotary encoder support
-AUDIO_ENABLE = no # Audio output
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json
index 52eb4d80368..f5d783b1265 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json
@@ -5,7 +5,10 @@
"usb": {
"vid": "0x16C0",
"pid": "0x27DB",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json
deleted file mode 100644
index cf25addc9e2..00000000000
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "keyboard_name": "Unicomp Spacesaver M (post-2013)",
- "manufacturer": "Unicomp/Purdea Andrei",
- "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
- "maintainer": "purdeaandrei",
- "indicators": {
- "caps_lock": "C12"
- },
- "processor": "STM32F446", // RET6
- "bootloader": "stm32-dfu",
- "diode_direction": "ROW2COL",
- "matrix_pins": {
- // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
- // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
- "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
- "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
- }
-}
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..9fd91ce48fc
--- /dev/null
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,25 @@
+{
+ "keyboard_name": "Unicomp Spacesaver M (post-2013)",
+ "manufacturer": "Unicomp/Purdea Andrei",
+ "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+ "maintainer": "purdeaandrei",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "haptic": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "indicators": {
+ "caps_lock": "C12"
+ },
+ "processor": "STM32F446", // RET6
+ "bootloader": "stm32-dfu",
+ "diode_direction": "ROW2COL",
+ "matrix_pins": {
+ // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+ // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+ "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+ "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+ }
+}
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# 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
-ENCODER_ENABLE = no # Enable rotary encoder support
-AUDIO_ENABLE = no # Audio output
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
index 166baaca416..6ac69a66aab 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
@@ -5,7 +5,10 @@
"usb": {
"vid": "0x16C0",
"pid": "0x27DB",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"layouts": {
"LAYOUT_all": {
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json
deleted file mode 100644
index 31fc97a527f..00000000000
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "keyboard_name": "Unicomp Spacesaver M (pre-2013)",
- "manufacturer": "Unicomp/Purdea Andrei",
- "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
- "maintainer": "purdeaandrei",
- "indicators": {
- "caps_lock": "C12"
- },
- "processor": "STM32F446", // RET6
- "bootloader": "stm32-dfu",
- "diode_direction": "ROW2COL",
- "matrix_pins": {
- // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
- // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
- "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
- "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
- }
-}
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
new file mode 100644
index 00000000000..db772e46e24
--- /dev/null
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json
@@ -0,0 +1,25 @@
+{
+ "keyboard_name": "Unicomp Spacesaver M (pre-2013)",
+ "manufacturer": "Unicomp/Purdea Andrei",
+ "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
+ "maintainer": "purdeaandrei",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "haptic": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "indicators": {
+ "caps_lock": "C12"
+ },
+ "processor": "STM32F446", // RET6
+ "bootloader": "stm32-dfu",
+ "diode_direction": "ROW2COL",
+ "matrix_pins": {
+ // The controller to membrane interface has pads left-to-right, as seen on the keyboard, matching
+ // the order listed below: all columns followed by all rows, (also followed by unused gpio "A10"):
+ "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B10", "B12", "B13"],
+ "rows": ["B14", "B15", "C6", "C7", "C8", "C9", "A8", "A9"]
+ }
+}
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
index 9131708828a..a521203b326 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk
@@ -1,17 +1 @@
-# 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
-ENCODER_ENABLE = no # Enable rotary encoder support
-AUDIO_ENABLE = no # Audio output
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
deleted file mode 100644
index cf7067f629c..00000000000
--- a/keyboards/unikeyboard/diverge3/info.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
- "keyboard_name": "Diverge3",
- "manufacturer": "UniKeyboard",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x1257",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D4", "D7", "E6", "B4", "B5"]
- },
- "diode_direction": "ROW2COL",
- "backlight": {
- "pin": "C6",
- "levels": 5,
- "breathing": true
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0.75},
- {"matrix": [0, 2], "x": 2, "y": 0.25},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0.25},
- {"matrix": [0, 6], "x": 6, "y": 0.5},
-
- {"matrix": [5, 6], "x": 10, "y": 0.5},
- {"matrix": [5, 5], "x": 11, "y": 0.25},
- {"matrix": [5, 4], "x": 12, "y": 0},
- {"matrix": [5, 3], "x": 13, "y": 0},
- {"matrix": [5, 2], "x": 14, "y": 0.25},
- {"matrix": [5, 1], "x": 15, "y": 0.75},
- {"matrix": [5, 0], "x": 16, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1.75},
- {"matrix": [1, 2], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1.25},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
-
- {"matrix": [6, 6], "x": 10, "y": 1.5},
- {"matrix": [6, 5], "x": 11, "y": 1.25},
- {"matrix": [6, 4], "x": 12, "y": 1},
- {"matrix": [6, 3], "x": 13, "y": 1},
- {"matrix": [6, 2], "x": 14, "y": 1.25},
- {"matrix": [6, 1], "x": 15, "y": 1.75},
- {"matrix": [6, 0], "x": 16, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1, "y": 2.75},
- {"matrix": [2, 2], "x": 2, "y": 2.25},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 4], "x": 4, "y": 2},
- {"matrix": [2, 5], "x": 5, "y": 2.25},
- {"matrix": [2, 6], "x": 6, "y": 2.5},
-
- {"matrix": [7, 6], "x": 10, "y": 2.5},
- {"matrix": [7, 5], "x": 11, "y": 2.25},
- {"matrix": [7, 4], "x": 12, "y": 2},
- {"matrix": [7, 3], "x": 13, "y": 2},
- {"matrix": [7, 2], "x": 14, "y": 2.25},
- {"matrix": [7, 1], "x": 15, "y": 2.75},
- {"matrix": [7, 0], "x": 16, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3.75},
- {"matrix": [3, 2], "x": 2, "y": 3.25},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 5], "x": 5, "y": 3.25},
- {"matrix": [3, 6], "x": 6, "y": 3.5},
-
- {"matrix": [8, 6], "x": 10, "y": 3.5},
- {"matrix": [8, 5], "x": 11, "y": 3.25},
- {"matrix": [8, 4], "x": 12, "y": 3},
- {"matrix": [8, 3], "x": 13, "y": 3},
- {"matrix": [8, 2], "x": 14, "y": 3.25},
- {"matrix": [8, 1], "x": 15, "y": 3.75},
- {"matrix": [8, 0], "x": 16, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4.75},
- {"matrix": [4, 2], "x": 2, "y": 4.25},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4.75, "h": 1.25},
- {"matrix": [4, 6], "x": 6, "y": 5, "h": 1.25},
- {"matrix": [4, 7], "x": 7, "y": 5.25},
-
- {"matrix": [9, 7], "x": 9, "y": 5.25},
- {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.25},
- {"matrix": [9, 5], "x": 11, "y": 4.75, "h": 1.25},
- {"matrix": [9, 4], "x": 12, "y": 4},
- {"matrix": [9, 3], "x": 13, "y": 4},
- {"matrix": [9, 2], "x": 14, "y": 4.25},
- {"matrix": [9, 1], "x": 15, "y": 4.75},
- {"matrix": [9, 0], "x": 16, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/unikeyboard/diverge3/keyboard.json b/keyboards/unikeyboard/diverge3/keyboard.json
new file mode 100644
index 00000000000..a6dd684be6d
--- /dev/null
+++ b/keyboards/unikeyboard/diverge3/keyboard.json
@@ -0,0 +1,123 @@
+{
+ "keyboard_name": "Diverge3",
+ "manufacturer": "UniKeyboard",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1257",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
+ "backlight": {
+ "pin": "C6",
+ "levels": 5,
+ "breathing": true
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0.75},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+ {"matrix": [5, 6], "x": 10, "y": 0.5},
+ {"matrix": [5, 5], "x": 11, "y": 0.25},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 2], "x": 14, "y": 0.25},
+ {"matrix": [5, 1], "x": 15, "y": 0.75},
+ {"matrix": [5, 0], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1.75},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+ {"matrix": [6, 6], "x": 10, "y": 1.5},
+ {"matrix": [6, 5], "x": 11, "y": 1.25},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 2], "x": 14, "y": 1.25},
+ {"matrix": [6, 1], "x": 15, "y": 1.75},
+ {"matrix": [6, 0], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.5},
+
+ {"matrix": [7, 6], "x": 10, "y": 2.5},
+ {"matrix": [7, 5], "x": 11, "y": 2.25},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 2], "x": 14, "y": 2.25},
+ {"matrix": [7, 1], "x": 15, "y": 2.75},
+ {"matrix": [7, 0], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3.75},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 3.5},
+
+ {"matrix": [8, 6], "x": 10, "y": 3.5},
+ {"matrix": [8, 5], "x": 11, "y": 3.25},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 2], "x": 14, "y": 3.25},
+ {"matrix": [8, 1], "x": 15, "y": 3.75},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4.75},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4.75, "h": 1.25},
+ {"matrix": [4, 6], "x": 6, "y": 5, "h": 1.25},
+ {"matrix": [4, 7], "x": 7, "y": 5.25},
+
+ {"matrix": [9, 7], "x": 9, "y": 5.25},
+ {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.25},
+ {"matrix": [9, 5], "x": 11, "y": 4.75, "h": 1.25},
+ {"matrix": [9, 4], "x": 12, "y": 4},
+ {"matrix": [9, 3], "x": 13, "y": 4},
+ {"matrix": [9, 2], "x": 14, "y": 4.25},
+ {"matrix": [9, 1], "x": 15, "y": 4.75},
+ {"matrix": [9, 0], "x": 16, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/unikeyboard/diverge3/rules.mk b/keyboards/unikeyboard/diverge3/rules.mk
deleted file mode 100644
index 40695440183..00000000000
--- a/keyboards/unikeyboard/diverge3/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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
deleted file mode 100644
index 9533371de12..00000000000
--- a/keyboards/unikeyboard/divergetm2/info.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
- "keyboard_name": "Diverge TM 2",
- "manufacturer": "UniKeyboard",
- "url": "",
- "maintainer": "islandman93, xton",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x1256",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D7", "E6", "B4", "B5"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "soft_serial_pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layout_aliases": {
- "LAYOUT_ortho_4x12_2x2u": "LAYOUT"
- },
- "layouts": {
- "LAYOUT": {
- "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": [4, 5], "x": 7, "y": 0},
- {"matrix": [4, 4], "x": 8, "y": 0},
- {"matrix": [4, 3], "x": 9, "y": 0},
- {"matrix": [4, 2], "x": 10, "y": 0},
- {"matrix": [4, 1], "x": 11, "y": 0},
- {"matrix": [4, 0], "x": 12, "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": [5, 5], "x": 7, "y": 1},
- {"matrix": [5, 4], "x": 8, "y": 1},
- {"matrix": [5, 3], "x": 9, "y": 1},
- {"matrix": [5, 2], "x": 10, "y": 1},
- {"matrix": [5, 1], "x": 11, "y": 1},
- {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2},
- {"matrix": [6, 4], "x": 8, "y": 2},
- {"matrix": [6, 3], "x": 9, "y": 2},
- {"matrix": [6, 2], "x": 10, "y": 2},
- {"matrix": [6, 1], "x": 11, "y": 2},
- {"matrix": [6, 0], "x": 12, "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": [7, 4], "x": 7, "y": 3, "w": 2},
- {"matrix": [7, 3], "x": 9, "y": 3},
- {"matrix": [7, 2], "x": 10, "y": 3},
- {"matrix": [7, 1], "x": 11, "y": 3},
- {"matrix": [7, 0], "x": 12, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/unikeyboard/divergetm2/keyboard.json b/keyboards/unikeyboard/divergetm2/keyboard.json
new file mode 100644
index 00000000000..3c1420c39ad
--- /dev/null
+++ b/keyboards/unikeyboard/divergetm2/keyboard.json
@@ -0,0 +1,92 @@
+{
+ "keyboard_name": "Diverge TM 2",
+ "manufacturer": "UniKeyboard",
+ "url": "",
+ "maintainer": "islandman93, xton",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1256",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT_ortho_4x12_2x2u": "LAYOUT"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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": [4, 5], "x": 7, "y": 0},
+ {"matrix": [4, 4], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [4, 0], "x": 12, "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": [5, 5], "x": 7, "y": 1},
+ {"matrix": [5, 4], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1},
+ {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2},
+ {"matrix": [6, 4], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2},
+ {"matrix": [6, 0], "x": 12, "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": [7, 4], "x": 7, "y": 3, "w": 2},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 0], "x": 12, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/unikeyboard/divergetm2/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk
deleted file mode 100644
index 7f1fc659ccb..00000000000
--- a/keyboards/unikeyboard/divergetm2/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json
deleted file mode 100644
index 7b182df2515..00000000000
--- a/keyboards/unison/v04/info.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
- "keyboard_name": "Unison",
- "manufacturer": "jpskenn",
- "url": "https://github.com/jpskenn/Unison",
- "maintainer": "jpskenn",
- "usb": {
- "vid": "0xB9DD",
- "pid": "0x176A",
- "device_version": "0.4.0"
- },
- "matrix_pins": {
- "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
- "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
- },
- "rgblight": {
- "hue_steps": 4,
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 7,
- "led_map": [1, 2, 0, 3, 4, 5, 6],
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "pin": "B7"
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B0", "pin_b": "B1"},
- {"pin_a": "D2", "pin_b": "D3"},
- {"pin_a": "D5", "pin_b": "D4"},
- {"pin_a": "D6", "pin_b": "D7"},
- {"pin_a": "B4", "pin_b": "B5"}
- ]
- },
- "bootmagic": {
- "matrix": [5, 0]
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [5, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [5, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [5, 2], "x": 4, "y": 0},
- {"matrix": [0, 3], "x": 5, "y": 0},
- {"matrix": [5, 3], "x": 6, "y": 0},
- {"matrix": [0, 4], "x": 7, "y": 0},
- {"matrix": [5, 4], "x": 8, "y": 0},
- {"matrix": [0, 5], "x": 9, "y": 0},
- {"matrix": [5, 6], "x": 10, "y": 0},
- {"matrix": [0, 6], "x": 11, "y": 0},
- {"matrix": [5, 7], "x": 12, "y": 0},
- {"matrix": [0, 7], "x": 13, "y": 0},
- {"matrix": [5, 8], "x": 14, "y": 0},
- {"matrix": [0, 8], "x": 15, "y": 0},
- {"matrix": [5, 9], "x": 16, "y": 0},
-
- {"matrix": [6, 0], "x": 0, "y": 1},
- {"matrix": [1, 0], "x": 1, "y": 1},
- {"matrix": [6, 1], "x": 2, "y": 1},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [6, 2], "x": 4, "y": 1, "w": 1.5},
- {"matrix": [1, 3], "x": 5.5, "y": 1},
- {"matrix": [6, 3], "x": 6.5, "y": 1},
- {"matrix": [1, 4], "x": 7.5, "y": 1},
- {"matrix": [6, 4], "x": 8.5, "y": 1},
- {"matrix": [1, 5], "x": 9.5, "y": 1},
- {"matrix": [6, 5], "x": 10.5, "y": 1},
- {"matrix": [1, 6], "x": 11.5, "y": 1},
- {"matrix": [6, 7], "x": 12.5, "y": 1},
- {"matrix": [1, 7], "x": 13.5, "y": 1},
- {"matrix": [6, 8], "x": 14.5, "y": 1},
- {"matrix": [6, 9], "x": 15.5, "y": 1, "w": 1.5},
-
- {"matrix": [7, 0], "x": 0, "y": 2},
- {"matrix": [2, 0], "x": 1, "y": 2},
- {"matrix": [7, 1], "x": 2, "y": 2},
- {"matrix": [2, 1], "x": 3, "y": 2},
- {"matrix": [7, 2], "x": 4, "y": 2, "w": 1.5},
- {"matrix": [2, 3], "x": 5.5, "y": 2},
- {"matrix": [7, 3], "x": 6.5, "y": 2},
- {"matrix": [2, 4], "x": 7.5, "y": 2},
- {"matrix": [7, 4], "x": 8.5, "y": 2},
- {"matrix": [2, 5], "x": 9.5, "y": 2},
- {"matrix": [7, 5], "x": 10.5, "y": 2},
- {"matrix": [2, 6], "x": 11.5, "y": 2},
- {"matrix": [7, 6], "x": 12.5, "y": 2},
- {"matrix": [2, 7], "x": 13.5, "y": 2},
- {"matrix": [7, 8], "x": 14.5, "y": 2},
- {"matrix": [7, 9], "x": 15.5, "y": 2, "w": 1.5},
-
- {"matrix": [8, 0], "x": 0, "y": 3},
- {"matrix": [3, 0], "x": 1, "y": 3},
- {"matrix": [8, 1], "x": 2, "y": 3},
- {"matrix": [3, 1], "x": 3, "y": 3},
- {"matrix": [8, 2], "x": 4, "y": 3},
- {"matrix": [3, 2], "x": 5, "y": 3},
- {"matrix": [8, 3], "x": 6, "y": 3},
- {"matrix": [3, 4], "x": 7, "y": 3},
- {"matrix": [8, 4], "x": 8, "y": 3},
- {"matrix": [3, 5], "x": 9, "y": 3},
- {"matrix": [8, 5], "x": 10, "y": 3},
- {"matrix": [3, 6], "x": 11, "y": 3},
- {"matrix": [8, 6], "x": 12, "y": 3},
- {"matrix": [3, 7], "x": 13, "y": 3},
- {"matrix": [8, 7], "x": 14, "y": 3},
- {"matrix": [3, 8], "x": 15, "y": 3},
- {"matrix": [8, 9], "x": 16, "y": 3},
-
- {"matrix": [9, 0], "x": 0, "y": 4},
- {"matrix": [4, 0], "x": 1, "y": 4},
- {"matrix": [9, 1], "x": 2, "y": 4},
- {"matrix": [4, 1], "x": 3, "y": 4},
- {"matrix": [9, 2], "x": 4, "y": 4},
- {"matrix": [4, 2], "x": 5, "y": 4},
- {"matrix": [9, 3], "x": 6, "y": 4},
- {"matrix": [4, 3], "x": 7, "y": 4},
- {"matrix": [9, 4], "x": 8, "y": 4},
- {"matrix": [4, 5], "x": 9, "y": 4},
- {"matrix": [9, 5], "x": 10, "y": 4},
- {"matrix": [4, 6], "x": 11, "y": 4},
- {"matrix": [9, 6], "x": 12, "y": 4},
- {"matrix": [4, 7], "x": 13, "y": 4},
- {"matrix": [9, 7], "x": 14, "y": 4},
- {"matrix": [4, 8], "x": 15, "y": 4},
- {"matrix": [9, 8], "x": 16, "y": 4}
- ]
- },
- "LAYOUT_music": {
- "layout": [
- {"matrix": [5, 1], "x": 2, "y": 0},
- {"matrix": [5, 2], "x": 4, "y": 0},
- {"matrix": [0, 3], "x": 5, "y": 0},
- {"matrix": [5, 3], "x": 6, "y": 0},
- {"matrix": [0, 4], "x": 7, "y": 0},
- {"matrix": [0, 5], "x": 9, "y": 0},
- {"matrix": [0, 6], "x": 11, "y": 0},
- {"matrix": [0, 7], "x": 13, "y": 0},
- {"matrix": [0, 8], "x": 15, "y": 0},
-
- {"matrix": [6, 0], "x": 0, "y": 1.25},
- {"matrix": [1, 0], "x": 1, "y": 1.25},
- {"matrix": [6, 1], "x": 2, "y": 1.25},
- {"matrix": [1, 2], "x": 3, "y": 1.25},
- {"matrix": [6, 2], "x": 4, "y": 1.25, "w": 1.5},
- {"matrix": [1, 3], "x": 5.5, "y": 1.25},
- {"matrix": [6, 3], "x": 6.5, "y": 1.25},
- {"matrix": [1, 4], "x": 7.5, "y": 1.25},
- {"matrix": [6, 4], "x": 8.5, "y": 1.25},
- {"matrix": [1, 5], "x": 9.5, "y": 1.25},
- {"matrix": [6, 5], "x": 10.5, "y": 1.25},
- {"matrix": [1, 6], "x": 11.5, "y": 1.25},
- {"matrix": [6, 7], "x": 12.5, "y": 1.25},
- {"matrix": [1, 7], "x": 13.5, "y": 1.25},
- {"matrix": [6, 8], "x": 14.5, "y": 1.25},
- {"matrix": [6, 9], "x": 15.5, "y": 1.25, "w": 1.5},
-
- {"matrix": [7, 0], "x": 0, "y": 2.25},
- {"matrix": [2, 0], "x": 1, "y": 2.25},
- {"matrix": [7, 1], "x": 2, "y": 2.25},
- {"matrix": [2, 1], "x": 3, "y": 2.25},
- {"matrix": [7, 2], "x": 4, "y": 2.25, "w": 1.5},
- {"matrix": [2, 3], "x": 5.5, "y": 2.25},
- {"matrix": [7, 3], "x": 6.5, "y": 2.25},
- {"matrix": [2, 4], "x": 7.5, "y": 2.25},
- {"matrix": [7, 4], "x": 8.5, "y": 2.25},
- {"matrix": [2, 5], "x": 9.5, "y": 2.25},
- {"matrix": [7, 5], "x": 10.5, "y": 2.25},
- {"matrix": [2, 6], "x": 11.5, "y": 2.25},
- {"matrix": [7, 6], "x": 12.5, "y": 2.25},
- {"matrix": [2, 7], "x": 13.5, "y": 2.25},
- {"matrix": [7, 8], "x": 14.5, "y": 2.25},
- {"matrix": [7, 9], "x": 15.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [8, 0], "x": 0, "y": 3.25},
- {"matrix": [3, 0], "x": 1, "y": 3.25},
- {"matrix": [8, 1], "x": 2, "y": 3.25},
- {"matrix": [3, 1], "x": 3, "y": 3.25},
- {"matrix": [8, 2], "x": 4, "y": 3.25},
- {"matrix": [3, 2], "x": 5, "y": 3.25},
- {"matrix": [8, 3], "x": 6, "y": 3.25},
- {"matrix": [3, 4], "x": 7, "y": 3.25},
- {"matrix": [8, 4], "x": 8, "y": 3.25},
- {"matrix": [3, 5], "x": 9, "y": 3.25},
- {"matrix": [8, 5], "x": 10, "y": 3.25},
- {"matrix": [3, 6], "x": 11, "y": 3.25},
- {"matrix": [8, 6], "x": 12, "y": 3.25},
- {"matrix": [3, 7], "x": 13, "y": 3.25},
- {"matrix": [8, 7], "x": 14, "y": 3.25},
- {"matrix": [3, 8], "x": 15, "y": 3.25},
- {"matrix": [8, 9], "x": 16, "y": 3.25},
-
- {"matrix": [9, 0], "x": 0, "y": 4.25},
- {"matrix": [4, 0], "x": 1, "y": 4.25},
- {"matrix": [9, 1], "x": 2, "y": 4.25},
- {"matrix": [4, 1], "x": 3, "y": 4.25},
- {"matrix": [9, 2], "x": 4, "y": 4.25},
- {"matrix": [4, 2], "x": 5, "y": 4.25},
- {"matrix": [9, 3], "x": 6, "y": 4.25},
- {"matrix": [4, 3], "x": 7, "y": 4.25},
- {"matrix": [9, 4], "x": 8, "y": 4.25},
- {"matrix": [4, 5], "x": 9, "y": 4.25},
- {"matrix": [9, 5], "x": 10, "y": 4.25},
- {"matrix": [4, 6], "x": 11, "y": 4.25},
- {"matrix": [9, 6], "x": 12, "y": 4.25},
- {"matrix": [4, 7], "x": 13, "y": 4.25},
- {"matrix": [9, 7], "x": 14, "y": 4.25},
- {"matrix": [4, 8], "x": 15, "y": 4.25},
- {"matrix": [9, 8], "x": 16, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/unison/v04/keyboard.json b/keyboards/unison/v04/keyboard.json
new file mode 100644
index 00000000000..14f495aa2ca
--- /dev/null
+++ b/keyboards/unison/v04/keyboard.json
@@ -0,0 +1,233 @@
+{
+ "keyboard_name": "Unison",
+ "manufacturer": "jpskenn",
+ "url": "https://github.com/jpskenn/Unison",
+ "maintainer": "jpskenn",
+ "usb": {
+ "vid": "0xB9DD",
+ "pid": "0x176A",
+ "device_version": "0.4.0"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "encoder": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"],
+ "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"]
+ },
+ "rgblight": {
+ "hue_steps": 4,
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 7,
+ "led_map": [1, 2, 0, 3, 4, 5, 6],
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "pin": "B7"
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B0", "pin_b": "B1"},
+ {"pin_a": "D2", "pin_b": "D3"},
+ {"pin_a": "D5", "pin_b": "D4"},
+ {"pin_a": "D6", "pin_b": "D7"},
+ {"pin_a": "B4", "pin_b": "B5"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [5, 0]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [5, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [5, 2], "x": 4, "y": 0},
+ {"matrix": [0, 3], "x": 5, "y": 0},
+ {"matrix": [5, 3], "x": 6, "y": 0},
+ {"matrix": [0, 4], "x": 7, "y": 0},
+ {"matrix": [5, 4], "x": 8, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [5, 6], "x": 10, "y": 0},
+ {"matrix": [0, 6], "x": 11, "y": 0},
+ {"matrix": [5, 7], "x": 12, "y": 0},
+ {"matrix": [0, 7], "x": 13, "y": 0},
+ {"matrix": [5, 8], "x": 14, "y": 0},
+ {"matrix": [0, 8], "x": 15, "y": 0},
+ {"matrix": [5, 9], "x": 16, "y": 0},
+
+ {"matrix": [6, 0], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [6, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [6, 2], "x": 4, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 5.5, "y": 1},
+ {"matrix": [6, 3], "x": 6.5, "y": 1},
+ {"matrix": [1, 4], "x": 7.5, "y": 1},
+ {"matrix": [6, 4], "x": 8.5, "y": 1},
+ {"matrix": [1, 5], "x": 9.5, "y": 1},
+ {"matrix": [6, 5], "x": 10.5, "y": 1},
+ {"matrix": [1, 6], "x": 11.5, "y": 1},
+ {"matrix": [6, 7], "x": 12.5, "y": 1},
+ {"matrix": [1, 7], "x": 13.5, "y": 1},
+ {"matrix": [6, 8], "x": 14.5, "y": 1},
+ {"matrix": [6, 9], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [7, 0], "x": 0, "y": 2},
+ {"matrix": [2, 0], "x": 1, "y": 2},
+ {"matrix": [7, 1], "x": 2, "y": 2},
+ {"matrix": [2, 1], "x": 3, "y": 2},
+ {"matrix": [7, 2], "x": 4, "y": 2, "w": 1.5},
+ {"matrix": [2, 3], "x": 5.5, "y": 2},
+ {"matrix": [7, 3], "x": 6.5, "y": 2},
+ {"matrix": [2, 4], "x": 7.5, "y": 2},
+ {"matrix": [7, 4], "x": 8.5, "y": 2},
+ {"matrix": [2, 5], "x": 9.5, "y": 2},
+ {"matrix": [7, 5], "x": 10.5, "y": 2},
+ {"matrix": [2, 6], "x": 11.5, "y": 2},
+ {"matrix": [7, 6], "x": 12.5, "y": 2},
+ {"matrix": [2, 7], "x": 13.5, "y": 2},
+ {"matrix": [7, 8], "x": 14.5, "y": 2},
+ {"matrix": [7, 9], "x": 15.5, "y": 2, "w": 1.5},
+
+ {"matrix": [8, 0], "x": 0, "y": 3},
+ {"matrix": [3, 0], "x": 1, "y": 3},
+ {"matrix": [8, 1], "x": 2, "y": 3},
+ {"matrix": [3, 1], "x": 3, "y": 3},
+ {"matrix": [8, 2], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [8, 3], "x": 6, "y": 3},
+ {"matrix": [3, 4], "x": 7, "y": 3},
+ {"matrix": [8, 4], "x": 8, "y": 3},
+ {"matrix": [3, 5], "x": 9, "y": 3},
+ {"matrix": [8, 5], "x": 10, "y": 3},
+ {"matrix": [3, 6], "x": 11, "y": 3},
+ {"matrix": [8, 6], "x": 12, "y": 3},
+ {"matrix": [3, 7], "x": 13, "y": 3},
+ {"matrix": [8, 7], "x": 14, "y": 3},
+ {"matrix": [3, 8], "x": 15, "y": 3},
+ {"matrix": [8, 9], "x": 16, "y": 3},
+
+ {"matrix": [9, 0], "x": 0, "y": 4},
+ {"matrix": [4, 0], "x": 1, "y": 4},
+ {"matrix": [9, 1], "x": 2, "y": 4},
+ {"matrix": [4, 1], "x": 3, "y": 4},
+ {"matrix": [9, 2], "x": 4, "y": 4},
+ {"matrix": [4, 2], "x": 5, "y": 4},
+ {"matrix": [9, 3], "x": 6, "y": 4},
+ {"matrix": [4, 3], "x": 7, "y": 4},
+ {"matrix": [9, 4], "x": 8, "y": 4},
+ {"matrix": [4, 5], "x": 9, "y": 4},
+ {"matrix": [9, 5], "x": 10, "y": 4},
+ {"matrix": [4, 6], "x": 11, "y": 4},
+ {"matrix": [9, 6], "x": 12, "y": 4},
+ {"matrix": [4, 7], "x": 13, "y": 4},
+ {"matrix": [9, 7], "x": 14, "y": 4},
+ {"matrix": [4, 8], "x": 15, "y": 4},
+ {"matrix": [9, 8], "x": 16, "y": 4}
+ ]
+ },
+ "LAYOUT_music": {
+ "layout": [
+ {"matrix": [5, 1], "x": 2, "y": 0},
+ {"matrix": [5, 2], "x": 4, "y": 0},
+ {"matrix": [0, 3], "x": 5, "y": 0},
+ {"matrix": [5, 3], "x": 6, "y": 0},
+ {"matrix": [0, 4], "x": 7, "y": 0},
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 11, "y": 0},
+ {"matrix": [0, 7], "x": 13, "y": 0},
+ {"matrix": [0, 8], "x": 15, "y": 0},
+
+ {"matrix": [6, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 0], "x": 1, "y": 1.25},
+ {"matrix": [6, 1], "x": 2, "y": 1.25},
+ {"matrix": [1, 2], "x": 3, "y": 1.25},
+ {"matrix": [6, 2], "x": 4, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 5.5, "y": 1.25},
+ {"matrix": [6, 3], "x": 6.5, "y": 1.25},
+ {"matrix": [1, 4], "x": 7.5, "y": 1.25},
+ {"matrix": [6, 4], "x": 8.5, "y": 1.25},
+ {"matrix": [1, 5], "x": 9.5, "y": 1.25},
+ {"matrix": [6, 5], "x": 10.5, "y": 1.25},
+ {"matrix": [1, 6], "x": 11.5, "y": 1.25},
+ {"matrix": [6, 7], "x": 12.5, "y": 1.25},
+ {"matrix": [1, 7], "x": 13.5, "y": 1.25},
+ {"matrix": [6, 8], "x": 14.5, "y": 1.25},
+ {"matrix": [6, 9], "x": 15.5, "y": 1.25, "w": 1.5},
+
+ {"matrix": [7, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 0], "x": 1, "y": 2.25},
+ {"matrix": [7, 1], "x": 2, "y": 2.25},
+ {"matrix": [2, 1], "x": 3, "y": 2.25},
+ {"matrix": [7, 2], "x": 4, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 3], "x": 5.5, "y": 2.25},
+ {"matrix": [7, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 7.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 9.5, "y": 2.25},
+ {"matrix": [7, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 11.5, "y": 2.25},
+ {"matrix": [7, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 13.5, "y": 2.25},
+ {"matrix": [7, 8], "x": 14.5, "y": 2.25},
+ {"matrix": [7, 9], "x": 15.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [8, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 0], "x": 1, "y": 3.25},
+ {"matrix": [8, 1], "x": 2, "y": 3.25},
+ {"matrix": [3, 1], "x": 3, "y": 3.25},
+ {"matrix": [8, 2], "x": 4, "y": 3.25},
+ {"matrix": [3, 2], "x": 5, "y": 3.25},
+ {"matrix": [8, 3], "x": 6, "y": 3.25},
+ {"matrix": [3, 4], "x": 7, "y": 3.25},
+ {"matrix": [8, 4], "x": 8, "y": 3.25},
+ {"matrix": [3, 5], "x": 9, "y": 3.25},
+ {"matrix": [8, 5], "x": 10, "y": 3.25},
+ {"matrix": [3, 6], "x": 11, "y": 3.25},
+ {"matrix": [8, 6], "x": 12, "y": 3.25},
+ {"matrix": [3, 7], "x": 13, "y": 3.25},
+ {"matrix": [8, 7], "x": 14, "y": 3.25},
+ {"matrix": [3, 8], "x": 15, "y": 3.25},
+ {"matrix": [8, 9], "x": 16, "y": 3.25},
+
+ {"matrix": [9, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 0], "x": 1, "y": 4.25},
+ {"matrix": [9, 1], "x": 2, "y": 4.25},
+ {"matrix": [4, 1], "x": 3, "y": 4.25},
+ {"matrix": [9, 2], "x": 4, "y": 4.25},
+ {"matrix": [4, 2], "x": 5, "y": 4.25},
+ {"matrix": [9, 3], "x": 6, "y": 4.25},
+ {"matrix": [4, 3], "x": 7, "y": 4.25},
+ {"matrix": [9, 4], "x": 8, "y": 4.25},
+ {"matrix": [4, 5], "x": 9, "y": 4.25},
+ {"matrix": [9, 5], "x": 10, "y": 4.25},
+ {"matrix": [4, 6], "x": 11, "y": 4.25},
+ {"matrix": [9, 6], "x": 12, "y": 4.25},
+ {"matrix": [4, 7], "x": 13, "y": 4.25},
+ {"matrix": [9, 7], "x": 14, "y": 4.25},
+ {"matrix": [4, 8], "x": 15, "y": 4.25},
+ {"matrix": [9, 8], "x": 16, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/unison/v04/rules.mk b/keyboards/unison/v04/rules.mk
deleted file mode 100644
index b4fc6e0d29e..00000000000
--- a/keyboards/unison/v04/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no # Rotary Encoder
-
-LTO_ENABLE = yes
diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json
deleted file mode 100644
index 1354c6d93e6..00000000000
--- a/keyboards/uzu42/rev1/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
- "keyboard_name": "uzu42",
- "manufacturer": "nrtkbb",
- "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42",
- "maintainer": "nrtkbb",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
- "rows": ["D4", "C6", "D7", "E6"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D2"
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgblight": {
- "hue_steps": 10,
- "led_count": 54,
- "max_brightness": 120,
- "split_count": [27, 27],
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "twinkle": true
- }
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0.375, "y": 0},
- {"matrix": [0, 1], "x": 1.375, "y": 0},
- {"matrix": [0, 2], "x": 2.375, "y": 0},
- {"matrix": [0, 3], "x": 3.375, "y": 0.125},
- {"matrix": [0, 4], "x": 4.375, "y": 0.25},
-
- {"matrix": [4, 4], "x": 7.625, "y": 0.25},
- {"matrix": [4, 3], "x": 8.625, "y": 0.125},
- {"matrix": [4, 2], "x": 9.625, "y": 0},
- {"matrix": [4, 1], "x": 10.625, "y": 0},
- {"matrix": [4, 0], "x": 11.625, "y": 0},
-
- {"matrix": [1, 0], "x": 0.25, "y": 1},
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1.125},
- {"matrix": [1, 4], "x": 4.25, "y": 1.25},
-
- {"matrix": [5, 4], "x": 7.75, "y": 1.25},
- {"matrix": [5, 3], "x": 8.75, "y": 1.125},
- {"matrix": [5, 2], "x": 9.75, "y": 1},
- {"matrix": [5, 1], "x": 10.75, "y": 1},
- {"matrix": [5, 0], "x": 11.75, "y": 1},
-
- {"matrix": [2, 0], "x": 0.125, "y": 2},
- {"matrix": [2, 1], "x": 1.125, "y": 2},
- {"matrix": [2, 2], "x": 2.125, "y": 2},
- {"matrix": [2, 3], "x": 3.125, "y": 2.125},
- {"matrix": [2, 4], "x": 4.125, "y": 2.25},
-
- {"matrix": [6, 4], "x": 7.875, "y": 2.25},
- {"matrix": [6, 3], "x": 8.875, "y": 2.125},
- {"matrix": [6, 2], "x": 9.875, "y": 2},
- {"matrix": [6, 1], "x": 10.875, "y": 2},
- {"matrix": [6, 0], "x": 11.875, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
- {"matrix": [3, 1], "x": 1, "y": 3},
- {"matrix": [3, 2], "x": 2, "y": 3.05},
- {"matrix": [3, 3], "x": 3, "y": 3.18},
- {"matrix": [3, 4], "x": 4, "y": 3.3},
- {"matrix": [3, 5], "x": 5, "y": 3.43},
-
- {"matrix": [7, 5], "x": 7, "y": 3.43},
- {"matrix": [7, 4], "x": 8, "y": 3.3},
- {"matrix": [7, 3], "x": 9, "y": 3.18},
- {"matrix": [7, 2], "x": 10, "y": 3.05},
- {"matrix": [7, 1], "x": 11, "y": 3},
- {"matrix": [7, 0], "x": 12, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/uzu42/rev1/keyboard.json b/keyboards/uzu42/rev1/keyboard.json
new file mode 100644
index 00000000000..71d9f424cc8
--- /dev/null
+++ b/keyboards/uzu42/rev1/keyboard.json
@@ -0,0 +1,103 @@
+{
+ "keyboard_name": "uzu42",
+ "manufacturer": "nrtkbb",
+ "url": "https://github.com/nrtkbb/Keyboards/tree/master/uzu42",
+ "maintainer": "nrtkbb",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgblight": {
+ "hue_steps": 10,
+ "led_count": 54,
+ "max_brightness": 120,
+ "split_count": [27, 27],
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.375, "y": 0},
+ {"matrix": [0, 1], "x": 1.375, "y": 0},
+ {"matrix": [0, 2], "x": 2.375, "y": 0},
+ {"matrix": [0, 3], "x": 3.375, "y": 0.125},
+ {"matrix": [0, 4], "x": 4.375, "y": 0.25},
+
+ {"matrix": [4, 4], "x": 7.625, "y": 0.25},
+ {"matrix": [4, 3], "x": 8.625, "y": 0.125},
+ {"matrix": [4, 2], "x": 9.625, "y": 0},
+ {"matrix": [4, 1], "x": 10.625, "y": 0},
+ {"matrix": [4, 0], "x": 11.625, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1.125},
+ {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+
+ {"matrix": [5, 4], "x": 7.75, "y": 1.25},
+ {"matrix": [5, 3], "x": 8.75, "y": 1.125},
+ {"matrix": [5, 2], "x": 9.75, "y": 1},
+ {"matrix": [5, 1], "x": 10.75, "y": 1},
+ {"matrix": [5, 0], "x": 11.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.125, "y": 2},
+ {"matrix": [2, 1], "x": 1.125, "y": 2},
+ {"matrix": [2, 2], "x": 2.125, "y": 2},
+ {"matrix": [2, 3], "x": 3.125, "y": 2.125},
+ {"matrix": [2, 4], "x": 4.125, "y": 2.25},
+
+ {"matrix": [6, 4], "x": 7.875, "y": 2.25},
+ {"matrix": [6, 3], "x": 8.875, "y": 2.125},
+ {"matrix": [6, 2], "x": 9.875, "y": 2},
+ {"matrix": [6, 1], "x": 10.875, "y": 2},
+ {"matrix": [6, 0], "x": 11.875, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3.05},
+ {"matrix": [3, 3], "x": 3, "y": 3.18},
+ {"matrix": [3, 4], "x": 4, "y": 3.3},
+ {"matrix": [3, 5], "x": 5, "y": 3.43},
+
+ {"matrix": [7, 5], "x": 7, "y": 3.43},
+ {"matrix": [7, 4], "x": 8, "y": 3.3},
+ {"matrix": [7, 3], "x": 9, "y": 3.18},
+ {"matrix": [7, 2], "x": 10, "y": 3.05},
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 0], "x": 12, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/rev1/rev1.c
similarity index 100%
rename from keyboards/uzu42/uzu42.c
rename to keyboards/uzu42/rev1/rev1.c
diff --git a/keyboards/uzu42/rev1/rules.mk b/keyboards/uzu42/rev1/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/uzu42/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk
index ceb65c3053f..277e74b7153 100644
--- a/keyboards/uzu42/rules.mk
+++ b/keyboards/uzu42/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-OLED_ENABLE = no # OLED display
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = uzu42/rev1
diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/info.json
deleted file mode 100644
index 6959188be9a..00000000000
--- a/keyboards/v4n4g0rth0n/v2/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"],
- "rows": ["C7", "C6", "B6", "B5", "B7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/v4n4g0rth0n/v2/keyboard.json b/keyboards/v4n4g0rth0n/v2/keyboard.json
new file mode 100644
index 00000000000..c43848178f2
--- /dev/null
+++ b/keyboards/v4n4g0rth0n/v2/keyboard.json
@@ -0,0 +1,19 @@
+{
+ "usb": {
+ "device_version": "0.0.2"
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"],
+ "rows": ["C7", "C6", "B6", "B5", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu"
+}
diff --git a/keyboards/v4n4g0rth0n/v2/rules.mk b/keyboards/v4n4g0rth0n/v2/rules.mk
index 01145044866..cc588202788 100644
--- a/keyboards/v4n4g0rth0n/v2/rules.mk
+++ b/keyboards/v4n4g0rth0n/v2/rules.mk
@@ -1,14 +1 @@
-# 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 = 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
-
ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/info.json
deleted file mode 100644
index 096e89555aa..00000000000
--- a/keyboards/vertex/angle65/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
- "keyboard_name": "ANGLE65",
- "manufacturer": "vertex",
- "url": "",
- "maintainer": "EasonQian1, Vertex-kb",
- "usb": {
- "vid": "0x9954",
- "pid": "0x9970",
- "device_version": "0.0.1",
- "force_nkro": true
- },
- "processor": "STM32F103",
- "bootloader": "stm32duino",
- "matrix_pins": {
- "rows": ["B10", "B1", "B0", "A7", "A6"],
- "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"]
- },
- "diode_direction": "COL2ROW",
- "indicators": {
- "caps_lock": "C13",
- "on_state": 0
- },
- "rgblight": {
- "led_count": 9,
- "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": {
- "pin": "B15"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label": "K00 (B10,B9)", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "K01 (B10,B8)", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "K02 (B10,B7)", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "K03 (B10,B6)", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "K04 (B10,B5)", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "K05 (B10,B4)", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "K06 (B10,B3)", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "K07 (B10,B11)", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "K08 (B10,A15)", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "K09 (B10,A10)", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "K0A (B10,A9)", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "K0B (B10,B14)", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "K0C (B10,B13)", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "K0D (B10,B12)", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "K0E (B10,A5)", "matrix": [0, 14], "x": 14, "y": 0},
- {"label": "K10 (B1,B9)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "K11 (B1,B8)", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "K12 (B1,B7)", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "K13 (B1,B6)", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "K14 (B1,B5)", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "K15 (B1,B4)", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "K16 (B1,B3)", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "K17 (B1,B11)", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "K18 (B1,A15)", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "K19 (B1,A10)", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "K1A (B1,A9)", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "K1B (B1,B14)", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "K1C (B1,B13)", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "K1D (B1,B12)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "K1E (B1,A5)", "matrix": [1, 14], "x": 15, "y": 1},
- {"label": "K20 (B0,B9)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "K21 (B0,B8)", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "K22 (B0,B7)", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "K23 (B0,B6)", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "K24 (B0,B5)", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "K25 (B0,B4)", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "K26 (B0,B3)", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "K27 (B0,B11)", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K28 (B0,A15)", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "K29 (B0,A10)", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": "K2A (B0,A9)", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "K2B (B0,B14)", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "K2C (B0,B13)", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "K2D (B0,B12)", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
- {"label": "K2E (B0,A5)", "matrix": [2, 14], "x": 15, "y": 2},
- {"label": "K30 (A7,B9)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "K31 (A7,B8)", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "K32 (A7,B7)", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "K33 (A7,B6)", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "K34 (A7,B5)", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "K35 (A7,B4)", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "K36 (A7,B3)", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "K37 (A7,B11)", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "K38 (A7,A15)", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": "K39 (A7,A10)", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": "K3A (A7,A9)", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "K3B (A7,B14)", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "K3C (A7,B13)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "K3D (A7,B12)", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "K3E (A7,A5)", "matrix": [3, 14], "x": 15, "y": 3},
- {"label": "K40 (A6,B9)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "K41 (A6,B8)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "K42 (A6,B7)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "K46 (A6,B3)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "K4A (A6,A9)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"label": "K4B (A6,B14)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"label": "K4C (A6,B13)", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "K4D (A6,B12)", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "K4E (A6,A5)", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/vertex/angle65/keyboard.json b/keyboards/vertex/angle65/keyboard.json
new file mode 100644
index 00000000000..962b3fd4f11
--- /dev/null
+++ b/keyboards/vertex/angle65/keyboard.json
@@ -0,0 +1,126 @@
+{
+ "keyboard_name": "ANGLE65",
+ "manufacturer": "vertex",
+ "url": "",
+ "maintainer": "EasonQian1, Vertex-kb",
+ "usb": {
+ "vid": "0x9954",
+ "pid": "0x9970",
+ "device_version": "0.0.1",
+ "force_nkro": true
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "haptic": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "matrix_pins": {
+ "rows": ["B10", "B1", "B0", "A7", "A6"],
+ "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "C13",
+ "on_state": 0
+ },
+ "rgblight": {
+ "led_count": 9,
+ "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": {
+ "pin": "B15"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "K00 (B10,B9)", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01 (B10,B8)", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02 (B10,B7)", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03 (B10,B6)", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04 (B10,B5)", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05 (B10,B4)", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06 (B10,B3)", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07 (B10,B11)", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08 (B10,A15)", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09 (B10,A10)", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A (B10,A9)", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B (B10,B14)", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "K0C (B10,B13)", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "K0D (B10,B12)", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "K0E (B10,A5)", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "K10 (B1,B9)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "K11 (B1,B8)", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "K12 (B1,B7)", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "K13 (B1,B6)", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "K14 (B1,B5)", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "K15 (B1,B4)", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "K16 (B1,B3)", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "K17 (B1,B11)", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "K18 (B1,A15)", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "K19 (B1,A10)", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "K1A (B1,A9)", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "K1B (B1,B14)", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "K1C (B1,B13)", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "K1D (B1,B12)", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "K1E (B1,A5)", "matrix": [1, 14], "x": 15, "y": 1},
+ {"label": "K20 (B0,B9)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "K21 (B0,B8)", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22 (B0,B7)", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23 (B0,B6)", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24 (B0,B5)", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25 (B0,B4)", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26 (B0,B3)", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27 (B0,B11)", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28 (B0,A15)", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29 (B0,A10)", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A (B0,A9)", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B (B0,B14)", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K2C (B0,B13)", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "K2D (B0,B12)", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"label": "K2E (B0,A5)", "matrix": [2, 14], "x": 15, "y": 2},
+ {"label": "K30 (A7,B9)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "K31 (A7,B8)", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "K32 (A7,B7)", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "K33 (A7,B6)", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "K34 (A7,B5)", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "K35 (A7,B4)", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "K36 (A7,B3)", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "K37 (A7,B11)", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "K38 (A7,A15)", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": "K39 (A7,A10)", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": "K3A (A7,A9)", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "K3B (A7,B14)", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "K3C (A7,B13)", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "K3D (A7,B12)", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "K3E (A7,A5)", "matrix": [3, 14], "x": 15, "y": 3},
+ {"label": "K40 (A6,B9)", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "K41 (A6,B8)", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "K42 (A6,B7)", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "K46 (A6,B3)", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "K4A (A6,A9)", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "K4B (A6,B14)", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "K4C (A6,B13)", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "K4D (A6,B12)", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "K4E (A6,A5)", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/vertex/angle65/rules.mk b/keyboards/vertex/angle65/rules.mk
index 330f6ff76b8..a521203b326 100644
--- a/keyboards/vertex/angle65/rules.mk
+++ b/keyboards/vertex/angle65/rules.mk
@@ -1,15 +1 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
-
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json
deleted file mode 100644
index 7928430015d..00000000000
--- a/keyboards/viktus/minne_topre/info.json
+++ /dev/null
@@ -1,256 +0,0 @@
-{
- "manufacturer": "Viktus Design LLC",
- "keyboard_name": "Viktus Minne - Topre",
- "maintainer": "BlindAssassin111",
- "url": "https://viktus.design",
- "usb": {
- "device_version": "1.3.0",
- "vid": "0x5644",
- "pid": "0x4D54"
- },
- "bootloader": "atmel-dfu",
- "processor": "atmega32u4",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true
- },
- "bootmagic": {
- "matrix": [0, 0]
- },
- "build": {
- "lto": true
- },
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
- "rows": ["A0", "A1", "A3", "A4"]
- },
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
- {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3},
- {"label": "K35", "matrix": [3, 5], "x": 5.875, "y": 3},
- {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3},
- {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_dual_3u": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
- {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3},
- {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3},
- {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_6u": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
- {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3},
- {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_7u": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3}
- ]
- },
- "LAYOUT_10u": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/viktus/minne_topre/keyboard.json b/keyboards/viktus/minne_topre/keyboard.json
new file mode 100644
index 00000000000..6919e7f9ccd
--- /dev/null
+++ b/keyboards/viktus/minne_topre/keyboard.json
@@ -0,0 +1,253 @@
+{
+ "manufacturer": "Viktus Design LLC",
+ "keyboard_name": "Viktus Minne - Topre",
+ "maintainer": "BlindAssassin111",
+ "url": "https://viktus.design",
+ "usb": {
+ "device_version": "1.3.0",
+ "vid": "0x5644",
+ "pid": "0x4D54"
+ },
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
+ "rows": ["A0", "A1", "A3", "A4"]
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 5.875, "y": 3},
+ {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_dual_3u": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3},
+ {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_6u": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_7u": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3}
+ ]
+ },
+ "LAYOUT_10u": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/viktus/osav2_numpad_topre/info.json b/keyboards/viktus/osav2_numpad_topre/keyboard.json
similarity index 100%
rename from keyboards/viktus/osav2_numpad_topre/info.json
rename to keyboards/viktus/osav2_numpad_topre/keyboard.json
diff --git a/keyboards/viktus/osav2_topre/info.json b/keyboards/viktus/osav2_topre/keyboard.json
similarity index 100%
rename from keyboards/viktus/osav2_topre/info.json
rename to keyboards/viktus/osav2_topre/keyboard.json
diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/info.json
deleted file mode 100644
index 67f5b63bcaf..00000000000
--- a/keyboards/viktus/sp111/info.json
+++ /dev/null
@@ -1,745 +0,0 @@
-{
- "keyboard_name": "SP111",
- "manufacturer": "Viktus Design LLC",
- "url": "https://thekey.company/products/sp-111",
- "maintainer": "blindassassin111",
- "usb": {
- "vid": "0x5644",
- "pid": "0x5111",
- "device_version": "0.0.1"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
- {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
- {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
- {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
- {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
- {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
- {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
- {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
- {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
- {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
- {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
- {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
- {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
- {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
- {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
- {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
- {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
- {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
- {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
- {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
- {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
- {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
- {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
- {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
- {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
- {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
- {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
- {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
- {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
- {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
- {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
- {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
- {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
- {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
- {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
- {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
-
- {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
- {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
- {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
- {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
- {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
- {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
- {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
- {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
- {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
- {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
- {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
- {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
- {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
- {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
- {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
- {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
- {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
- {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
- {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
- {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
-
- {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
- {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
- {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
- {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
- {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
- {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
- {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
- {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
- {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
- {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
- {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
- {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
- {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
- {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
- {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
- {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
- {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
- {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
- {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
- {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 3.5, "w": 1.25},
-
- {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
- {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
- {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
- {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
- {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
- {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
- {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
- {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
- {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
- {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
- {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
- {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
- {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
- {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
- {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
- {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
- {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
- {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
- {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
- {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
-
- {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
- {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
- {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
- {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
- {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
- {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
- {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
- {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
- {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
- {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
- {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
- {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
- {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
- {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
- {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
- {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
- ]
- },
- "LAYOUT_ansi": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
- {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
- {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
- {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
- {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
- {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
- {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
- {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
- {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
- {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
- {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
- {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
- {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
- {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
- {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
- {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
- {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
- {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
- {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
- {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
- {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
- {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
- {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
- {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
- {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
- {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
- {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
- {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
- {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
- {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
- {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
- {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
- {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
- {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
- {"label": "Backspace", "matrix": [7, 7], "x": 18.25, "y": 1.5, "w": 2},
-
- {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
- {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
- {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
- {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
- {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
- {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
- {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
- {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
- {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
- {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
- {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
- {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
- {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
- {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
- {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
- {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
- {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
- {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
- {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
- {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
-
- {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
- {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
- {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
- {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
- {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
- {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
- {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
- {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
- {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
- {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
- {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
- {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
- {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
- {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
- {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
- {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
- {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
- {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
- {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
-
- {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
- {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
- {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
- {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
- {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
- {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
- {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
- {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
- {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
- {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
- {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
- {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
- {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
- {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
- {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
- {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
- {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
- {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
-
- {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
- {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
- {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
- {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
- {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
- {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
- {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
- {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
- {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
- {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
- {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
- {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
- {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
- {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
- {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
- {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
- ]
- },
- "LAYOUT_ansi_split_bs_rshift": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
- {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
- {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
- {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
- {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
- {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
- {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
- {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
- {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
- {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
- {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
- {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
- {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
- {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
- {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
- {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
- {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
- {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
- {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
- {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
- {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
- {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
- {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
- {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
- {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
- {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
- {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
- {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
- {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
- {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
- {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
- {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
- {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
- {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
- {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
- {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
-
- {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
- {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
- {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
- {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
- {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
- {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
- {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
- {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
- {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
- {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
- {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
- {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
- {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
- {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
- {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
- {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
- {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
- {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
- {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
- {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
-
- {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
- {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
- {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
- {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
- {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
- {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
- {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
- {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
- {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
- {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
- {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
- {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
- {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
- {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
- {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
- {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
- {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
- {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
- {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
-
- {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
- {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
- {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
- {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
- {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
- {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
- {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
- {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
- {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
- {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
- {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
- {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
- {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
- {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
- {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
- {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
- {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
- {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
- {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
-
- {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
- {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
- {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
- {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
- {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
- {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
- {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
- {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
- {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
- {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
- {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
- {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
- {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
- {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
- {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
- {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
- ]
- },
- "LAYOUT_iso": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
- {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
- {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
- {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
- {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
- {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
- {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
- {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
- {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
- {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
- {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
- {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
- {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
- {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
- {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
- {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
- {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
- {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
- {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
- {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
- {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
- {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
- {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
- {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
- {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
- {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
- {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
- {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
- {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
- {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
- {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
- {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
- {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
- {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
- {"label": "Backspace", "matrix": [7, 7], "x": 19.25, "y": 1.5, "w": 2},
-
- {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
- {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
- {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
- {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
- {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
- {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
- {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
- {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
- {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
- {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
- {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
- {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
- {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
- {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
- {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
- {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
- {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
- {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
- {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-
- {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
- {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
- {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
- {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
- {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
- {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
- {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
- {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
- {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
- {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
- {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
- {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
- {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
- {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
- {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
- {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
- {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
- {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
- {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
- {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
-
- {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
- {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
- {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
- {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
- {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
- {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
- {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
- {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
- {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
- {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
- {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
- {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
- {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
- {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
- {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
- {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
- {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
- {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
- {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
-
- {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
- {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
- {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
- {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
- {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
- {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
- {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
- {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
- {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
- {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
- {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
- {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
- {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
- {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
- {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
- {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
- ]
- },
- "LAYOUT_iso_split_bs_rshift": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
-
- {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
-
- {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
- {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
- {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
- {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
-
- {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
- {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
-
- {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
- {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
-
- {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
- {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
- {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
- {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
-
- {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
-
- {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
- {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
-
- {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
- {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
- {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
- {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
-
- {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
- {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
- {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
- {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
- {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
- {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
- {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
-
- {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
- {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
- {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
- {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
- {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
- {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
- {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
- {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
-
- {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
- {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
-
- {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
- {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
- {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
- {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
-
- {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
- {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
- {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
- {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
- {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
- {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
-
- {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
- {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
- {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
- {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
- {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
- {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
- {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
-
- {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
- {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
-
- {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
- {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
- {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
- {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
-
- {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
- {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
- {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
- {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
- {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
- {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
-
- {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
- {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
- {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
- {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
- {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
- {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
- {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
- {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
-
- {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
- {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
-
- {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
- {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
- {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
- {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
-
- {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
- {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
- {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
- {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
- {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
- {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
- {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
-
- {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
- {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
- {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
- {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
- {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
- {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
- {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
-
- {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
-
- {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
- {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
- {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
- {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
-
- {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
- {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
- {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
- {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
-
- {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
- {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
- {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
- {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
- {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
-
- {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
- {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
- {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
- ]
- }
- }
-}
diff --git a/keyboards/viktus/sp111/keyboard.json b/keyboards/viktus/sp111/keyboard.json
new file mode 100644
index 00000000000..a309c14afe3
--- /dev/null
+++ b/keyboards/viktus/sp111/keyboard.json
@@ -0,0 +1,754 @@
+{
+ "keyboard_name": "SP111",
+ "manufacturer": "Viktus Design LLC",
+ "url": "https://thekey.company/products/sp-111",
+ "maintainer": "blindassassin111",
+ "usb": {
+ "vid": "0x5644",
+ "pid": "0x5111",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+ {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+ {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+ {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+ {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+ {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+ {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+ {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+ {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+ {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+ {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+ {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+ {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+ {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+ {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+ {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+ {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+ {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+ {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+ {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+ {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+ {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+ {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+ {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+ {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
+ {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+ {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+ {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+ {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+ {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+ {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+ {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+ {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+ {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+ {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+ {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+ {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+ {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+ {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+ {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+ {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+ {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+ {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+ {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+ {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+ {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+ {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+ {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+ {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+ {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+ {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+ {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+ {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+ {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+ {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+ {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+ {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+ {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+ {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
+ {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 3.5, "w": 1.25},
+
+ {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+ {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+ {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+ {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+ {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+ {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+ {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+ {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
+ {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+ {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+ {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+ {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+ {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+ {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+ {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+ {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+ {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+ {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+ {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+ {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+ {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+ {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+ {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+ {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+ {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+ {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+ {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+ {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+ {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+ {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+ {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+ {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+ {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+ {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+ {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+ {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+ {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+ {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+ {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+ {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+ {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+ {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+ {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+ {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+ {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+ {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+ {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+ {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+ {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+ {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+ {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+ {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+ {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+ {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+ {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+ {"label": "Backspace", "matrix": [7, 7], "x": 18.25, "y": 1.5, "w": 2},
+
+ {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+ {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+ {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+ {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+ {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+ {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+ {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+ {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+ {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+ {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+ {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+ {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+ {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+ {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+ {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+ {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+ {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+ {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+ {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+ {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+ {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+ {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+ {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+ {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+ {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+ {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+ {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+ {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+ {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+ {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+ {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+ {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+ {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
+
+ {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+ {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+ {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+ {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+ {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+ {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+ {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
+ {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+ {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+ {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+ {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+ {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+ {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+ {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+ {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+ {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+ {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+ {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+ {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+ {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+ {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+ {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+ {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+ {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+ {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+ {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+ {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+ {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+ {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+ ]
+ },
+ "LAYOUT_ansi_split_bs_rshift": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+ {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+ {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+ {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+ {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+ {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+ {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+ {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+ {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+ {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+ {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+ {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+ {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+ {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+ {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+ {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+ {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+ {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+ {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+ {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+ {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+ {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+ {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+ {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+ {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
+ {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+ {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+ {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+ {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+ {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+ {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+ {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+ {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+ {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+ {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+ {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+ {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+ {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+ {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+ {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+ {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+ {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+ {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+ {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+ {"label": "\\", "matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+ {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+ {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+ {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+ {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+ {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+ {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+ {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+ {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+ {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+ {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+ {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+ {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+ {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+ {"label": "Enter", "matrix": [9, 7], "x": 18, "y": 3.5, "w": 2.25},
+
+ {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+ {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+ {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+ {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+ {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+ {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+ {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 2.25},
+ {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+ {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+ {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+ {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+ {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+ {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+ {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+ {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+ {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+ {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+ {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+ {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+ {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+ {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+ {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+ {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+ {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+ {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+ {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+ {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+ {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+ {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+ {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+ {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+ {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+ {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+ {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+ {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+ {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+ {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+ {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+ {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+ {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+ {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+ {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+ {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+ {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+ {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+ {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+ {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+ {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+ {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+ {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+ {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+ {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+ {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+ {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+ {"label": "Backspace", "matrix": [7, 7], "x": 19.25, "y": 1.5, "w": 2},
+
+ {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+ {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+ {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+ {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+ {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+ {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+ {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+ {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+ {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+ {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+ {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+ {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+ {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+ {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+ {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+ {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+ {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+ {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+
+ {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+ {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+ {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+ {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+ {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+ {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+ {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+ {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+ {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+ {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+ {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+ {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+ {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+ {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
+ {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+ {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+ {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+ {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+ {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+ {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+ {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+ {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
+ {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+ {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+ {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+ {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+ {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+ {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+ {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+ {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+ {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+ {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+ {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+ {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+ {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+ {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+ {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+ {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+ {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+ {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+ {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+ {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+ {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+ {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+ ]
+ },
+ "LAYOUT_iso_split_bs_rshift": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+ {"label": "F1", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "F2", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "F3", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "F4", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+ {"label": "F5", "matrix": [0, 9], "x": 10, "y": 0},
+ {"label": "F6", "matrix": [0, 10], "x": 11, "y": 0},
+
+ {"label": "F7", "matrix": [6, 1], "x": 12.75, "y": 0},
+ {"label": "F8", "matrix": [6, 2], "x": 13.75, "y": 0},
+
+ {"label": "F9", "matrix": [6, 3], "x": 15, "y": 0},
+ {"label": "F10", "matrix": [6, 4], "x": 16, "y": 0},
+ {"label": "F11", "matrix": [6, 5], "x": 17, "y": 0},
+ {"label": "F12", "matrix": [6, 6], "x": 18, "y": 0},
+
+ {"label": "Print Screen", "matrix": [6, 7], "x": 19.25, "y": 0},
+
+ {"label": "Scroll Lock", "matrix": [6, 8], "x": 20.5, "y": 0},
+ {"label": "Pause", "matrix": [6, 9], "x": 21.5, "y": 0},
+
+ {"label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.5},
+ {"label": "/", "matrix": [1, 1], "x": 1, "y": 1.5},
+ {"label": "*", "matrix": [1, 2], "x": 2, "y": 1.5},
+ {"label": "-", "matrix": [1, 3], "x": 3, "y": 1.5},
+
+ {"label": "`", "matrix": [1, 4], "x": 4.5, "y": 1.5},
+ {"label": "1", "matrix": [1, 5], "x": 5.5, "y": 1.5},
+ {"label": "2", "matrix": [1, 6], "x": 6.5, "y": 1.5},
+ {"label": "3", "matrix": [1, 7], "x": 7.5, "y": 1.5},
+ {"label": "4", "matrix": [1, 8], "x": 8.5, "y": 1.5},
+ {"label": "5", "matrix": [1, 9], "x": 9.5, "y": 1.5},
+ {"label": "6", "matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+ {"label": "7", "matrix": [7, 0], "x": 12.25, "y": 1.5},
+ {"label": "8", "matrix": [7, 1], "x": 13.25, "y": 1.5},
+ {"label": "9", "matrix": [7, 2], "x": 14.25, "y": 1.5},
+ {"label": "0", "matrix": [7, 3], "x": 15.25, "y": 1.5},
+ {"label": "-", "matrix": [7, 4], "x": 16.25, "y": 1.5},
+ {"label": "=", "matrix": [7, 5], "x": 17.25, "y": 1.5},
+ {"label": "Backspace", "matrix": [7, 6], "x": 18.25, "y": 1.5},
+ {"label": "Delete", "matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+ {"label": "Home", "matrix": [7, 8], "x": 20.5, "y": 1.5},
+ {"label": "Insert", "matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+ {"label": "7", "matrix": [2, 0], "x": 0, "y": 2.5},
+ {"label": "8", "matrix": [2, 1], "x": 1, "y": 2.5},
+ {"label": "9", "matrix": [2, 2], "x": 2, "y": 2.5},
+ {"label": "+", "matrix": [2, 3], "x": 3, "y": 2.5},
+
+ {"label": "Tab", "matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [2, 5], "x": 6, "y": 2.5},
+ {"label": "W", "matrix": [2, 6], "x": 7, "y": 2.5},
+ {"label": "E", "matrix": [2, 7], "x": 8, "y": 2.5},
+ {"label": "R", "matrix": [2, 8], "x": 9, "y": 2.5},
+ {"label": "T", "matrix": [2, 9], "x": 10, "y": 2.5},
+
+ {"label": "Y", "matrix": [8, 0], "x": 11.75, "y": 2.5},
+ {"label": "U", "matrix": [8, 1], "x": 12.75, "y": 2.5},
+ {"label": "I", "matrix": [8, 2], "x": 13.75, "y": 2.5},
+ {"label": "O", "matrix": [8, 3], "x": 14.75, "y": 2.5},
+ {"label": "P", "matrix": [8, 4], "x": 15.75, "y": 2.5},
+ {"label": "[", "matrix": [8, 5], "x": 16.75, "y": 2.5},
+ {"label": "]", "matrix": [8, 6], "x": 17.75, "y": 2.5},
+
+ {"label": "End", "matrix": [8, 8], "x": 20.5, "y": 2.5},
+ {"label": "Delete", "matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+ {"label": "4", "matrix": [3, 0], "x": 0, "y": 3.5},
+ {"label": "5", "matrix": [3, 1], "x": 1, "y": 3.5},
+ {"label": "6", "matrix": [3, 2], "x": 2, "y": 3.5},
+ {"label": "=", "matrix": [3, 3], "x": 3, "y": 3.5},
+
+ {"label": "Caps Lock", "matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [3, 5], "x": 6.25, "y": 3.5},
+ {"label": "S", "matrix": [3, 6], "x": 7.25, "y": 3.5},
+ {"label": "D", "matrix": [3, 7], "x": 8.25, "y": 3.5},
+ {"label": "F", "matrix": [3, 8], "x": 9.25, "y": 3.5},
+ {"label": "G", "matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+ {"label": "H", "matrix": [9, 0], "x": 12, "y": 3.5},
+ {"label": "J", "matrix": [9, 1], "x": 13, "y": 3.5},
+ {"label": "K", "matrix": [9, 2], "x": 14, "y": 3.5},
+ {"label": "L", "matrix": [9, 3], "x": 15, "y": 3.5},
+ {"label": ";", "matrix": [9, 4], "x": 16, "y": 3.5},
+ {"label": "'", "matrix": [9, 5], "x": 17, "y": 3.5},
+ {"label": "#", "matrix": [9, 6], "x": 18, "y": 3.5},
+ {"label": "Enter", "matrix": [9, 7], "x": 19, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"label": "Page Up", "matrix": [9, 8], "x": 20.5, "y": 3.5},
+ {"label": "Page Down", "matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+ {"label": "1", "matrix": [4, 0], "x": 0, "y": 4.5},
+ {"label": "2", "matrix": [4, 1], "x": 1, "y": 4.5},
+ {"label": "3", "matrix": [4, 2], "x": 2, "y": 4.5},
+ {"label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.5},
+
+ {"label": "Shift", "matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+ {"label": "\\", "matrix": [4, 5], "x": 5.75, "y": 4.5},
+ {"label": "Z", "matrix": [4, 6], "x": 6.75, "y": 4.5},
+ {"label": "X", "matrix": [4, 7], "x": 7.75, "y": 4.5},
+ {"label": "C", "matrix": [4, 8], "x": 8.75, "y": 4.5},
+ {"label": "V", "matrix": [4, 9], "x": 9.75, "y": 4.5},
+ {"label": "B", "matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+ {"label": "N", "matrix": [10, 1], "x": 12.5, "y": 4.5},
+ {"label": "M", "matrix": [10, 2], "x": 13.5, "y": 4.5},
+ {"label": ",", "matrix": [10, 3], "x": 14.5, "y": 4.5},
+ {"label": ".", "matrix": [10, 4], "x": 15.5, "y": 4.5},
+ {"label": "/", "matrix": [10, 5], "x": 16.5, "y": 4.5},
+ {"label": "Shift", "matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+ {"label": "Fn", "matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+ {"label": "\u2191", "matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+ {"label": "0", "matrix": [5, 0], "x": 0, "y": 5.5},
+ {"label": "0", "matrix": [5, 1], "x": 1, "y": 5.5},
+ {"label": "00", "matrix": [5, 2], "x": 2, "y": 5.5},
+ {"label": ".", "matrix": [5, 3], "x": 3, "y": 5.5},
+
+ {"label": "Ctrl", "matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+ {"label": "Mute", "matrix": [5, 7], "x": 8.25, "y": 5.5},
+ {"label": "Space", "matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+ {"label": "Space", "matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+ {"label": "Menu", "matrix": [11, 3], "x": 14.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+ {"label": "GUI", "matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [11, 7], "x": 19.5, "y": 5.75},
+ {"label": "\u2193", "matrix": [11, 8], "x": 20.5, "y": 5.75},
+ {"label": "\u2192", "matrix": [11, 9], "x": 21.5, "y": 5.75}
+ ]
+ }
+ }
+}
diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk
index 1be8c7ad68a..d9b01484992 100644
--- a/keyboards/viktus/sp111/rules.mk
+++ b/keyboards/viktus/sp111/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
-LTO_ENABLE = yes # Smaller (and slightly faster) firmware
-
-
# custom matrix setup
CUSTOM_MATRIX = lite
diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
deleted file mode 100644
index 6deb64c63ca..00000000000
--- a/keyboards/viktus/sp_mini/info.json
+++ /dev/null
@@ -1,685 +0,0 @@
-{
- "keyboard_name": "SP_Mini",
- "manufacturer": "Viktus Design LLC",
- "url": "",
- "maintainer": "jrfhoutx",
- "usb": {
- "vid": "0x5644",
- "pid": "0x534D",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null],
- "rows": ["F0", "B5", "B4", "D7", "D6"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "F4", "pin_b": "F1", "resolution": 8}
- ]
- },
- "split": {
- "matrix_pins": {
- "right": {
- "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", "B7"],
- "rows": ["F0", "B5", "B4", "D7", "D6"]
- }
- }
- },
- "rgblight": {
- "led_count": 24,
- "split_count": [12, 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": {
- "pin": "E6"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "\u25bd", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "\u25bd", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "\u25bd", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "\u25bd", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "\u25bd", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "\u25bd", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "\u25bd", "matrix": [0, 6], "x": 6.25, "y": 0},
-
- {"label": "\u25bd", "matrix": [5, 0], "x": 7.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 1], "x": 8.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 2], "x": 9.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 3], "x": 10.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 4], "x": 11.75, "y": 0},
- {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
- {"label": "\u25bd", "matrix": [5, 7], "x": 15, "y": 0},
-
- {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
- {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
- {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
- {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
- {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
- {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
- {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
- {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
- {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
- {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
-
- {"label": "\u25bd", "matrix": [6, 7], "x": 15, "y": 1.25},
-
- {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
- {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
- {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
- {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
- {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
- {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
- {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
- {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
- {"label": "\u25bd", "matrix": [7, 7], "x": 15, "y": 2.25},
-
- {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
- {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
- {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
- {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
- {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
- {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
- {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
- {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
- {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
- {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
- {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
- {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
- {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
-
- {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
- {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
- {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
-
- {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
- {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
- {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
- ]
- },
- "LAYOUT_4l2r": {
- "layout": [
- {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
- {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
- {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
- {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
- {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
- {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
- {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
- {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
- {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
- {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
- {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
- {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
- {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
- {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
- {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
- {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
- {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
-
- {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
- {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
- {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
- {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
- {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
- {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
- {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
- {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
- {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
- {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
- {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
- {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
- {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
- {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
- {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
- {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
- {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
- {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
- {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
- {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
- {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
- {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
-
- {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
- {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
-
- {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
- {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
- {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
- ]
- },
- "LAYOUT_4l2r_split_bs": {
- "layout": [
- {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
- {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
- {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
- {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
- {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
- {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
- {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
- {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
- {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
- {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
- {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
- {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
- {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
- {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
- {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
- {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
- {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
- {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
-
- {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
- {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
- {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
- {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
- {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
- {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
- {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
- {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
- {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
- {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
- {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
- {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
- {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
- {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
- {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
- {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
- {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
- {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
- {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
- {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
- {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
- {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
-
- {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
- {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
-
- {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
- {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
- {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
- ]
- },
- "LAYOUT_4l": {
- "layout": [
- {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
- {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
- {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
- {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
- {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
- {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
- {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
- {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
- {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
- {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
- {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
- {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
- {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
- {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
- {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
- {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
- {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
-
- {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
- {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
- {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
- {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
- {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
- {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
- {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
- {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
- {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
- {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
- {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
- {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
- {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
- {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
- {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
- {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
- {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
- {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
- {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
- {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
- {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
- {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
-
- {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
- {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
- {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
-
- {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
- {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
- {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
- ]
- },
- "LAYOUT_4l_split_bs": {
- "layout": [
- {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
- {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
- {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
- {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
- {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
- {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
- {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
- {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
- {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
- {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
- {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
- {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
- {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
- {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
- {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
- {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
- {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
- {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
-
- {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
- {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
- {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
- {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
- {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
- {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
- {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
- {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
- {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
- {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
- {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
- {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
- {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
- {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
- {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
- {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
- {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
- {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
- {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
- {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
- {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
- {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
-
- {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
- {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
- {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
-
- {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
- {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
- {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
- ]
- },
- "LAYOUT_2r": {
- "layout": [
- {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
- {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
- {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
- {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
- {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
- {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
- {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
- {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
- {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
- {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
- {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
- {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
- {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
- {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
- {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
- {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
- {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
-
- {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
- {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
- {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
- {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
- {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
- {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
- {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
- {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
- {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
- {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
- {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
- {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
- {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
- {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
- {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
- {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
- {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
- {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
- {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
- {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
- {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
- {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
- {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
-
- {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
- {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
-
- {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
- {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
- {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
- ]
- },
- "LAYOUT_2r_split_bs": {
- "layout": [
- {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
-
- {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
- {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
- {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
- {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
- {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
- {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
- {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
-
- {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
-
- {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
-
- {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
- {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
-
- {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
- {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
- {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
- {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
- {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
- {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
- {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
-
- {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
-
- {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
- {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
-
- {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
- {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
- {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
- {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
- {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
- {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
-
- {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
-
- {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
-
- {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
- {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
- {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
-
- {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
- {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
- {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
- {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
- {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
-
- {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
-
- {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
- {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
- {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
- {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
-
- {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
- {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
-
- {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
- {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
- {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
- ]
- }
- }
-}
diff --git a/keyboards/viktus/sp_mini/keyboard.json b/keyboards/viktus/sp_mini/keyboard.json
new file mode 100644
index 00000000000..25aa4c94942
--- /dev/null
+++ b/keyboards/viktus/sp_mini/keyboard.json
@@ -0,0 +1,696 @@
+{
+ "keyboard_name": "SP_Mini",
+ "manufacturer": "Viktus Design LLC",
+ "url": "",
+ "maintainer": "jrfhoutx",
+ "usb": {
+ "vid": "0x5644",
+ "pid": "0x534D",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null],
+ "rows": ["F0", "B5", "B4", "D7", "D6"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F4", "pin_b": "F1", "resolution": 8}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "matrix_pins": {
+ "right": {
+ "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", "B7"],
+ "rows": ["F0", "B5", "B4", "D7", "D6"]
+ }
+ }
+ },
+ "rgblight": {
+ "led_count": 24,
+ "split_count": [12, 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": {
+ "pin": "E6"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "\u25bd", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "\u25bd", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "\u25bd", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "\u25bd", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "\u25bd", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "\u25bd", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "\u25bd", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+ {"label": "\u25bd", "matrix": [5, 0], "x": 7.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 1], "x": 8.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 2], "x": 9.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 3], "x": 10.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+ {"label": "\u25bd", "matrix": [5, 7], "x": 15, "y": 0},
+
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+ {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+ {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+ {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+ {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+ {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+ {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+ {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
+ {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+ {"label": "\u25bd", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+ {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+ {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+ {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+ {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+ {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+ {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+ {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+ {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+ {"label": "\u25bd", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+ {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+ {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+ {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+ {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+ {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+ {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+ {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+ {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+ {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+ {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
+ {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
+ {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
+ {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
+
+ {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
+ {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
+ {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
+
+ {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+ {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+ {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+ ]
+ },
+ "LAYOUT_4l2r": {
+ "layout": [
+ {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+ {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+ {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+ {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+ {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+ {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+ {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+ {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+ {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+ {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+ {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+ {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+ {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+ {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
+
+ {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+ {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+ {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+ {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+ {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+ {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+ {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+ {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+ {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+ {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+ {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+ {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+ {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+ {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+ {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+ {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+ {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+ {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+ {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+ {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
+ {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
+
+ {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
+ {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
+
+ {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+ {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+ {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+ ]
+ },
+ "LAYOUT_4l2r_split_bs": {
+ "layout": [
+ {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+ {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+ {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+ {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+ {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+ {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+ {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+ {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+ {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+ {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+ {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+ {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+ {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+ {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
+ {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+ {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+ {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+ {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+ {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+ {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+ {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+ {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+ {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+ {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+ {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+ {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+ {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+ {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+ {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+ {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+ {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+ {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+ {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+ {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+ {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
+ {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
+
+ {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
+ {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
+
+ {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+ {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+ {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+ ]
+ },
+ "LAYOUT_4l": {
+ "layout": [
+ {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+ {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+ {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+ {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+ {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+ {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+ {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+ {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+ {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+ {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+ {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+ {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+ {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+ {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
+
+ {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+ {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+ {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+ {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+ {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+ {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+ {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+ {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+ {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+ {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+ {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+ {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+ {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+ {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+ {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+ {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+ {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+ {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+ {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+ {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
+ {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
+
+ {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
+ {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
+ {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
+
+ {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+ {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+ {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+ ]
+ },
+ "LAYOUT_4l_split_bs": {
+ "layout": [
+ {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+ {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+ {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+ {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+ {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+ {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+ {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+ {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+ {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+ {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+ {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+ {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+ {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+ {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
+ {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+ {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+ {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+ {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+ {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+ {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+ {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+ {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+ {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+ {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+ {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+ {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+ {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+ {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+ {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+ {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+ {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+ {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+ {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+ {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+ {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 1.25},
+ {"label": "Fn/Space", "matrix": [4, 5], "x": 5, "y": 4.25, "w": 2.75},
+
+ {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
+ {"label": "Alt", "matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
+ {"label": "Fn2", "matrix": [9, 4], "x": 11.75, "y": 4.25},
+
+ {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+ {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+ {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+ ]
+ },
+ "LAYOUT_2r": {
+ "layout": [
+ {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+ {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+ {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+ {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+ {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+ {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+ {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+ {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+ {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+ {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+ {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+ {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+ {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+ {"label": "Backspace", "matrix": [6, 6], "x": 12.75, "y": 1.25, "w": 2},
+
+ {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+ {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+ {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+ {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+ {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+ {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+ {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+ {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+ {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+ {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+ {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+ {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+ {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+ {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+ {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+ {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+ {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+ {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+ {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+ {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
+ {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
+ {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
+ {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
+
+ {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
+ {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
+
+ {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+ {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+ {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+ ]
+ },
+ "LAYOUT_2r_split_bs": {
+ "layout": [
+ {"label": "Switch/Rotary 1", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "`", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0},
+
+ {"label": "6", "matrix": [5, 0], "x": 7.75, "y": 0},
+ {"label": "7", "matrix": [5, 1], "x": 8.75, "y": 0},
+ {"label": "8", "matrix": [5, 2], "x": 9.75, "y": 0},
+ {"label": "9", "matrix": [5, 3], "x": 10.75, "y": 0},
+ {"label": "0", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "F24", "matrix": [5, 5], "x": 12.75, "y": 0},
+ {"label": "\u25bd", "matrix": [5, 6], "x": 13.75, "y": 0},
+
+ {"label": "Switch/Rotary 2", "matrix": [5, 7], "x": 15, "y": 0},
+
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 1.25},
+
+ {"label": "Esc", "matrix": [1, 1], "x": 1.25, "y": 1.25},
+ {"label": "Q", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "W", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "E", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "R", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "T", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+ {"label": "Y", "matrix": [6, 0], "x": 7.75, "y": 1.25},
+ {"label": "U", "matrix": [6, 1], "x": 8.75, "y": 1.25},
+ {"label": "I", "matrix": [6, 2], "x": 9.75, "y": 1.25},
+ {"label": "O", "matrix": [6, 3], "x": 10.75, "y": 1.25},
+ {"label": "P", "matrix": [6, 4], "x": 11.75, "y": 1.25},
+ {"label": "Delete", "matrix": [6, 5], "x": 12.75, "y": 1.25},
+ {"label": "Backspace", "matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+ {"label": "Page Up", "matrix": [6, 7], "x": 15, "y": 1.25},
+
+ {"label": "Fn2", "matrix": [2, 0], "x": 0, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+ {"label": "A", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "S", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "D", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "F", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "G", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+ {"label": "H", "matrix": [7, 0], "x": 8, "y": 2.25},
+ {"label": "J", "matrix": [7, 1], "x": 9, "y": 2.25},
+ {"label": "K", "matrix": [7, 2], "x": 10, "y": 2.25},
+ {"label": "L", "matrix": [7, 3], "x": 11, "y": 2.25},
+ {"label": "'", "matrix": [7, 4], "x": 12, "y": 2.25},
+ {"label": "Enter", "matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+ {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 2.25},
+
+ {"label": "\u25bd", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+ {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+ {"label": "Z", "matrix": [3, 2], "x": 3, "y": 3.25},
+ {"label": "X", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "C", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "V", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "B", "matrix": [3, 6], "x": 7, "y": 3.25},
+
+ {"label": "N", "matrix": [8, 1], "x": 8.5, "y": 3.25},
+ {"label": "M", "matrix": [8, 2], "x": 9.5, "y": 3.25},
+ {"label": ",", "matrix": [8, 3], "x": 10.5, "y": 3.25},
+ {"label": ".", "matrix": [8, 4], "x": 11.5, "y": 3.25},
+ {"label": "Shift", "matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+ {"label": "\u2191", "matrix": [8, 6], "x": 14, "y": 3.5},
+
+ {"label": "\u25bd", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4.25},
+ {"label": "GUI", "matrix": [4, 3], "x": 3.5, "y": 4.25},
+ {"label": "Fn1", "matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
+ {"label": "Fn/Space", "matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
+
+ {"label": "Fn2/Backspace", "matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.75},
+ {"label": "Fn2", "matrix": [9, 4], "x": 11, "y": 4.25, "w": 1.75},
+
+ {"label": "\u2190", "matrix": [9, 5], "x": 13, "y": 4.5},
+ {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4.5},
+ {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk
deleted file mode 100644
index ca2a1036c34..00000000000
--- a/keyboards/viktus/sp_mini/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
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/viktus/styrka_topre/info.json b/keyboards/viktus/styrka_topre/keyboard.json
similarity index 100%
rename from keyboards/viktus/styrka_topre/info.json
rename to keyboards/viktus/styrka_topre/keyboard.json
diff --git a/keyboards/vinhcatba/uncertainty/info.json b/keyboards/vinhcatba/uncertainty/keyboard.json
similarity index 100%
rename from keyboards/vinhcatba/uncertainty/info.json
rename to keyboards/vinhcatba/uncertainty/keyboard.json
diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json
deleted file mode 100644
index ff1504a5aa7..00000000000
--- a/keyboards/vitamins_included/rev1/info.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F1", "F4", "E2", "B6", "D7", "D6"],
- "rows": ["F5", "F6", "C7", "F7"]
- },
- "diode_direction": "COL2ROW",
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 16,
- "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": {
- "pin": "F0"
- },
- "bootloader": "caterina"
-}
diff --git a/keyboards/vitamins_included/rev1/keyboard.json b/keyboards/vitamins_included/rev1/keyboard.json
new file mode 100644
index 00000000000..de21929c39b
--- /dev/null
+++ b/keyboards/vitamins_included/rev1/keyboard.json
@@ -0,0 +1,33 @@
+{
+ "usb": {
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["F1", "F4", "E2", "B6", "D7", "D6"],
+ "rows": ["F5", "F6", "C7", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 16,
+ "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": {
+ "pin": "F0"
+ },
+ "bootloader": "caterina"
+}
diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk
deleted file mode 100644
index d38a6180907..00000000000
--- a/keyboards/vitamins_included/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json
deleted file mode 100644
index ed8596538df..00000000000
--- a/keyboards/vitamins_included/rev2/info.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "usb": {
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["F1", "F4", "E2", "B6", "D7", "D6"],
- "rows": ["F5", "F6", "C7", "F7"]
- },
- "diode_direction": "COL2ROW",
- "qmk_lufa_bootloader": {
- "esc_input": "F5",
- "esc_output": "F1",
- "led": "D5",
- "speaker": "C6"
- },
- "split": {
- "soft_serial_pin": "D0"
- },
- "rgblight": {
- "led_count": 12,
- "split_count": [6, 6],
- "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": {
- "pin": "F0"
- },
- "bootloader": "qmk-dfu"
-}
diff --git a/keyboards/vitamins_included/rev2/keyboard.json b/keyboards/vitamins_included/rev2/keyboard.json
new file mode 100644
index 00000000000..4418b869099
--- /dev/null
+++ b/keyboards/vitamins_included/rev2/keyboard.json
@@ -0,0 +1,40 @@
+{
+ "usb": {
+ "device_version": "0.0.2"
+ },
+ "matrix_pins": {
+ "cols": ["F1", "F4", "E2", "B6", "D7", "D6"],
+ "rows": ["F5", "F6", "C7", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "qmk_lufa_bootloader": {
+ "esc_input": "F5",
+ "esc_output": "F1",
+ "led": "D5",
+ "speaker": "C6"
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D0"
+ },
+ "rgblight": {
+ "led_count": 12,
+ "split_count": [6, 6],
+ "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": {
+ "pin": "F0"
+ },
+ "bootloader": "qmk-dfu"
+}
diff --git a/keyboards/vitamins_included/rev2/rules.mk b/keyboards/vitamins_included/rev2/rules.mk
index 9f05083d69e..fe598d78616 100644
--- a/keyboards/vitamins_included/rev2/rules.mk
+++ b/keyboards/vitamins_included/rev2/rules.mk
@@ -1,4 +1,2 @@
-SPLIT_KEYBOARD = yes
-
# Disable unsupported hardware
BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json
deleted file mode 100644
index 159773a1c97..00000000000
--- a/keyboards/waterfowl/info.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
- "keyboard_name": "Waterfowl",
- "manufacturer": "CyanDuck",
- "url": "",
- "maintainer": "JW2586",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x9CE3",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1"],
- "rows": ["D4", "C6", "D7", "E6"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "B5"},
- {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
- ]
- },
- "split": {
- "soft_serial_pin": "D2",
- "transport": {
- "sync": {
- "modifiers": true,
- "wpm": true
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 1},
- {"matrix": [0, 1], "x": 1, "y": 0.25},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0.375},
- {"matrix": [0, 4], "x": 4, "y": 0.5},
-
- {"matrix": [4, 4], "x": 9, "y": 0.5},
- {"matrix": [4, 3], "x": 10, "y": 0.375},
- {"matrix": [4, 2], "x": 11, "y": 0},
- {"matrix": [4, 1], "x": 12, "y": 0.25},
- {"matrix": [4, 0], "x": 13, "y": 1},
-
- {"matrix": [1, 0], "x": 0, "y": 2},
- {"matrix": [1, 1], "x": 1, "y": 1.25},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1.375},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
-
- {"matrix": [5, 4], "x": 9, "y": 1.5},
- {"matrix": [5, 3], "x": 10, "y": 1.375},
- {"matrix": [5, 2], "x": 11, "y": 1},
- {"matrix": [5, 1], "x": 12, "y": 1.25},
- {"matrix": [5, 0], "x": 13, "y": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 3},
- {"matrix": [2, 1], "x": 1, "y": 2.25},
- {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 3], "x": 3, "y": 2.375},
- {"matrix": [2, 4], "x": 4, "y": 2.5},
-
- {"matrix": [6, 4], "x": 9, "y": 2.5},
- {"matrix": [6, 3], "x": 10, "y": 2.375},
- {"matrix": [6, 2], "x": 11, "y": 2},
- {"matrix": [6, 1], "x": 12, "y": 2.25},
- {"matrix": [6, 0], "x": 13, "y": 3},
-
- {"matrix": [3, 0], "x": 2, "y": 3.5},
- {"matrix": [3, 1], "x": 3.5, "y": 3.5},
- {"matrix": [3, 2], "x": 4.5, "y": 3.7},
- {"matrix": [3, 3], "x": 5.5, "y": 4.1},
- {"matrix": [3, 4], "x": 5.5, "y": 2.5},
-
- {"matrix": [7, 4], "x": 7.5, "y": 2.5},
- {"matrix": [7, 3], "x": 7.5, "y": 4.1},
- {"matrix": [7, 2], "x": 8.5, "y": 3.7},
- {"matrix": [7, 1], "x": 9.5, "y": 3.5},
- {"matrix": [7, 0], "x": 11, "y": 3.5}
- ]
- }
- }
-}
diff --git a/keyboards/waterfowl/keyboard.json b/keyboards/waterfowl/keyboard.json
new file mode 100644
index 00000000000..a1783130426
--- /dev/null
+++ b/keyboards/waterfowl/keyboard.json
@@ -0,0 +1,95 @@
+{
+ "keyboard_name": "Waterfowl",
+ "manufacturer": "CyanDuck",
+ "url": "",
+ "maintainer": "JW2586",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x9CE3",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B5"},
+ {"pin_a": "B3", "pin_b": "B2", "resolution": 2}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2",
+ "transport": {
+ "sync": {
+ "modifiers": true,
+ "wpm": true
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 0.25},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.375},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+ {"matrix": [4, 4], "x": 9, "y": 0.5},
+ {"matrix": [4, 3], "x": 10, "y": 0.375},
+ {"matrix": [4, 2], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0.25},
+ {"matrix": [4, 0], "x": 13, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.375},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+ {"matrix": [5, 4], "x": 9, "y": 1.5},
+ {"matrix": [5, 3], "x": 10, "y": 1.375},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 1], "x": 12, "y": 1.25},
+ {"matrix": [5, 0], "x": 13, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.375},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+ {"matrix": [6, 4], "x": 9, "y": 2.5},
+ {"matrix": [6, 3], "x": 10, "y": 2.375},
+ {"matrix": [6, 2], "x": 11, "y": 2},
+ {"matrix": [6, 1], "x": 12, "y": 2.25},
+ {"matrix": [6, 0], "x": 13, "y": 3},
+
+ {"matrix": [3, 0], "x": 2, "y": 3.5},
+ {"matrix": [3, 1], "x": 3.5, "y": 3.5},
+ {"matrix": [3, 2], "x": 4.5, "y": 3.7},
+ {"matrix": [3, 3], "x": 5.5, "y": 4.1},
+ {"matrix": [3, 4], "x": 5.5, "y": 2.5},
+
+ {"matrix": [7, 4], "x": 7.5, "y": 2.5},
+ {"matrix": [7, 3], "x": 7.5, "y": 4.1},
+ {"matrix": [7, 2], "x": 8.5, "y": 3.7},
+ {"matrix": [7, 1], "x": 9.5, "y": 3.5},
+ {"matrix": [7, 0], "x": 11, "y": 3.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk
deleted file mode 100644
index 0eed9cdd8f6..00000000000
--- a/keyboards/waterfowl/rules.mk
+++ /dev/null
@@ -1,16 +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
-
-OLED_ENABLE = yes # Enables the use of OLED displays
-SPLIT_KEYBOARD = yes # Enables split functionality
-ENCODER_ENABLE = yes # Enables the encoders
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
deleted file mode 100644
index c86ead57bd8..00000000000
--- a/keyboards/wekey/we27/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 @wekey
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/wekey/we27/info.json b/keyboards/wekey/we27/info.json
deleted file mode 100644
index 802ae8eed6c..00000000000
--- a/keyboards/wekey/we27/info.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- "keyboard_name": "We27",
- "manufacturer": "@wekey",
- "url": "",
- "maintainer": "@wekey.dev",
- "usb": {
- "vid": "0x5559",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations": {
- "rainbow_moving_chevron": true
- },
- "default": {
- "hue": 108
- },
- "driver": "ws2812",
- "react_on_keyup": true
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "C7", "D6", "D4"],
- "rows": ["F1", "D7", "B4", "B5", "B6", "F6"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
- ]
- },
- "ws2812": {
- "pin": "C6"
- },
- "build": {
- "debounce_type": "sym_defer_pk"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "community_layouts": ["numpad_6x5"],
- "layouts": {
- "LAYOUT_numpad_6x5": {
- "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": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5},
- {"matrix": [2, 1], "x": 1, "y": 2.5},
- {"matrix": [2, 2], "x": 2, "y": 2.5},
- {"matrix": [2, 3], "x": 3, "y": 2.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5},
- {"matrix": [3, 1], "x": 1, "y": 3.5},
- {"matrix": [3, 2], "x": 2, "y": 3.5},
- {"matrix": [3, 3], "x": 3, "y": 3.5},
- {"matrix": [2, 4], "x": 4, "y": 2.5, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 4.5},
- {"matrix": [4, 1], "x": 1, "y": 4.5},
- {"matrix": [4, 2], "x": 2, "y": 4.5},
- {"matrix": [4, 3], "x": 3, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.5},
- {"matrix": [5, 1], "x": 1, "y": 5.5, "w": 2},
- {"matrix": [5, 3], "x": 3, "y": 5.5},
- {"matrix": [4, 4], "x": 4, "y": 4.5, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/wekey/we27/keyboard.json b/keyboards/wekey/we27/keyboard.json
new file mode 100644
index 00000000000..d8cb7b0f802
--- /dev/null
+++ b/keyboards/wekey/we27/keyboard.json
@@ -0,0 +1,92 @@
+{
+ "keyboard_name": "We27",
+ "manufacturer": "@wekey",
+ "url": "",
+ "maintainer": "@wekey.dev",
+ "usb": {
+ "vid": "0x5559",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgb_matrix": {
+ "animations": {
+ "rainbow_moving_chevron": true
+ },
+ "default": {
+ "hue": 108
+ },
+ "driver": "ws2812",
+ "react_on_keyup": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "C7", "D6", "D4"],
+ "rows": ["F1", "D7", "B4", "B5", "B6", "F6"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D3", "pin_b": "D2", "resolution": 2}
+ ]
+ },
+ "ws2812": {
+ "pin": "C6"
+ },
+ "build": {
+ "debounce_type": "sym_defer_pk"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "community_layouts": ["numpad_6x5"],
+ "layouts": {
+ "LAYOUT_numpad_6x5": {
+ "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": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5},
+ {"matrix": [2, 1], "x": 1, "y": 2.5},
+ {"matrix": [2, 2], "x": 2, "y": 2.5},
+ {"matrix": [2, 3], "x": 3, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5},
+ {"matrix": [3, 1], "x": 1, "y": 3.5},
+ {"matrix": [3, 2], "x": 2, "y": 3.5},
+ {"matrix": [3, 3], "x": 3, "y": 3.5},
+ {"matrix": [2, 4], "x": 4, "y": 2.5, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5},
+ {"matrix": [4, 1], "x": 1, "y": 4.5},
+ {"matrix": [4, 2], "x": 2, "y": 4.5},
+ {"matrix": [4, 3], "x": 3, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5},
+ {"matrix": [5, 1], "x": 1, "y": 5.5, "w": 2},
+ {"matrix": [5, 3], "x": 3, "y": 5.5},
+ {"matrix": [4, 4], "x": 4, "y": 4.5, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wekey/we27/rules.mk b/keyboards/wekey/we27/rules.mk
index 1c5cc136ca4..942ef4c5dbd 100644
--- a/keyboards/wekey/we27/rules.mk
+++ b/keyboards/wekey/we27/rules.mk
@@ -1,16 +1 @@
-# 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
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
-
RGB_MATRIX_CUSTOM_KB = yes
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
deleted file mode 100644
index 4e85b2e402a..00000000000
--- a/keyboards/westm/westmergo/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
deleted file mode 100644
index de733b988a8..00000000000
--- a/keyboards/westm/westmergo/info.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "keyboard_name": "WestMErgo",
- "manufacturer": "WestM",
- "url": "https://github.com/WestMProducts",
- "maintainer": "WestM",
- "usb": {
- "vid": "0x574D",
- "pid": "0x0201",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 16,
- "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": {
- "pin": "A8"
- },
- "matrix_pins": {
- "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
- "rows": ["A13", "B9", "F1", "A10", "A9"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "community_layouts": ["alice"],
- "layouts": {
- "LAYOUT_alice": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.5, "y": 0},
- {"matrix": [0, 2], "x": 2.5, "y": 0},
- {"matrix": [0, 3], "x": 3.5, "y": 0},
- {"matrix": [0, 4], "x": 4.5, "y": 0},
- {"matrix": [0, 5], "x": 5.5, "y": 0},
- {"matrix": [0, 6], "x": 6.5, "y": 0},
- {"matrix": [0, 7], "x": 7.5, "y": 0},
-
- {"matrix": [0, 8], "x": 10.5, "y": 0},
- {"matrix": [0, 9], "x": 11.5, "y": 0},
- {"matrix": [0, 10], "x": 12.5, "y": 0},
- {"matrix": [0, 11], "x": 13.5, "y": 0},
- {"matrix": [0, 13], "x": 14.5, "y": 0},
- {"matrix": [0, 14], "x": 15.5, "y": 0},
- {"matrix": [0, 15], "x": 16.5, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 3], "x": 4, "y": 1},
- {"matrix": [1, 4], "x": 5, "y": 1},
- {"matrix": [1, 5], "x": 6, "y": 1},
- {"matrix": [1, 6], "x": 7, "y": 1},
-
- {"matrix": [1, 8], "x": 10, "y": 1},
- {"matrix": [1, 9], "x": 11, "y": 1},
- {"matrix": [1, 10], "x": 12, "y": 1},
- {"matrix": [1, 11], "x": 13, "y": 1},
- {"matrix": [1, 12], "x": 14, "y": 1},
- {"matrix": [1, 13], "x": 15, "y": 1},
- {"matrix": [1, 14], "x": 16, "y": 1},
- {"matrix": [1, 15], "x": 17, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3.25, "y": 2},
- {"matrix": [2, 3], "x": 4.25, "y": 2},
- {"matrix": [2, 4], "x": 5.25, "y": 2},
- {"matrix": [2, 5], "x": 6.25, "y": 2},
- {"matrix": [2, 6], "x": 7.25, "y": 2},
-
- {"matrix": [2, 8], "x": 10.25, "y": 2},
- {"matrix": [2, 9], "x": 11.25, "y": 2},
- {"matrix": [2, 10], "x": 12.25, "y": 2},
- {"matrix": [2, 11], "x": 13.25, "y": 2},
- {"matrix": [2, 12], "x": 14.25, "y": 2},
- {"matrix": [2, 13], "x": 15.25, "y": 2},
- {"matrix": [2, 15], "x": 16.25, "y": 2, "w": 2.25},
-
- {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.75, "y": 3},
- {"matrix": [3, 3], "x": 4.75, "y": 3},
- {"matrix": [3, 4], "x": 5.75, "y": 3},
- {"matrix": [3, 5], "x": 6.75, "y": 3},
- {"matrix": [3, 6], "x": 7.75, "y": 3},
-
- {"matrix": [3, 8], "x": 9.75, "y": 3},
- {"matrix": [3, 9], "x": 10.75, "y": 3},
- {"matrix": [3, 10], "x": 11.75, "y": 3},
- {"matrix": [3, 11], "x": 12.75, "y": 3},
- {"matrix": [3, 12], "x": 13.75, "y": 3},
- {"matrix": [3, 13], "x": 14.75, "y": 3},
- {"matrix": [3, 14], "x": 15.75, "y": 3, "w": 1.75},
- {"matrix": [3, 15], "x": 17.5, "y": 3},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
- {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
- {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
- {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 2.75},
- {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 15], "x": 17, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/westm/westmergo/keyboard.json b/keyboards/westm/westmergo/keyboard.json
new file mode 100644
index 00000000000..0ead8662029
--- /dev/null
+++ b/keyboards/westm/westmergo/keyboard.json
@@ -0,0 +1,134 @@
+{
+ "keyboard_name": "WestMErgo",
+ "manufacturer": "WestM",
+ "url": "https://github.com/WestMProducts",
+ "maintainer": "WestM",
+ "usb": {
+ "vid": "0x574D",
+ "pid": "0x0201",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgblight": {
+ "led_count": 16,
+ "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": {
+ "pin": "A8"
+ },
+ "matrix_pins": {
+ "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["A13", "B9", "F1", "A10", "A9"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "community_layouts": ["alice"],
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 8], "x": 10.5, "y": 0},
+ {"matrix": [0, 9], "x": 11.5, "y": 0},
+ {"matrix": [0, 10], "x": 12.5, "y": 0},
+ {"matrix": [0, 11], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+
+ {"matrix": [1, 8], "x": 10, "y": 1},
+ {"matrix": [1, 9], "x": 11, "y": 1},
+ {"matrix": [1, 10], "x": 12, "y": 1},
+ {"matrix": [1, 11], "x": 13, "y": 1},
+ {"matrix": [1, 12], "x": 14, "y": 1},
+ {"matrix": [1, 13], "x": 15, "y": 1},
+ {"matrix": [1, 14], "x": 16, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 8], "x": 10.25, "y": 2},
+ {"matrix": [2, 9], "x": 11.25, "y": 2},
+ {"matrix": [2, 10], "x": 12.25, "y": 2},
+ {"matrix": [2, 11], "x": 13.25, "y": 2},
+ {"matrix": [2, 12], "x": 14.25, "y": 2},
+ {"matrix": [2, 13], "x": 15.25, "y": 2},
+ {"matrix": [2, 15], "x": 16.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 10], "x": 11.75, "y": 3},
+ {"matrix": [3, 11], "x": 12.75, "y": 3},
+ {"matrix": [3, 12], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 14], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 15], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 15], "x": 17, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/westm/westmergo/rules.mk b/keyboards/westm/westmergo/rules.mk
index aae254503b0..0ab54aaaf71 100644
--- a/keyboards/westm/westmergo/rules.mk
+++ b/keyboards/westm/westmergo/rules.mk
@@ -1,15 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
\ No newline at end of file
diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json
deleted file mode 100644
index b3e6970a3cb..00000000000
--- a/keyboards/whale/sk/v3/info.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
- "keyboard_name": "Splite Keyboard v3",
- "manufacturer": "Whale Mo",
- "url": "https://github.com/ncwhale/Keyboard_Design/tree/master/Splite-Keyboard-v3",
- "maintainer": "ncwhale",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0495",
- "device_version": "0.0.3"
- },
- "matrix_pins": {
- "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"],
- "rows": ["B1", "B2", "B3", "B4", "B5", "B6"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "debounce": 3,
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0.25, "y": 0},
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
-
- {"matrix": [10, 6], "x": 11.5, "y": 0, "w": 1.25},
- {"matrix": [6, 6], "x": 12.75, "y": 0},
- {"matrix": [6, 5], "x": 13.75, "y": 0},
- {"matrix": [6, 4], "x": 14.75, "y": 0},
- {"matrix": [6, 3], "x": 15.75, "y": 0},
- {"matrix": [6, 2], "x": 16.75, "y": 0},
- {"matrix": [6, 1], "x": 17.75, "y": 0},
- {"matrix": [6, 0], "x": 18.75, "y": 0},
-
- {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 2, "y": 1},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 3], "x": 4, "y": 1},
- {"matrix": [1, 4], "x": 5, "y": 1},
- {"matrix": [1, 5], "x": 6, "y": 1},
- {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
-
- {"matrix": [7, 6], "x": 11.5, "y": 1, "w": 1.5},
- {"matrix": [7, 5], "x": 13, "y": 1},
- {"matrix": [7, 4], "x": 14, "y": 1},
- {"matrix": [7, 3], "x": 15, "y": 1},
- {"matrix": [7, 2], "x": 16, "y": 1},
- {"matrix": [7, 1], "x": 17, "y": 1},
- {"matrix": [7, 0], "x": 18, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2, "w": 1.5},
-
- {"matrix": [8, 6], "x": 11.75, "y": 2, "w": 1.5},
- {"matrix": [8, 5], "x": 13.25, "y": 2},
- {"matrix": [8, 4], "x": 14.25, "y": 2},
- {"matrix": [8, 3], "x": 15.25, "y": 2},
- {"matrix": [8, 2], "x": 16.25, "y": 2},
- {"matrix": [8, 1], "x": 17.25, "y": 2},
- {"matrix": [8, 0], "x": 18.25, "y": 2, "w": 1.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
- {"matrix": [3, 1], "x": 1.5, "y": 3},
- {"matrix": [3, 2], "x": 2.5, "y": 3},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3},
- {"matrix": [3, 5], "x": 5.5, "y": 3},
- {"matrix": [3, 6], "x": 6.5, "y": 3},
-
- {"matrix": [9, 6], "x": 12.5, "y": 3},
- {"matrix": [9, 5], "x": 13.5, "y": 3},
- {"matrix": [9, 4], "x": 14.5, "y": 3},
- {"matrix": [9, 3], "x": 15.5, "y": 3},
- {"matrix": [9, 2], "x": 16.5, "y": 3},
- {"matrix": [9, 1], "x": 17.5, "y": 3},
- {"matrix": [9, 0], "x": 18.5, "y": 3, "w": 1.5},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
-
- {"matrix": [10, 5], "x": 14, "y": 4},
- {"matrix": [10, 4], "x": 15, "y": 4},
- {"matrix": [10, 3], "x": 16, "y": 4},
- {"matrix": [10, 2], "x": 17, "y": 4},
- {"matrix": [10, 1], "x": 18, "y": 4},
- {"matrix": [10, 0], "x": 19, "y": 4},
-
- {"matrix": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
- {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
-
- {"matrix": [11, 2], "x": 10.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
- {"matrix": [11, 1], "x": 11.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
-
- {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
- {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
- {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
-
- {"matrix": [11, 4], "x": 10.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
- {"matrix": [11, 3], "x": 11.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
- {"matrix": [11, 0], "x": 12.5, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
-
- {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
- {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
-
- {"matrix": [11, 6], "x": 10.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
- {"matrix": [11, 5], "x": 11.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
- ]
- },
- "LAYOUT_left_half_only": {
- "layout": [
- {"matrix": [0, 0], "x": 0.25, "y": 0},
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
-
- {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 2, "y": 1},
- {"matrix": [1, 2], "x": 3, "y": 1},
- {"matrix": [1, 3], "x": 4, "y": 1},
- {"matrix": [1, 4], "x": 5, "y": 1},
- {"matrix": [1, 5], "x": 6, "y": 1},
- {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2, "w": 1.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
- {"matrix": [3, 1], "x": 1.5, "y": 3},
- {"matrix": [3, 2], "x": 2.5, "y": 3},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3},
- {"matrix": [3, 5], "x": 5.5, "y": 3},
- {"matrix": [3, 6], "x": 6.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
- {"matrix": [4, 1], "x": 1, "y": 4},
- {"matrix": [4, 2], "x": 2, "y": 4},
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 4], "x": 4, "y": 4},
- {"matrix": [4, 5], "x": 5, "y": 4},
-
- {"matrix": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
- {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
-
- {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
- {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
- {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
-
- {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
- {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5}
- ]
- },
- "LAYOUT_right_half_only": {
- "layout": [
- {"matrix": [4, 6], "x": 1, "y": 0, "w": 1.25},
- {"matrix": [0, 6], "x": 2.25, "y": 0},
- {"matrix": [0, 5], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 3], "x": 5.25, "y": 0},
- {"matrix": [0, 2], "x": 6.25, "y": 0},
- {"matrix": [0, 1], "x": 7.25, "y": 0},
- {"matrix": [0, 0], "x": 8.25, "y": 0},
-
- {"matrix": [1, 6], "x": 1, "y": 1, "w": 1.5},
- {"matrix": [1, 5], "x": 2.5, "y": 1},
- {"matrix": [1, 4], "x": 3.5, "y": 1},
- {"matrix": [1, 3], "x": 4.5, "y": 1},
- {"matrix": [1, 2], "x": 5.5, "y": 1},
- {"matrix": [1, 1], "x": 6.5, "y": 1},
- {"matrix": [1, 0], "x": 7.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 6], "x": 1.25, "y": 2, "w": 1.5},
- {"matrix": [2, 5], "x": 2.75, "y": 2},
- {"matrix": [2, 4], "x": 3.75, "y": 2},
- {"matrix": [2, 3], "x": 4.75, "y": 2},
- {"matrix": [2, 2], "x": 5.75, "y": 2},
- {"matrix": [2, 1], "x": 6.75, "y": 2},
- {"matrix": [2, 0], "x": 7.75, "y": 2, "w": 1.5},
-
- {"matrix": [3, 6], "x": 2, "y": 3},
- {"matrix": [3, 5], "x": 3, "y": 3},
- {"matrix": [3, 4], "x": 4, "y": 3},
- {"matrix": [3, 3], "x": 5, "y": 3},
- {"matrix": [3, 2], "x": 6, "y": 3},
- {"matrix": [3, 1], "x": 7, "y": 3},
- {"matrix": [3, 0], "x": 8, "y": 3, "w": 1.5},
-
- {"matrix": [4, 5], "x": 3.5, "y": 4},
- {"matrix": [4, 4], "x": 4.5, "y": 4},
- {"matrix": [4, 3], "x": 5.5, "y": 4},
- {"matrix": [4, 2], "x": 6.5, "y": 4},
- {"matrix": [4, 1], "x": 7.5, "y": 4},
- {"matrix": [4, 0], "x": 8.5, "y": 4},
-
- {"matrix": [5, 2], "x": 0, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
- {"matrix": [5, 1], "x": 1, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
-
- {"matrix": [5, 4], "x": 0, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
- {"matrix": [5, 3], "x": 1, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
- {"matrix": [5, 0], "x": 2, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
-
- {"matrix": [5, 6], "x": 0, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
- {"matrix": [5, 5], "x": 1, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
- ]
- }
- }
-}
diff --git a/keyboards/whale/sk/v3/keyboard.json b/keyboards/whale/sk/v3/keyboard.json
new file mode 100644
index 00000000000..ce73d8251cb
--- /dev/null
+++ b/keyboards/whale/sk/v3/keyboard.json
@@ -0,0 +1,242 @@
+{
+ "keyboard_name": "Splite Keyboard v3",
+ "manufacturer": "Whale Mo",
+ "url": "https://github.com/ncwhale/Keyboard_Design/tree/master/Splite-Keyboard-v3",
+ "maintainer": "ncwhale",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0495",
+ "device_version": "0.0.3"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"],
+ "rows": ["B1", "B2", "B3", "B4", "B5", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true,
+ "transport": {
+ "protocol": "custom"
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "debounce": 3,
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.25, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
+
+ {"matrix": [10, 6], "x": 11.5, "y": 0, "w": 1.25},
+ {"matrix": [6, 6], "x": 12.75, "y": 0},
+ {"matrix": [6, 5], "x": 13.75, "y": 0},
+ {"matrix": [6, 4], "x": 14.75, "y": 0},
+ {"matrix": [6, 3], "x": 15.75, "y": 0},
+ {"matrix": [6, 2], "x": 16.75, "y": 0},
+ {"matrix": [6, 1], "x": 17.75, "y": 0},
+ {"matrix": [6, 0], "x": 18.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
+
+ {"matrix": [7, 6], "x": 11.5, "y": 1, "w": 1.5},
+ {"matrix": [7, 5], "x": 13, "y": 1},
+ {"matrix": [7, 4], "x": 14, "y": 1},
+ {"matrix": [7, 3], "x": 15, "y": 1},
+ {"matrix": [7, 2], "x": 16, "y": 1},
+ {"matrix": [7, 1], "x": 17, "y": 1},
+ {"matrix": [7, 0], "x": 18, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2, "w": 1.5},
+
+ {"matrix": [8, 6], "x": 11.75, "y": 2, "w": 1.5},
+ {"matrix": [8, 5], "x": 13.25, "y": 2},
+ {"matrix": [8, 4], "x": 14.25, "y": 2},
+ {"matrix": [8, 3], "x": 15.25, "y": 2},
+ {"matrix": [8, 2], "x": 16.25, "y": 2},
+ {"matrix": [8, 1], "x": 17.25, "y": 2},
+ {"matrix": [8, 0], "x": 18.25, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+
+ {"matrix": [9, 6], "x": 12.5, "y": 3},
+ {"matrix": [9, 5], "x": 13.5, "y": 3},
+ {"matrix": [9, 4], "x": 14.5, "y": 3},
+ {"matrix": [9, 3], "x": 15.5, "y": 3},
+ {"matrix": [9, 2], "x": 16.5, "y": 3},
+ {"matrix": [9, 1], "x": 17.5, "y": 3},
+ {"matrix": [9, 0], "x": 18.5, "y": 3, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [10, 5], "x": 14, "y": 4},
+ {"matrix": [10, 4], "x": 15, "y": 4},
+ {"matrix": [10, 3], "x": 16, "y": 4},
+ {"matrix": [10, 2], "x": 17, "y": 4},
+ {"matrix": [10, 1], "x": 18, "y": 4},
+ {"matrix": [10, 0], "x": 19, "y": 4},
+
+ {"matrix": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+ {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+
+ {"matrix": [11, 2], "x": 10.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+ {"matrix": [11, 1], "x": 11.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+
+ {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+ {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+
+ {"matrix": [11, 4], "x": 10.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+ {"matrix": [11, 3], "x": 11.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+ {"matrix": [11, 0], "x": 12.5, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
+
+ {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
+ {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
+
+ {"matrix": [11, 6], "x": 10.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
+ {"matrix": [11, 5], "x": 11.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
+ ]
+ },
+ "LAYOUT_left_half_only": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0.25, "y": 0},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+
+ {"matrix": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+ {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+
+ {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+ {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+
+ {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
+ {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5}
+ ]
+ },
+ "LAYOUT_right_half_only": {
+ "layout": [
+ {"matrix": [4, 6], "x": 1, "y": 0, "w": 1.25},
+ {"matrix": [0, 6], "x": 2.25, "y": 0},
+ {"matrix": [0, 5], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 3], "x": 5.25, "y": 0},
+ {"matrix": [0, 2], "x": 6.25, "y": 0},
+ {"matrix": [0, 1], "x": 7.25, "y": 0},
+ {"matrix": [0, 0], "x": 8.25, "y": 0},
+
+ {"matrix": [1, 6], "x": 1, "y": 1, "w": 1.5},
+ {"matrix": [1, 5], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 3], "x": 4.5, "y": 1},
+ {"matrix": [1, 2], "x": 5.5, "y": 1},
+ {"matrix": [1, 1], "x": 6.5, "y": 1},
+ {"matrix": [1, 0], "x": 7.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 6], "x": 1.25, "y": 2, "w": 1.5},
+ {"matrix": [2, 5], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 3], "x": 4.75, "y": 2},
+ {"matrix": [2, 2], "x": 5.75, "y": 2},
+ {"matrix": [2, 1], "x": 6.75, "y": 2},
+ {"matrix": [2, 0], "x": 7.75, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 6], "x": 2, "y": 3},
+ {"matrix": [3, 5], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 3], "x": 5, "y": 3},
+ {"matrix": [3, 2], "x": 6, "y": 3},
+ {"matrix": [3, 1], "x": 7, "y": 3},
+ {"matrix": [3, 0], "x": 8, "y": 3, "w": 1.5},
+
+ {"matrix": [4, 5], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 3], "x": 5.5, "y": 4},
+ {"matrix": [4, 2], "x": 6.5, "y": 4},
+ {"matrix": [4, 1], "x": 7.5, "y": 4},
+ {"matrix": [4, 0], "x": 8.5, "y": 4},
+
+ {"matrix": [5, 2], "x": 0, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+ {"matrix": [5, 1], "x": 1, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+
+ {"matrix": [5, 4], "x": 0, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+ {"matrix": [5, 3], "x": 1, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+ {"matrix": [5, 0], "x": 2, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
+
+ {"matrix": [5, 6], "x": 0, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
+ {"matrix": [5, 5], "x": 1, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/whale/sk/v3/rules.mk b/keyboards/whale/sk/v3/rules.mk
deleted file mode 100644
index 21303846dcc..00000000000
--- a/keyboards/whale/sk/v3/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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
-SPLIT_TRANSPORT = custom
diff --git a/keyboards/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/info.json
deleted file mode 100644
index d4a5d079b3c..00000000000
--- a/keyboards/wilba_tech/rama_works_kara/info.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
- "keyboard_name": "KARA",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x4B52",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["60_hhkb"],
- "layouts": {
- "LAYOUT_60_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_kara/keyboard.json b/keyboards/wilba_tech/rama_works_kara/keyboard.json
new file mode 100644
index 00000000000..896892e2847
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_kara/keyboard.json
@@ -0,0 +1,95 @@
+{
+ "keyboard_name": "KARA",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x4B52",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["60_hhkb"],
+ "layouts": {
+ "LAYOUT_60_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_kara/rules.mk b/keyboards/wilba_tech/rama_works_kara/rules.mk
index b49711824a2..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_kara/rules.mk
+++ b/keyboards/wilba_tech/rama_works_kara/rules.mk
@@ -3,24 +3,11 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/info.json
deleted file mode 100644
index 6d3def254d5..00000000000
--- a/keyboards/wilba_tech/rama_works_koyu/info.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
- "keyboard_name": "KOYU",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x4B59",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
- },
- "community_layouts": [
- "65_ansi_blocker_tsangan_split_bs"
- ],
- "layouts": {
- "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ",", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_koyu/keyboard.json b/keyboards/wilba_tech/rama_works_koyu/keyboard.json
new file mode 100644
index 00000000000..507b5e1546f
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_koyu/keyboard.json
@@ -0,0 +1,108 @@
+{
+ "keyboard_name": "KOYU",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x4B59",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
+ },
+ "community_layouts": [
+ "65_ansi_blocker_tsangan_split_bs"
+ ],
+ "layouts": {
+ "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ",", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/wilba_tech/rama_works_koyu/rules.mk
index c921fc5c184..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_koyu/rules.mk
+++ b/keyboards/wilba_tech/rama_works_koyu/rules.mk
@@ -3,24 +3,11 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/info.json
deleted file mode 100644
index 3b75a67557e..00000000000
--- a/keyboards/wilba_tech/rama_works_m10_c/info.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "keyboard_name": "M10-C",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x00AC",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"],
- "rows": ["E6"]
- },
- "diode_direction": "COL2ROW",
- "dynamic_keymap": {
- "layer_count": 10
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": 0, "y": 1},
- {"matrix": [0, 4], "x": 1, "y": 1},
- {"matrix": [0, 5], "x": 2, "y": 1},
-
- {"matrix": [0, 6], "x": 0, "y": 2},
- {"matrix": [0, 7], "x": 1, "y": 2},
- {"matrix": [0, 8], "x": 2, "y": 2},
-
- {"matrix": [0, 9], "x": 1, "y": 3, "w": 2}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_m10_c/keyboard.json b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json
new file mode 100644
index 00000000000..bba4720aa34
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json
@@ -0,0 +1,46 @@
+{
+ "keyboard_name": "M10-C",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x00AC",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"],
+ "rows": ["E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 10
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1},
+
+ {"matrix": [0, 6], "x": 0, "y": 2},
+ {"matrix": [0, 7], "x": 1, "y": 2},
+ {"matrix": [0, 8], "x": 2, "y": 2},
+
+ {"matrix": [0, 9], "x": 1, "y": 3, "w": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_m10_c/rules.mk b/keyboards/wilba_tech/rama_works_m10_c/rules.mk
index d8a2bae4553..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m10_c/rules.mk
@@ -1,25 +1,13 @@
-# 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
-CIE1931_CURVE = yes
-
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/info.json
deleted file mode 100644
index 5745804c5dd..00000000000
--- a/keyboards/wilba_tech/rama_works_m50_a/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- "keyboard_name": "M50-A",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x050A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"],
- "rows": ["F0", "F1", "F5", "F6"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
- {"matrix": [0, 8], "x": 8.25, "y": 0},
- {"matrix": [0, 9], "x": 9.25, "y": 0},
- {"matrix": [0, 10], "x": 10.25, "y": 0},
- {"matrix": [0, 11], "x": 11.25, "y": 0},
- {"matrix": [0, 12], "x": 12.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1},
- {"matrix": [1, 2], "x": 2.25, "y": 1},
- {"matrix": [1, 3], "x": 3.25, "y": 1},
- {"matrix": [1, 4], "x": 4.25, "y": 1},
- {"matrix": [1, 5], "x": 5.25, "y": 1},
- {"matrix": [1, 6], "x": 6.25, "y": 1},
- {"matrix": [1, 7], "x": 7.25, "y": 1},
- {"matrix": [1, 8], "x": 8.25, "y": 1},
- {"matrix": [1, 9], "x": 9.25, "y": 1},
- {"matrix": [1, 10], "x": 10.25, "y": 1},
- {"matrix": [1, 11], "x": 11.25, "y": 1},
- {"matrix": [1, 12], "x": 12.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.25, "y": 2},
- {"matrix": [2, 2], "x": 2.25, "y": 2},
- {"matrix": [2, 3], "x": 3.25, "y": 2},
- {"matrix": [2, 4], "x": 4.25, "y": 2},
- {"matrix": [2, 5], "x": 5.25, "y": 2},
- {"matrix": [2, 6], "x": 6.25, "y": 2},
- {"matrix": [2, 7], "x": 7.25, "y": 2},
- {"matrix": [2, 8], "x": 8.25, "y": 2},
- {"matrix": [2, 9], "x": 9.25, "y": 2},
- {"matrix": [2, 10], "x": 10.25, "y": 2},
- {"matrix": [2, 11], "x": 11.25, "y": 2},
- {"matrix": [2, 12], "x": 12.25, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_m50_a/keyboard.json b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json
new file mode 100644
index 00000000000..bf33a12277f
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json
@@ -0,0 +1,88 @@
+{
+ "keyboard_name": "M50-A",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x050A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"],
+ "rows": ["F0", "F1", "F5", "F6"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1},
+ {"matrix": [1, 12], "x": 12.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+ {"matrix": [2, 6], "x": 6.25, "y": 2},
+ {"matrix": [2, 7], "x": 7.25, "y": 2},
+ {"matrix": [2, 8], "x": 8.25, "y": 2},
+ {"matrix": [2, 9], "x": 9.25, "y": 2},
+ {"matrix": [2, 10], "x": 10.25, "y": 2},
+ {"matrix": [2, 11], "x": 11.25, "y": 2},
+ {"matrix": [2, 12], "x": 12.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_m50_a/rules.mk b/keyboards/wilba_tech/rama_works_m50_a/rules.mk
index d8a2bae4553..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m50_a/rules.mk
@@ -1,25 +1,13 @@
-# 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
-CIE1931_CURVE = yes
-
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/info.json
deleted file mode 100644
index 32f6f2a5d3d..00000000000
--- a/keyboards/wilba_tech/rama_works_m60_a/info.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
- "keyboard_name": "M60-A",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x060A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["60_hhkb"],
- "layouts": {
- "LAYOUT_60_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keyboard.json b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json
new file mode 100644
index 00000000000..566f6cd42a4
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json
@@ -0,0 +1,95 @@
+{
+ "keyboard_name": "M60-A",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x060A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["60_hhkb"],
+ "layouts": {
+ "LAYOUT_60_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_m60_a/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/rules.mk
index c921fc5c184..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m60_a/rules.mk
@@ -3,24 +3,11 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/info.json
deleted file mode 100644
index 5bc67f79251..00000000000
--- a/keyboards/wilba_tech/rama_works_m65_b/info.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
- "keyboard_name": "M65-B",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x065B",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
- },
- "community_layouts": [
- "65_ansi_blocker_tsangan_split_bs"
- ],
- "layouts": {
- "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_m65_b/keyboard.json b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json
new file mode 100644
index 00000000000..156affff7da
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json
@@ -0,0 +1,108 @@
+{
+ "keyboard_name": "M65-B",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x065B",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
+ },
+ "community_layouts": [
+ "65_ansi_blocker_tsangan_split_bs"
+ ],
+ "layouts": {
+ "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_m65_b/rules.mk b/keyboards/wilba_tech/rama_works_m65_b/rules.mk
index d8a2bae4553..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m65_b/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m65_b/rules.mk
@@ -1,25 +1,13 @@
-# 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
-CIE1931_CURVE = yes
-
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/info.json
deleted file mode 100644
index 113dae991ba..00000000000
--- a/keyboards/wilba_tech/rama_works_m65_bx/info.json
+++ /dev/null
@@ -1,178 +0,0 @@
-{
- "keyboard_name": "M65-BX",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x165B",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
- },
- "community_layouts": [
- "65_ansi_blocker_tsangan",
- "65_ansi_blocker_tsangan_split_bs"
- ],
- "layouts": {
- "LAYOUT_65_ansi_blocker_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json
new file mode 100644
index 00000000000..9b4edcc6efc
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json
@@ -0,0 +1,184 @@
+{
+ "keyboard_name": "M65-BX",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x165B",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_blocker_tsangan_split_bs"
+ },
+ "community_layouts": [
+ "65_ansi_blocker_tsangan",
+ "65_ansi_blocker_tsangan_split_bs"
+ ],
+ "layouts": {
+ "LAYOUT_65_ansi_blocker_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn2", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
index d8a2bae4553..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk
@@ -1,25 +1,13 @@
-# 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
-CIE1931_CURVE = yes
-
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
+
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/info.json
deleted file mode 100644
index 73091d30363..00000000000
--- a/keyboards/wilba_tech/rama_works_m6_a/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "keyboard_name": "M6-A",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x006A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
- "rows": ["E6"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": 0, "y": 1},
- {"matrix": [0, 4], "x": 1, "y": 1},
- {"matrix": [0, 5], "x": 2, "y": 1}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_m6_a/keyboard.json b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json
new file mode 100644
index 00000000000..df7fc90a962
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json
@@ -0,0 +1,37 @@
+{
+ "keyboard_name": "M6-A",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x006A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
+ "rows": ["E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_m6_a/rules.mk b/keyboards/wilba_tech/rama_works_m6_a/rules.mk
index 95303152b9b..806a82e12af 100644
--- a/keyboards/wilba_tech/rama_works_m6_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m6_a/rules.mk
@@ -2,16 +2,3 @@
# when we get USB suspend event. We want it to keep updating
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
diff --git a/keyboards/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/info.json
deleted file mode 100644
index 4356011aae1..00000000000
--- a/keyboards/wilba_tech/rama_works_m6_b/info.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "keyboard_name": "M6-B",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x006B",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
- "rows": ["E6"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": 0, "y": 1},
- {"matrix": [0, 4], "x": 1, "y": 1},
- {"matrix": [0, 5], "x": 2, "y": 1}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_m6_b/keyboard.json b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json
new file mode 100644
index 00000000000..4d258b826b9
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json
@@ -0,0 +1,37 @@
+{
+ "keyboard_name": "M6-B",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x006B",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D4", "B5", "F4", "D7", "C6", "F6"],
+ "rows": ["E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_m6_b/rules.mk b/keyboards/wilba_tech/rama_works_m6_b/rules.mk
index eff0605d909..4650d7a6ea2 100644
--- a/keyboards/wilba_tech/rama_works_m6_b/rules.mk
+++ b/keyboards/wilba_tech/rama_works_m6_b/rules.mk
@@ -3,24 +3,11 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3218.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/info.json
deleted file mode 100644
index 96349f39093..00000000000
--- a/keyboards/wilba_tech/rama_works_u80_a/info.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
- "keyboard_name": "U80-A",
- "manufacturer": "RAMA WORKS",
- "url": "http://rama.works",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5241",
- "pid": "0x080A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
- "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
- },
- "community_layouts": [
- "tkl_ansi_tsangan"
- ],
- "layouts": {
- "LAYOUT_tkl_ansi_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
- {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5},
- {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.5},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5},
- {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.5},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.5},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
- {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
- {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
- {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.5},
- {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.5},
- {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/rama_works_u80_a/keyboard.json b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json
new file mode 100644
index 00000000000..bf06d9508f2
--- /dev/null
+++ b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json
@@ -0,0 +1,135 @@
+{
+ "keyboard_name": "U80-A",
+ "manufacturer": "RAMA WORKS",
+ "url": "http://rama.works",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5241",
+ "pid": "0x080A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+ "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
+ },
+ "community_layouts": [
+ "tkl_ansi_tsangan"
+ ],
+ "layouts": {
+ "LAYOUT_tkl_ansi_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.5},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.5, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5},
+ {"label": "Fn", "matrix": [5, 12], "x": 12.5, "y": 5.5},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/rama_works_u80_a/rules.mk b/keyboards/wilba_tech/rama_works_u80_a/rules.mk
index b2629858808..d6df34b9bc0 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/rules.mk
+++ b/keyboards/wilba_tech/rama_works_u80_a/rules.mk
@@ -1,19 +1,8 @@
-# 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
-AUDIO_ENABLE = no # Audio output
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/info.json
deleted file mode 100644
index 6016905bdc3..00000000000
--- a/keyboards/wilba_tech/wt60_a/info.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
- "keyboard_name": "WT60-A",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x060A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
- "rows": ["F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_60_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt60_a/keyboard.json b/keyboards/wilba_tech/wt60_a/keyboard.json
new file mode 100644
index 00000000000..1c6d9f8c35d
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_a/keyboard.json
@@ -0,0 +1,166 @@
+{
+ "keyboard_name": "WT60-A",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x060A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+ "rows": ["F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt60_a/rules.mk b/keyboards/wilba_tech/wt60_a/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt60_a/rules.mk
+++ b/keyboards/wilba_tech/wt60_a/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no # Audio output
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = drivers/led/issi/is31fl3736-mono.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt60_b/info.json b/keyboards/wilba_tech/wt60_b/info.json
deleted file mode 100644
index 253c081b9aa..00000000000
--- a/keyboards/wilba_tech/wt60_b/info.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
- "keyboard_name": "WT60-B",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x60B0",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
- },
- "community_layouts": [
- "60_tsangan_hhkb",
- "60_hhkb"
- ],
- "layouts": {
- "LAYOUT_60_tsangan_hhkb": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
- {"label": "\u2298", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
- {"label": "\u2298", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_hhkb": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Control", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt60_b/keyboard.json b/keyboards/wilba_tech/wt60_b/keyboard.json
new file mode 100644
index 00000000000..765ba96f61f
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_b/keyboard.json
@@ -0,0 +1,171 @@
+{
+ "keyboard_name": "WT60-B",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x60B0",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
+ },
+ "community_layouts": [
+ "60_tsangan_hhkb",
+ "60_hhkb"
+ ],
+ "layouts": {
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+ {"label": "\u2298", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "\u2298", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Control", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt60_b/rules.mk b/keyboards/wilba_tech/wt60_b/rules.mk
index 397643d3722..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/wt60_b/rules.mk
+++ b/keyboards/wilba_tech/wt60_b/rules.mk
@@ -3,24 +3,11 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_bx/info.json b/keyboards/wilba_tech/wt60_bx/info.json
deleted file mode 100644
index 1978ce8a4f1..00000000000
--- a/keyboards/wilba_tech/wt60_bx/info.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
- "keyboard_name": "WT60-BX",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x60B1",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
- },
- "community_layouts": [
- "60_tsangan_hhkb",
- "60_hhkb"
- ],
- "layouts": {
- "LAYOUT_60_ansi_tsangan_split_rshift": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
- {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
- {"label": "\u2298", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
- {"label": "\u2298", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_hhkb": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
- {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt60_bx/keyboard.json b/keyboards/wilba_tech/wt60_bx/keyboard.json
new file mode 100644
index 00000000000..6b4b6e9fb18
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_bx/keyboard.json
@@ -0,0 +1,240 @@
+{
+ "keyboard_name": "WT60-BX",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x60B1",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
+ },
+ "community_layouts": [
+ "60_tsangan_hhkb",
+ "60_hhkb"
+ ],
+ "layouts": {
+ "LAYOUT_60_ansi_tsangan_split_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+ {"label": "\u2298", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "\u2298", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+ {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt60_bx/rules.mk b/keyboards/wilba_tech/wt60_bx/rules.mk
index 397643d3722..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/wt60_bx/rules.mk
+++ b/keyboards/wilba_tech/wt60_bx/rules.mk
@@ -3,24 +3,11 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/info.json
deleted file mode 100644
index 652714f52af..00000000000
--- a/keyboards/wilba_tech/wt60_c/info.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
- "keyboard_name": "WT60-C",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x60C0",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
- },
- "community_layouts": [
- "60_tsangan_hhkb",
- "60_hhkb"
- ],
- "layouts": {
- "LAYOUT_60_ansi_tsangan_split_rshift": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
- {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
- {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_hhkb": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Control", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
-
- {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt60_c/keyboard.json b/keyboards/wilba_tech/wt60_c/keyboard.json
new file mode 100644
index 00000000000..569cca93b75
--- /dev/null
+++ b/keyboards/wilba_tech/wt60_c/keyboard.json
@@ -0,0 +1,240 @@
+{
+ "keyboard_name": "WT60-C",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x60C0",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_60_tsangan_hhkb"
+ },
+ "community_layouts": [
+ "60_tsangan_hhkb",
+ "60_hhkb"
+ ],
+ "layouts": {
+ "LAYOUT_60_ansi_tsangan_split_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "Alt", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Fn2", "matrix": [4, 12], "x": 12.5, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Control", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "Fn", "matrix": [3, 13], "x": 14, "y": 3},
+
+ {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "GUI", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"label": "GUI", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt60_c/rules.mk b/keyboards/wilba_tech/wt60_c/rules.mk
index 397643d3722..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/wt60_c/rules.mk
+++ b/keyboards/wilba_tech/wt60_c/rules.mk
@@ -3,24 +3,11 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/info.json
deleted file mode 100644
index 1957c88dd2f..00000000000
--- a/keyboards/wilba_tech/wt65_a/info.json
+++ /dev/null
@@ -1,332 +0,0 @@
-{
- "keyboard_name": "WT65-A",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x065A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
- },
- "community_layouts": [
- "65_ansi_blocker",
- "65_ansi_blocker_split_bs",
- "65_ansi_blocker_tsangan",
- "65_ansi_blocker_tsangan_split_bs"
- ],
- "layouts": {
- "LAYOUT_65_ansi_blocker": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt65_a/keyboard.json b/keyboards/wilba_tech/wt65_a/keyboard.json
new file mode 100644
index 00000000000..ec87e830f07
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_a/keyboard.json
@@ -0,0 +1,338 @@
+{
+ "keyboard_name": "WT65-A",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x065A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs"
+ },
+ "community_layouts": [
+ "65_ansi_blocker",
+ "65_ansi_blocker_split_bs",
+ "65_ansi_blocker_tsangan",
+ "65_ansi_blocker_tsangan_split_bs"
+ ],
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"label": "Fn", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Backspace", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt65_a/rules.mk b/keyboards/wilba_tech/wt65_a/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt65_a/rules.mk
+++ b/keyboards/wilba_tech/wt65_a/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no # Audio output
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = drivers/led/issi/is31fl3736-mono.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/info.json
deleted file mode 100644
index 10de33b143b..00000000000
--- a/keyboards/wilba_tech/wt65_b/info.json
+++ /dev/null
@@ -1,171 +0,0 @@
-{
- "keyboard_name": "WT65-B",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x065B",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_blocker_wkl_split_bs"
- },
- "layouts": {
- "LAYOUT_65_ansi_blocker_wkl": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_blocker_wkl_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt65_b/keyboard.json b/keyboards/wilba_tech/wt65_b/keyboard.json
new file mode 100644
index 00000000000..56f71f3fc11
--- /dev/null
+++ b/keyboards/wilba_tech/wt65_b/keyboard.json
@@ -0,0 +1,177 @@
+{
+ "keyboard_name": "WT65-B",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x065B",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_blocker_wkl_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi_blocker_wkl": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_blocker_wkl_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "GUI", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt65_b/rules.mk b/keyboards/wilba_tech/wt65_b/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt65_b/rules.mk
+++ b/keyboards/wilba_tech/wt65_b/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no # Audio output
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = drivers/led/issi/is31fl3736-mono.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/info.json
deleted file mode 100644
index bd93286a0f1..00000000000
--- a/keyboards/wilba_tech/wt69_a/info.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
- "keyboard_name": "WT69-A",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x069A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs"
- },
- "layouts": {
- "LAYOUT_65_xt_ansi_blocker_tsangan": {
- "layout": [
- {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
- {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
- {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
- {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
- {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
- {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
- {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
- {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
- {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
- {"label": "Home", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
- {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
- {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
- {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
- {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
- {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
- {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
- {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
- {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
- {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
- {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
- {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
- {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
- {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
- {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1},
-
- {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
- {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
- {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
- {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
- {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
- {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
- {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
- {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
- {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
- {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
- {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
- {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
- {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
- {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2},
-
- {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
- {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
- {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
- {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
- {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
- {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
- {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
- {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
- {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
- {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
- {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
- {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
- {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 15], "x": 16.25, "y": 3},
- {"label": "End", "matrix": [3, 16], "x": 17.25, "y": 3},
-
- {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
- {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
- {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4},
- {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 14], "x": 15.25, "y": 4},
- {"label": "\u2193", "matrix": [4, 15], "x": 16.25, "y": 4},
- {"label": "\u2192", "matrix": [4, 16], "x": 17.25, "y": 4}
- ]
- },
- "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
-
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
- {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
- {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
- {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
- {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
- {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
- {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
- {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
- {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
- {"label": "Backspace", "matrix": [2, 15], "x": 16.25, "y": 0},
- {"label": "Home", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
- {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
-
- {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
- {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
- {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
- {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
- {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
- {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
- {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
- {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
- {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
- {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
- {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
- {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
- {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1},
-
- {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
- {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
-
- {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
- {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
- {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
- {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
- {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
- {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
- {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
- {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
- {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
- {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
- {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
- {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2},
-
- {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
- {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
-
- {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
- {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
- {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
- {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
- {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
- {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
- {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
- {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
- {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
- {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
- {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 15], "x": 16.25, "y": 3},
- {"label": "End", "matrix": [3, 16], "x": 17.25, "y": 3},
-
- {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
- {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
-
- {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
- {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4},
- {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
- {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
- {"label": "Fn", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
-
- {"label": "\u2190", "matrix": [4, 14], "x": 15.25, "y": 4},
- {"label": "\u2193", "matrix": [4, 15], "x": 16.25, "y": 4},
- {"label": "\u2192", "matrix": [4, 16], "x": 17.25, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt69_a/keyboard.json b/keyboards/wilba_tech/wt69_a/keyboard.json
new file mode 100644
index 00000000000..8321ae86c40
--- /dev/null
+++ b/keyboards/wilba_tech/wt69_a/keyboard.json
@@ -0,0 +1,204 @@
+{
+ "keyboard_name": "WT69-A",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x069A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_65_xt_ansi_blocker_tsangan": {
+ "layout": [
+ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+ {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+ {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+ {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+ {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+ {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+ {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+ {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+ {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+ {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+ {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+ {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+ {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+ {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+ {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+ {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+ {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+ {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+ {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+ {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+ {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1},
+
+ {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+ {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+ {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+ {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+ {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+ {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+ {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+ {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+ {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+ {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2},
+
+ {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+ {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+ {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+ {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+ {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+ {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+ {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+ {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+ {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+ {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+ {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+ {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+ {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 15], "x": 16.25, "y": 3},
+ {"label": "End", "matrix": [3, 16], "x": 17.25, "y": 3},
+
+ {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+ {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4},
+ {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 14], "x": 15.25, "y": 4},
+ {"label": "\u2193", "matrix": [4, 15], "x": 16.25, "y": 4},
+ {"label": "\u2192", "matrix": [4, 16], "x": 17.25, "y": 4}
+ ]
+ },
+ "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
+ {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
+ {"label": "7", "matrix": [0, 9], "x": 9.25, "y": 0},
+ {"label": "8", "matrix": [0, 10], "x": 10.25, "y": 0},
+ {"label": "9", "matrix": [0, 11], "x": 11.25, "y": 0},
+ {"label": "0", "matrix": [0, 12], "x": 12.25, "y": 0},
+ {"label": "-", "matrix": [0, 13], "x": 13.25, "y": 0},
+ {"label": "=", "matrix": [0, 14], "x": 14.25, "y": 0},
+ {"label": "Backspace", "matrix": [0, 15], "x": 15.25, "y": 0},
+ {"label": "Backspace", "matrix": [2, 15], "x": 16.25, "y": 0},
+ {"label": "Home", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
+
+ {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
+ {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
+ {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
+ {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
+ {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
+ {"label": "Y", "matrix": [1, 8], "x": 8.75, "y": 1},
+ {"label": "U", "matrix": [1, 9], "x": 9.75, "y": 1},
+ {"label": "I", "matrix": [1, 10], "x": 10.75, "y": 1},
+ {"label": "O", "matrix": [1, 11], "x": 11.75, "y": 1},
+ {"label": "P", "matrix": [1, 12], "x": 12.75, "y": 1},
+ {"label": "[", "matrix": [1, 13], "x": 13.75, "y": 1},
+ {"label": "]", "matrix": [1, 14], "x": 14.75, "y": 1},
+ {"label": "\\", "matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1},
+
+ {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
+ {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
+ {"label": "H", "matrix": [2, 8], "x": 9, "y": 2},
+ {"label": "J", "matrix": [2, 9], "x": 10, "y": 2},
+ {"label": "K", "matrix": [2, 10], "x": 11, "y": 2},
+ {"label": "L", "matrix": [2, 11], "x": 12, "y": 2},
+ {"label": ";", "matrix": [2, 12], "x": 13, "y": 2},
+ {"label": "'", "matrix": [2, 13], "x": 14, "y": 2},
+ {"label": "Enter", "matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2},
+
+ {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
+ {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
+
+ {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
+ {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
+ {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
+ {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
+ {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
+ {"label": "N", "matrix": [3, 9], "x": 9.5, "y": 3},
+ {"label": "M", "matrix": [3, 10], "x": 10.5, "y": 3},
+ {"label": ",", "matrix": [3, 11], "x": 11.5, "y": 3},
+ {"label": ".", "matrix": [3, 12], "x": 12.5, "y": 3},
+ {"label": "/", "matrix": [3, 13], "x": 13.5, "y": 3},
+ {"label": "Shift", "matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 15], "x": 16.25, "y": 3},
+ {"label": "End", "matrix": [3, 16], "x": 17.25, "y": 3},
+
+ {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
+ {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
+
+ {"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4},
+ {"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5},
+ {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 7},
+ {"label": "Fn", "matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [4, 14], "x": 15.25, "y": 4},
+ {"label": "\u2193", "matrix": [4, 15], "x": 16.25, "y": 4},
+ {"label": "\u2192", "matrix": [4, 16], "x": 17.25, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt69_a/rules.mk b/keyboards/wilba_tech/wt69_a/rules.mk
index 396da8c7344..c0b7344f731 100644
--- a/keyboards/wilba_tech/wt69_a/rules.mk
+++ b/keyboards/wilba_tech/wt69_a/rules.mk
@@ -1,14 +1,2 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-
# project specific files
SRC = keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/info.json
deleted file mode 100644
index 5cbb6f1f8b6..00000000000
--- a/keyboards/wilba_tech/wt75_a/info.json
+++ /dev/null
@@ -1,388 +0,0 @@
-{
- "keyboard_name": "WT75-A",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x075A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_ansi_blocker_split_bs"
- },
- "layouts": {
- "LAYOUT_ansi_blocker": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
- {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
- {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
- {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
- {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
- {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
- {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
- {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
- {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_blocker_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
-
- {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
- {"label": "Backspace", "matrix": [3, 13], "x": 14, "y": 1.25},
- {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
- {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
- {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
- {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
- {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
- {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
- {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-
- {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_blocker_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
- {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
- {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
- {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
- {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
- {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
- {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
- {"label": "Backspace", "matrix": [3, 13], "x": 14, "y": 1.25},
- {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
- {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
- {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
- {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
- {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt75_a/keyboard.json b/keyboards/wilba_tech/wt75_a/keyboard.json
new file mode 100644
index 00000000000..609dff0c36f
--- /dev/null
+++ b/keyboards/wilba_tech/wt75_a/keyboard.json
@@ -0,0 +1,394 @@
+{
+ "keyboard_name": "WT75-A",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x075A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_ansi_blocker_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_ansi_blocker": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+ {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
+ {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_blocker_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
+
+ {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Backspace", "matrix": [3, 13], "x": 14, "y": 1.25},
+ {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
+ {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_blocker_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+ {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
+ {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0},
+ {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 12, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Backspace", "matrix": [3, 13], "x": 14, "y": 1.25},
+ {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"label": "Page Up", "matrix": [2, 14], "x": 15, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"label": "Page Down", "matrix": [3, 14], "x": 15, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4.25},
+ {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt75_a/rules.mk b/keyboards/wilba_tech/wt75_a/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt75_a/rules.mk
+++ b/keyboards/wilba_tech/wt75_a/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no # Audio output
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = drivers/led/issi/is31fl3736-mono.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/info.json
deleted file mode 100644
index c0e996e0018..00000000000
--- a/keyboards/wilba_tech/wt75_b/info.json
+++ /dev/null
@@ -1,392 +0,0 @@
-{
- "keyboard_name": "WT75-B",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x075B",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"],
- "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_75_ansi_blocker_split_bs"
- },
- "layouts": {
- "LAYOUT_75_ansi_blocker": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
- {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
- {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
- {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
- {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
- {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
- {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
- {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
- ]
- },
- "LAYOUT_75_ansi_blocker_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
- {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1},
- {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
- {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
- {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
- {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
- {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
-
- {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
- {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
- {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
- ]
- },
- "LAYOUT_75_ansi_blocker_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
- {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
- {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5, "w": 7},
- {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
- {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
- {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
- {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
- ]
- },
- "LAYOUT_75_ansi_blocker_tsangan_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
- {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1},
- {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
- {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
- {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5, "w": 7},
- {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
- {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
- {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
- {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt75_b/keyboard.json b/keyboards/wilba_tech/wt75_b/keyboard.json
new file mode 100644
index 00000000000..15bc61e9236
--- /dev/null
+++ b/keyboards/wilba_tech/wt75_b/keyboard.json
@@ -0,0 +1,398 @@
+{
+ "keyboard_name": "WT75-B",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x075B",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"],
+ "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_75_ansi_blocker_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_75_ansi_blocker": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+ {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_ansi_blocker_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1},
+ {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
+ {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+ {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_ansi_blocker_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5, "w": 7},
+ {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_ansi_blocker_tsangan_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "F5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "F9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Pause", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Delete", "matrix": [0, 15], "x": 15, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1},
+ {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1},
+ {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+ {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "End", "matrix": [4, 15], "x": 15, "y": 4},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5, "w": 7},
+ {"label": "Fn", "matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+ {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14, "y": 5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt75_b/rules.mk b/keyboards/wilba_tech/wt75_b/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt75_b/rules.mk
+++ b/keyboards/wilba_tech/wt75_b/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no # Audio output
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = drivers/led/issi/is31fl3736-mono.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/info.json
deleted file mode 100644
index daa6303fb96..00000000000
--- a/keyboards/wilba_tech/wt75_c/info.json
+++ /dev/null
@@ -1,211 +0,0 @@
-{
- "keyboard_name": "WT75-C",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x075C",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"],
- "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_ansi_rwkl_split_bs"
- },
- "layouts": {
- "LAYOUT_ansi_rwkl": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
- {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
- {"label": "Print Screen", "matrix": [0, 14], "x": 14, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
- {"label": "Delete", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
- {"label": "Page Up", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
- {"label": "Page Down", "matrix": [3, 15], "x": 15.25, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6},
- {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
- {"label": "Fn", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
- {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5},
- {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
- {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
- ]
- },
- "LAYOUT_ansi_rwkl_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 14], "x": 14, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
-
- {"label": "Delete", "matrix": [1, 15], "x": 15.25, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"label": "Page Up", "matrix": [2, 15], "x": 15.25, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"label": "Page Down", "matrix": [3, 15], "x": 15.25, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
- {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6},
- {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
- {"label": "Fn", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5},
- {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
- {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt75_c/keyboard.json b/keyboards/wilba_tech/wt75_c/keyboard.json
new file mode 100644
index 00000000000..38d1450ae09
--- /dev/null
+++ b/keyboards/wilba_tech/wt75_c/keyboard.json
@@ -0,0 +1,217 @@
+{
+ "keyboard_name": "WT75-C",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x075C",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"],
+ "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_ansi_rwkl_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_ansi_rwkl": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+ {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 14], "x": 14, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"label": "Delete", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"label": "Page Up", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"label": "Page Down", "matrix": [3, 15], "x": 15.25, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+ {"label": "Fn", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+ {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_ansi_rwkl_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 14, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 14], "x": 14, "y": 1.25},
+
+ {"label": "Delete", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Page Up", "matrix": [2, 15], "x": 15.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "Page Down", "matrix": [3, 15], "x": 15.25, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6},
+ {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+ {"label": "Fn", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 15.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt75_c/rules.mk b/keyboards/wilba_tech/wt75_c/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt75_c/rules.mk
+++ b/keyboards/wilba_tech/wt75_c/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no # Audio output
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = drivers/led/issi/is31fl3736-mono.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/info.json
deleted file mode 100644
index 570b3dc03af..00000000000
--- a/keyboards/wilba_tech/wt80_a/info.json
+++ /dev/null
@@ -1,235 +0,0 @@
-{
- "keyboard_name": "WT80-A",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x080A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
- "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift"],
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_tkl_ansi_split_bs_rshift",
- "LAYOUT_no_split": "LAYOUT_tkl_ansi"
- },
- "layouts": {
- "LAYOUT_tkl_ansi_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"matrix": [1, 5], "x": 5, "y": 1.5},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
- {"matrix": [1, 7], "x": 7, "y": 1.5},
- {"matrix": [1, 8], "x": 8, "y": 1.5},
- {"matrix": [1, 9], "x": 9, "y": 1.5},
- {"matrix": [1, 10], "x": 10, "y": 1.5},
- {"matrix": [1, 11], "x": 11, "y": 1.5},
- {"matrix": [1, 12], "x": 12, "y": 1.5},
- {"matrix": [1, 13], "x": 13, "y": 1.5},
- {"matrix": [3, 13], "x": 14, "y": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.5},
- {"matrix": [1, 15], "x": 16.25, "y": 1.5},
- {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.5},
- {"matrix": [2, 2], "x": 2.5, "y": 2.5},
- {"matrix": [2, 3], "x": 3.5, "y": 2.5},
- {"matrix": [2, 4], "x": 4.5, "y": 2.5},
- {"matrix": [2, 5], "x": 5.5, "y": 2.5},
- {"matrix": [2, 6], "x": 6.5, "y": 2.5},
- {"matrix": [2, 7], "x": 7.5, "y": 2.5},
- {"matrix": [2, 8], "x": 8.5, "y": 2.5},
- {"matrix": [2, 9], "x": 9.5, "y": 2.5},
- {"matrix": [2, 10], "x": 10.5, "y": 2.5},
- {"matrix": [2, 11], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.5},
- {"matrix": [2, 15], "x": 16.25, "y": 2.5},
- {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.5},
- {"matrix": [3, 2], "x": 2.75, "y": 3.5},
- {"matrix": [3, 3], "x": 3.75, "y": 3.5},
- {"matrix": [3, 4], "x": 4.75, "y": 3.5},
- {"matrix": [3, 5], "x": 5.75, "y": 3.5},
- {"matrix": [3, 6], "x": 6.75, "y": 3.5},
- {"matrix": [3, 7], "x": 7.75, "y": 3.5},
- {"matrix": [3, 8], "x": 8.75, "y": 3.5},
- {"matrix": [3, 9], "x": 9.75, "y": 3.5},
- {"matrix": [3, 10], "x": 10.75, "y": 3.5},
- {"matrix": [3, 11], "x": 11.75, "y": 3.5},
- {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.5},
- {"matrix": [4, 3], "x": 3.25, "y": 4.5},
- {"matrix": [4, 4], "x": 4.25, "y": 4.5},
- {"matrix": [4, 5], "x": 5.25, "y": 4.5},
- {"matrix": [4, 6], "x": 6.25, "y": 4.5},
- {"matrix": [4, 7], "x": 7.25, "y": 4.5},
- {"matrix": [4, 8], "x": 8.25, "y": 4.5},
- {"matrix": [4, 9], "x": 9.25, "y": 4.5},
- {"matrix": [4, 10], "x": 10.25, "y": 4.5},
- {"matrix": [4, 11], "x": 11.25, "y": 4.5},
- {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4.5},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"matrix": [5, 15], "x": 16.25, "y": 5.5},
- {"matrix": [5, 16], "x": 17.25, "y": 5.5}
- ]
- },
- "LAYOUT_tkl_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"matrix": [1, 5], "x": 5, "y": 1.5},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
- {"matrix": [1, 7], "x": 7, "y": 1.5},
- {"matrix": [1, 8], "x": 8, "y": 1.5},
- {"matrix": [1, 9], "x": 9, "y": 1.5},
- {"matrix": [1, 10], "x": 10, "y": 1.5},
- {"matrix": [1, 11], "x": 11, "y": 1.5},
- {"matrix": [1, 12], "x": 12, "y": 1.5},
- {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.5},
- {"matrix": [1, 15], "x": 16.25, "y": 1.5},
- {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.5},
- {"matrix": [2, 2], "x": 2.5, "y": 2.5},
- {"matrix": [2, 3], "x": 3.5, "y": 2.5},
- {"matrix": [2, 4], "x": 4.5, "y": 2.5},
- {"matrix": [2, 5], "x": 5.5, "y": 2.5},
- {"matrix": [2, 6], "x": 6.5, "y": 2.5},
- {"matrix": [2, 7], "x": 7.5, "y": 2.5},
- {"matrix": [2, 8], "x": 8.5, "y": 2.5},
- {"matrix": [2, 9], "x": 9.5, "y": 2.5},
- {"matrix": [2, 10], "x": 10.5, "y": 2.5},
- {"matrix": [2, 11], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.5},
- {"matrix": [2, 15], "x": 16.25, "y": 2.5},
- {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.5},
- {"matrix": [3, 2], "x": 2.75, "y": 3.5},
- {"matrix": [3, 3], "x": 3.75, "y": 3.5},
- {"matrix": [3, 4], "x": 4.75, "y": 3.5},
- {"matrix": [3, 5], "x": 5.75, "y": 3.5},
- {"matrix": [3, 6], "x": 6.75, "y": 3.5},
- {"matrix": [3, 7], "x": 7.75, "y": 3.5},
- {"matrix": [3, 8], "x": 8.75, "y": 3.5},
- {"matrix": [3, 9], "x": 9.75, "y": 3.5},
- {"matrix": [3, 10], "x": 10.75, "y": 3.5},
- {"matrix": [3, 11], "x": 11.75, "y": 3.5},
- {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4.5},
- {"matrix": [4, 3], "x": 3.25, "y": 4.5},
- {"matrix": [4, 4], "x": 4.25, "y": 4.5},
- {"matrix": [4, 5], "x": 5.25, "y": 4.5},
- {"matrix": [4, 6], "x": 6.25, "y": 4.5},
- {"matrix": [4, 7], "x": 7.25, "y": 4.5},
- {"matrix": [4, 8], "x": 8.25, "y": 4.5},
- {"matrix": [4, 9], "x": 9.25, "y": 4.5},
- {"matrix": [4, 10], "x": 10.25, "y": 4.5},
- {"matrix": [4, 11], "x": 11.25, "y": 4.5},
- {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [4, 15], "x": 16.25, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"matrix": [5, 15], "x": 16.25, "y": 5.5},
- {"matrix": [5, 16], "x": 17.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt80_a/keyboard.json b/keyboards/wilba_tech/wt80_a/keyboard.json
new file mode 100644
index 00000000000..d7d6d11882e
--- /dev/null
+++ b/keyboards/wilba_tech/wt80_a/keyboard.json
@@ -0,0 +1,241 @@
+{
+ "keyboard_name": "WT80-A",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x080A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+ "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "ROW2COL",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift"],
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_tkl_ansi_split_bs_rshift",
+ "LAYOUT_no_split": "LAYOUT_tkl_ansi"
+ },
+ "layouts": {
+ "LAYOUT_tkl_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5},
+ {"matrix": [3, 13], "x": 14, "y": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt80_a/rules.mk b/keyboards/wilba_tech/wt80_a/rules.mk
index f7482c7a2f2..858c317c200 100644
--- a/keyboards/wilba_tech/wt80_a/rules.mk
+++ b/keyboards/wilba_tech/wt80_a/rules.mk
@@ -1,18 +1,7 @@
-# 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
-AUDIO_ENABLE = no # Audio output
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = drivers/led/issi/is31fl3736-mono.c \
quantum/color.c \
keyboards/wilba_tech/wt_mono_backlight.c \
keyboards/wilba_tech/wt_main.c
-I2C_DRIVER_REQUIRED = yes
\ No newline at end of file
diff --git a/keyboards/wilba_tech/wt80_bc/config.h b/keyboards/wilba_tech/wt80_bc/config.h
deleted file mode 100644
index 9541b1df126..00000000000
--- a/keyboards/wilba_tech/wt80_bc/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/wilba_tech/wt80_bc/info.json b/keyboards/wilba_tech/wt80_bc/info.json
deleted file mode 100644
index b76e9cf86ce..00000000000
--- a/keyboards/wilba_tech/wt80_bc/info.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
- "keyboard_name": "WT80-BC",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x80B0",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
- "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
- },
- "community_layouts": [
- "tkl_ansi_tsangan"
- ],
- "layouts": {
- "LAYOUT_tkl_ansi_tsangan": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
- {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
- {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- },
- "LAYOUT_tkl_ansi_wkl": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
- {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
- {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
- {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
- {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt80_bc/keyboard.json b/keyboards/wilba_tech/wt80_bc/keyboard.json
new file mode 100644
index 00000000000..072b965aefe
--- /dev/null
+++ b/keyboards/wilba_tech/wt80_bc/keyboard.json
@@ -0,0 +1,242 @@
+{
+ "keyboard_name": "WT80-BC",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x80B0",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"],
+ "rows": ["F1", "F0", "E6", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
+ },
+ "community_layouts": [
+ "tkl_ansi_tsangan"
+ ],
+ "layouts": {
+ "LAYOUT_tkl_ansi_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_wkl": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt80_bc/rules.mk b/keyboards/wilba_tech/wt80_bc/rules.mk
index 5b8a8888456..c0b7344f731 100644
--- a/keyboards/wilba_tech/wt80_bc/rules.mk
+++ b/keyboards/wilba_tech/wt80_bc/rules.mk
@@ -1,14 +1,2 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-
# project specific files
SRC = keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/wt8_a/config.h b/keyboards/wilba_tech/wt8_a/config.h
deleted file mode 100644
index 1377a18714c..00000000000
--- a/keyboards/wilba_tech/wt8_a/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/info.json
deleted file mode 100644
index a07707d7897..00000000000
--- a/keyboards/wilba_tech/wt8_a/info.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "keyboard_name": "WT8-A",
- "manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x6582",
- "pid": "0x008A",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"],
- "rows": ["E6"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": 0, "y": 1},
- {"matrix": [0, 5], "x": 1, "y": 1},
- {"matrix": [0, 6], "x": 2, "y": 1},
- {"matrix": [0, 7], "x": 3, "y": 1}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/wt8_a/keyboard.json b/keyboards/wilba_tech/wt8_a/keyboard.json
new file mode 100644
index 00000000000..a84ff6a33f9
--- /dev/null
+++ b/keyboards/wilba_tech/wt8_a/keyboard.json
@@ -0,0 +1,45 @@
+{
+ "keyboard_name": "WT8-A",
+ "manufacturer": "wilba.tech",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x6582",
+ "pid": "0x008A",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"],
+ "rows": ["E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": 0, "y": 1},
+ {"matrix": [0, 5], "x": 1, "y": 1},
+ {"matrix": [0, 6], "x": 2, "y": 1},
+ {"matrix": [0, 7], "x": 3, "y": 1}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/wt8_a/rules.mk b/keyboards/wilba_tech/wt8_a/rules.mk
index 396da8c7344..c0b7344f731 100644
--- a/keyboards/wilba_tech/wt8_a/rules.mk
+++ b/keyboards/wilba_tech/wt8_a/rules.mk
@@ -1,14 +1,2 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-
# project specific files
SRC = keyboards/wilba_tech/wt_main.c
diff --git a/keyboards/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/info.json
deleted file mode 100644
index 295d11c0696..00000000000
--- a/keyboards/wilba_tech/zeal60/info.json
+++ /dev/null
@@ -1,371 +0,0 @@
-{
- "keyboard_name": "Zeal60",
- "manufacturer": "ZealPC",
- "url": "https://zealpc.net",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5A45",
- "pid": "0x0060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift"],
- "layouts": {
- "LAYOUT_60_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/zeal60/keyboard.json b/keyboards/wilba_tech/zeal60/keyboard.json
new file mode 100644
index 00000000000..34f7a312aaf
--- /dev/null
+++ b/keyboards/wilba_tech/zeal60/keyboard.json
@@ -0,0 +1,377 @@
+{
+ "keyboard_name": "Zeal60",
+ "manufacturer": "ZealPC",
+ "url": "https://zealpc.net",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5A45",
+ "pid": "0x0060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["60_ansi", "60_iso", "60_hhkb", "60_ansi_split_bs_rshift"],
+ "layouts": {
+ "LAYOUT_60_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk
index d1ce11b473c..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/zeal60/rules.mk
+++ b/keyboards/wilba_tech/zeal60/rules.mk
@@ -3,24 +3,11 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/info.json
deleted file mode 100644
index 814ea28660e..00000000000
--- a/keyboards/wilba_tech/zeal65/info.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
- "keyboard_name": "Zeal65",
- "manufacturer": "ZealPC",
- "url": "https://zealpc.net",
- "maintainer": "Wilba",
- "usb": {
- "vid": "0x5A45",
- "pid": "0x0065",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["F0", "F1", "F4", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_65_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
- {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_normie": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
- {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
- {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wilba_tech/zeal65/keyboard.json b/keyboards/wilba_tech/zeal65/keyboard.json
new file mode 100644
index 00000000000..2bc5e65b7b2
--- /dev/null
+++ b/keyboards/wilba_tech/zeal65/keyboard.json
@@ -0,0 +1,175 @@
+{
+ "keyboard_name": "Zeal65",
+ "manufacturer": "ZealPC",
+ "url": "https://zealpc.net",
+ "maintainer": "Wilba",
+ "usb": {
+ "vid": "0x5A45",
+ "pid": "0x0065",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["F0", "F1", "F4", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_65_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_normie": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 3, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wilba_tech/zeal65/rules.mk b/keyboards/wilba_tech/zeal65/rules.mk
index d1ce11b473c..34e6eaa45b8 100644
--- a/keyboards/wilba_tech/zeal65/rules.mk
+++ b/keyboards/wilba_tech/zeal65/rules.mk
@@ -3,24 +3,11 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/wolf/frogpad/info.json b/keyboards/wolf/frogpad/keyboard.json
similarity index 100%
rename from keyboards/wolf/frogpad/info.json
rename to keyboards/wolf/frogpad/keyboard.json
diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/info.json
deleted file mode 100644
index e088a5b7779..00000000000
--- a/keyboards/wolf/kuku65/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
- "keyboard_name": "kuku65",
- "manufacturer": "ToastyStoemp",
- "url": "",
- "maintainer": "ToastyStoemp",
- "usb": {
- "vid": "0x5453",
- "pid": "0x0052",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
- "rows": ["B3", "B2", "B1", "B0", "B7"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wolf/kuku65/keyboard.json b/keyboards/wolf/kuku65/keyboard.json
new file mode 100644
index 00000000000..5146d77d1b5
--- /dev/null
+++ b/keyboards/wolf/kuku65/keyboard.json
@@ -0,0 +1,101 @@
+{
+ "keyboard_name": "kuku65",
+ "manufacturer": "ToastyStoemp",
+ "url": "",
+ "maintainer": "ToastyStoemp",
+ "usb": {
+ "vid": "0x5453",
+ "pid": "0x0052",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
+ "rows": ["B3", "B2", "B1", "B0", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wolf/kuku65/rules.mk b/keyboards/wolf/kuku65/rules.mk
index 67bb6296514..3437a35bdf1 100644
--- a/keyboards/wolf/kuku65/rules.mk
+++ b/keyboards/wolf/kuku65/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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
diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/keyboard.json
similarity index 100%
rename from keyboards/wolf/m60_b/info.json
rename to keyboards/wolf/m60_b/keyboard.json
diff --git a/keyboards/wolf/m6_c/info.json b/keyboards/wolf/m6_c/keyboard.json
similarity index 100%
rename from keyboards/wolf/m6_c/info.json
rename to keyboards/wolf/m6_c/keyboard.json
diff --git a/keyboards/wolf/neely65/info.json b/keyboards/wolf/neely65/keyboard.json
similarity index 100%
rename from keyboards/wolf/neely65/info.json
rename to keyboards/wolf/neely65/keyboard.json
diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/info.json
deleted file mode 100644
index 1e7702a3401..00000000000
--- a/keyboards/wolf/ryujin/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
- "keyboard_name": "Ryujin",
- "manufacturer": "Miroticaps",
- "url": "",
- "maintainer": "ToastyStoemp",
- "usb": {
- "vid": "0x5453",
- "pid": "0x0200",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["D5", "D3", "D2", "D1", "D0"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wolf/ryujin/keyboard.json b/keyboards/wolf/ryujin/keyboard.json
new file mode 100644
index 00000000000..8e72cccd9e9
--- /dev/null
+++ b/keyboards/wolf/ryujin/keyboard.json
@@ -0,0 +1,103 @@
+{
+ "keyboard_name": "Ryujin",
+ "manufacturer": "Miroticaps",
+ "url": "",
+ "maintainer": "ToastyStoemp",
+ "usb": {
+ "vid": "0x5453",
+ "pid": "0x0200",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["D5", "D3", "D2", "D1", "D0"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wolf/ryujin/rules.mk b/keyboards/wolf/ryujin/rules.mk
index 67bb6296514..3437a35bdf1 100644
--- a/keyboards/wolf/ryujin/rules.mk
+++ b/keyboards/wolf/ryujin/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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
diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json
deleted file mode 100644
index 1be6824d09e..00000000000
--- a/keyboards/wolf/sabre/info.json
+++ /dev/null
@@ -1,139 +0,0 @@
-{
- "keyboard_name": "Sabre",
- "manufacturer": "ToastyStoemp",
- "url": "",
- "maintainer": "ToastyStoemp",
- "usb": {
- "vid": "0x5453",
- "pid": "0x0055",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"],
- "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B7"
- },
- "indicators": {
- "caps_lock": "B3",
- "scroll_lock": "B0",
- "on_state": 0
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [1, 1], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0},
- {"matrix": [1, 2], "x": 5, "y": 0},
-
- {"matrix": [1, 3], "x": 8.75, "y": 0},
- {"matrix": [0, 4], "x": 9.75, "y": 0},
- {"matrix": [1, 4], "x": 10.75, "y": 0},
- {"matrix": [0, 5], "x": 11.75, "y": 0},
-
- {"matrix": [1, 5], "x": 13, "y": 0},
- {"matrix": [0, 6], "x": 14, "y": 0},
- {"matrix": [1, 6], "x": 15, "y": 0},
- {"matrix": [0, 7], "x": 16, "y": 0},
-
- {"matrix": [1, 7], "x": 17.25, "y": 0},
- {"matrix": [0, 8], "x": 18.25, "y": 0},
- {"matrix": [1, 8], "x": 19.25, "y": 0},
-
- {"matrix": [2, 0], "x": 0, "y": 1.25},
- {"matrix": [3, 0], "x": 1, "y": 1.25},
- {"matrix": [2, 1], "x": 2, "y": 1.25},
- {"matrix": [3, 1], "x": 3, "y": 1.25},
- {"matrix": [2, 2], "x": 4, "y": 1.25},
- {"matrix": [3, 2], "x": 5, "y": 1.25},
- {"matrix": [2, 3], "x": 6, "y": 1.25},
-
- {"matrix": [3, 3], "x": 9, "y": 1.25},
- {"matrix": [2, 4], "x": 10, "y": 1.25},
- {"matrix": [3, 4], "x": 11, "y": 1.25},
- {"matrix": [2, 5], "x": 12, "y": 1.25},
- {"matrix": [3, 5], "x": 13, "y": 1.25},
- {"matrix": [2, 6], "x": 14, "y": 1.25},
- {"matrix": [3, 6], "x": 15, "y": 1.25, "w": 2},
-
- {"matrix": [3, 7], "x": 17.25, "y": 1.25},
- {"matrix": [2, 8], "x": 18.25, "y": 1.25},
- {"matrix": [3, 8], "x": 19.25, "y": 1.25},
-
- {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [5, 0], "x": 1.5, "y": 2.25},
- {"matrix": [4, 1], "x": 2.5, "y": 2.25},
- {"matrix": [5, 1], "x": 3.5, "y": 2.25},
- {"matrix": [4, 2], "x": 4.5, "y": 2.25},
- {"matrix": [5, 2], "x": 5.5, "y": 2.25},
-
- {"matrix": [4, 3], "x": 8.5, "y": 2.25},
- {"matrix": [5, 3], "x": 9.5, "y": 2.25},
- {"matrix": [4, 4], "x": 10.5, "y": 2.25},
- {"matrix": [5, 4], "x": 11.5, "y": 2.25},
- {"matrix": [4, 5], "x": 12.5, "y": 2.25},
- {"matrix": [5, 5], "x": 13.5, "y": 2.25},
- {"matrix": [4, 6], "x": 14.5, "y": 2.25},
- {"matrix": [5, 6], "x": 15.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [5, 7], "x": 17.25, "y": 2.25},
- {"matrix": [4, 8], "x": 18.25, "y": 2.25},
- {"matrix": [5, 8], "x": 19.25, "y": 2.25},
-
- {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [7, 0], "x": 1.75, "y": 3.25},
- {"matrix": [6, 1], "x": 2.75, "y": 3.25},
- {"matrix": [7, 1], "x": 3.75, "y": 3.25},
- {"matrix": [6, 2], "x": 4.75, "y": 3.25},
- {"matrix": [7, 2], "x": 5.75, "y": 3.25},
-
- {"matrix": [6, 3], "x": 8.75, "y": 3.25},
- {"matrix": [7, 3], "x": 9.75, "y": 3.25},
- {"matrix": [6, 4], "x": 10.75, "y": 3.25},
- {"matrix": [7, 4], "x": 11.75, "y": 3.25},
- {"matrix": [6, 5], "x": 12.75, "y": 3.25},
- {"matrix": [7, 5], "x": 13.75, "y": 3.25},
- {"matrix": [7, 6], "x": 14.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [9, 0], "x": 2.25, "y": 4.25},
- {"matrix": [8, 1], "x": 3.25, "y": 4.25},
- {"matrix": [9, 1], "x": 4.25, "y": 4.25},
- {"matrix": [8, 2], "x": 5.25, "y": 4.25},
- {"matrix": [9, 2], "x": 6.25, "y": 4.25},
-
- {"matrix": [8, 3], "x": 8.25, "y": 4.25},
- {"matrix": [9, 3], "x": 9.25, "y": 4.25},
- {"matrix": [8, 4], "x": 10.25, "y": 4.25},
- {"matrix": [9, 4], "x": 11.25, "y": 4.25},
- {"matrix": [8, 5], "x": 12.25, "y": 4.25},
- {"matrix": [9, 5], "x": 13.25, "y": 4.25},
- {"matrix": [8, 6], "x": 14.25, "y": 4.25, "w": 1.75},
- {"matrix": [9, 6], "x": 16, "y": 4.25},
-
- {"matrix": [8, 8], "x": 18.25, "y": 4.25},
-
- {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.5},
- {"matrix": [10, 1], "x": 4, "y": 5.25},
- {"matrix": [10, 2], "x": 5, "y": 5.25, "w": 2.25},
-
- {"matrix": [11, 3], "x": 8.25, "y": 5.25, "w": 2.75},
- {"matrix": [11, 4], "x": 11, "y": 5.25},
- {"matrix": [10, 5], "x": 12, "y": 5.25, "w": 1.5},
- {"matrix": [10, 6], "x": 14.5, "y": 5.25, "w": 1.5},
-
- {"matrix": [11, 7], "x": 17.25, "y": 5.25},
- {"matrix": [10, 8], "x": 18.25, "y": 5.25},
- {"matrix": [11, 8], "x": 19.25, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/wolf/sabre/keyboard.json b/keyboards/wolf/sabre/keyboard.json
new file mode 100644
index 00000000000..11b235efe7a
--- /dev/null
+++ b/keyboards/wolf/sabre/keyboard.json
@@ -0,0 +1,146 @@
+{
+ "keyboard_name": "Sabre",
+ "manufacturer": "ToastyStoemp",
+ "url": "",
+ "maintainer": "ToastyStoemp",
+ "usb": {
+ "vid": "0x5453",
+ "pid": "0x0055",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"],
+ "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B7"
+ },
+ "indicators": {
+ "caps_lock": "B3",
+ "scroll_lock": "B0",
+ "on_state": 0
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+
+ {"matrix": [1, 3], "x": 8.75, "y": 0},
+ {"matrix": [0, 4], "x": 9.75, "y": 0},
+ {"matrix": [1, 4], "x": 10.75, "y": 0},
+ {"matrix": [0, 5], "x": 11.75, "y": 0},
+
+ {"matrix": [1, 5], "x": 13, "y": 0},
+ {"matrix": [0, 6], "x": 14, "y": 0},
+ {"matrix": [1, 6], "x": 15, "y": 0},
+ {"matrix": [0, 7], "x": 16, "y": 0},
+
+ {"matrix": [1, 7], "x": 17.25, "y": 0},
+ {"matrix": [0, 8], "x": 18.25, "y": 0},
+ {"matrix": [1, 8], "x": 19.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+
+ {"matrix": [3, 3], "x": 9, "y": 1.25},
+ {"matrix": [2, 4], "x": 10, "y": 1.25},
+ {"matrix": [3, 4], "x": 11, "y": 1.25},
+ {"matrix": [2, 5], "x": 12, "y": 1.25},
+ {"matrix": [3, 5], "x": 13, "y": 1.25},
+ {"matrix": [2, 6], "x": 14, "y": 1.25},
+ {"matrix": [3, 6], "x": 15, "y": 1.25, "w": 2},
+
+ {"matrix": [3, 7], "x": 17.25, "y": 1.25},
+ {"matrix": [2, 8], "x": 18.25, "y": 1.25},
+ {"matrix": [3, 8], "x": 19.25, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+ {"matrix": [4, 3], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 13.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 14.5, "y": 2.25},
+ {"matrix": [5, 6], "x": 15.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [5, 7], "x": 17.25, "y": 2.25},
+ {"matrix": [4, 8], "x": 18.25, "y": 2.25},
+ {"matrix": [5, 8], "x": 19.25, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+
+ {"matrix": [6, 3], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 12.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 13.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 14.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+
+ {"matrix": [8, 3], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 12.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 13.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 14.25, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 6], "x": 16, "y": 4.25},
+
+ {"matrix": [8, 8], "x": 18.25, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 1], "x": 4, "y": 5.25},
+ {"matrix": [10, 2], "x": 5, "y": 5.25, "w": 2.25},
+
+ {"matrix": [11, 3], "x": 8.25, "y": 5.25, "w": 2.75},
+ {"matrix": [11, 4], "x": 11, "y": 5.25},
+ {"matrix": [10, 5], "x": 12, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 6], "x": 14.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [11, 7], "x": 17.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 18.25, "y": 5.25},
+ {"matrix": [11, 8], "x": 19.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wolf/sabre/rules.mk b/keyboards/wolf/sabre/rules.mk
index e7cc37d18d6..3437a35bdf1 100644
--- a/keyboards/wolf/sabre/rules.mk
+++ b/keyboards/wolf/sabre/rules.mk
@@ -1,16 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 # USB Nkey Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/info.json
deleted file mode 100644
index 8f6d9318ea5..00000000000
--- a/keyboards/wolf/ts60/info.json
+++ /dev/null
@@ -1,192 +0,0 @@
-{
- "keyboard_name": "TS60",
- "manufacturer": "ToastyStoemp",
- "url": "https://www.vwolf.be/",
- "maintainer": "ToastyStoemp",
- "usb": {
- "vid": "0x5453",
- "pid": "0x0050",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"],
- "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "B7",
- "levels": 6
- },
- "rgblight": {
- "led_count": 16,
- "sleep": true,
- "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
- },
- "default": {
- "animation": "rainbow_swirl"
- }
- },
- "ws2812": {
- "pin": "D0"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["60_ansi"],
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [1, 0], "x": 1, "y": 0},
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [1, 1], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0},
- {"matrix": [1, 2], "x": 5, "y": 0},
- {"matrix": [0, 3], "x": 6, "y": 0},
- {"matrix": [1, 3], "x": 7, "y": 0},
- {"matrix": [0, 4], "x": 8, "y": 0},
- {"matrix": [1, 4], "x": 9, "y": 0},
- {"matrix": [0, 5], "x": 10, "y": 0},
- {"matrix": [1, 5], "x": 11, "y": 0},
- {"matrix": [0, 6], "x": 12, "y": 0},
- {"matrix": [0, 7], "x": 13, "y": 0},
- {"matrix": [1, 7], "x": 14, "y": 0},
-
- {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 1},
- {"matrix": [3, 1], "x": 2.5, "y": 1},
- {"matrix": [2, 2], "x": 3.5, "y": 1},
- {"matrix": [3, 2], "x": 4.5, "y": 1},
- {"matrix": [2, 3], "x": 5.5, "y": 1},
- {"matrix": [3, 3], "x": 6.5, "y": 1},
- {"matrix": [2, 4], "x": 7.5, "y": 1},
- {"matrix": [3, 4], "x": 8.5, "y": 1},
- {"matrix": [2, 5], "x": 9.5, "y": 1},
- {"matrix": [3, 5], "x": 10.5, "y": 1},
- {"matrix": [2, 6], "x": 11.5, "y": 1},
- {"matrix": [2, 7], "x": 12.5, "y": 1},
- {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [4, 1], "x": 1.75, "y": 2},
- {"matrix": [5, 1], "x": 2.75, "y": 2},
- {"matrix": [4, 2], "x": 3.75, "y": 2},
- {"matrix": [5, 2], "x": 4.75, "y": 2},
- {"matrix": [4, 3], "x": 5.75, "y": 2},
- {"matrix": [5, 3], "x": 6.75, "y": 2},
- {"matrix": [4, 4], "x": 7.75, "y": 2},
- {"matrix": [5, 4], "x": 8.75, "y": 2},
- {"matrix": [4, 5], "x": 9.75, "y": 2},
- {"matrix": [5, 5], "x": 10.75, "y": 2},
- {"matrix": [4, 6], "x": 11.75, "y": 2},
- {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [6, 0], "x": 0, "y": 3},
- {"matrix": [7, 0], "x": 1, "y": 3},
- {"matrix": [6, 1], "x": 2, "y": 3},
- {"matrix": [7, 1], "x": 3, "y": 3},
- {"matrix": [6, 2], "x": 4, "y": 3},
- {"matrix": [7, 2], "x": 5, "y": 3},
- {"matrix": [6, 3], "x": 6, "y": 3},
- {"matrix": [7, 3], "x": 7, "y": 3},
- {"matrix": [6, 4], "x": 8, "y": 3},
- {"matrix": [7, 4], "x": 9, "y": 3},
- {"matrix": [6, 5], "x": 10, "y": 3},
- {"matrix": [7, 5], "x": 11, "y": 3},
- {"matrix": [6, 6], "x": 12, "y": 3},
- {"matrix": [6, 7], "x": 13, "y": 3},
- {"matrix": [7, 7], "x": 14, "y": 3},
-
- {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.25},
- {"matrix": [8, 3], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [8, 4], "x": 7.25, "y": 4, "w": 2.75},
- {"matrix": [8, 5], "x": 10, "y": 4},
- {"matrix": [9, 5], "x": 11, "y": 4},
- {"matrix": [8, 6], "x": 12, "y": 4},
- {"matrix": [8, 7], "x": 13, "y": 4},
- {"matrix": [9, 7], "x": 14, "y": 4}
- ]
- },
- "LAYOUT_60_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [1, 0], "x": 1, "y": 0},
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [1, 1], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0},
- {"matrix": [1, 2], "x": 5, "y": 0},
- {"matrix": [0, 3], "x": 6, "y": 0},
- {"matrix": [1, 3], "x": 7, "y": 0},
- {"matrix": [0, 4], "x": 8, "y": 0},
- {"matrix": [1, 4], "x": 9, "y": 0},
- {"matrix": [0, 5], "x": 10, "y": 0},
- {"matrix": [1, 5], "x": 11, "y": 0},
- {"matrix": [0, 6], "x": 12, "y": 0},
- {"matrix": [0, 7], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 1},
- {"matrix": [3, 1], "x": 2.5, "y": 1},
- {"matrix": [2, 2], "x": 3.5, "y": 1},
- {"matrix": [3, 2], "x": 4.5, "y": 1},
- {"matrix": [2, 3], "x": 5.5, "y": 1},
- {"matrix": [3, 3], "x": 6.5, "y": 1},
- {"matrix": [2, 4], "x": 7.5, "y": 1},
- {"matrix": [3, 4], "x": 8.5, "y": 1},
- {"matrix": [2, 5], "x": 9.5, "y": 1},
- {"matrix": [3, 5], "x": 10.5, "y": 1},
- {"matrix": [2, 6], "x": 11.5, "y": 1},
- {"matrix": [2, 7], "x": 12.5, "y": 1},
- {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [4, 1], "x": 1.75, "y": 2},
- {"matrix": [5, 1], "x": 2.75, "y": 2},
- {"matrix": [4, 2], "x": 3.75, "y": 2},
- {"matrix": [5, 2], "x": 4.75, "y": 2},
- {"matrix": [4, 3], "x": 5.75, "y": 2},
- {"matrix": [5, 3], "x": 6.75, "y": 2},
- {"matrix": [4, 4], "x": 7.75, "y": 2},
- {"matrix": [5, 4], "x": 8.75, "y": 2},
- {"matrix": [4, 5], "x": 9.75, "y": 2},
- {"matrix": [5, 5], "x": 10.75, "y": 2},
- {"matrix": [4, 6], "x": 11.75, "y": 2},
- {"matrix": [5, 7], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [6, 1], "x": 2.25, "y": 3},
- {"matrix": [7, 1], "x": 3.25, "y": 3},
- {"matrix": [6, 2], "x": 4.25, "y": 3},
- {"matrix": [7, 2], "x": 5.25, "y": 3},
- {"matrix": [6, 3], "x": 6.25, "y": 3},
- {"matrix": [7, 3], "x": 7.25, "y": 3},
- {"matrix": [6, 4], "x": 8.25, "y": 3},
- {"matrix": [7, 4], "x": 9.25, "y": 3},
- {"matrix": [6, 5], "x": 10.25, "y": 3},
- {"matrix": [7, 5], "x": 11.25, "y": 3},
- {"matrix": [6, 7], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [8, 7], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
- ]
- }
- }
-}
diff --git a/keyboards/wolf/ts60/keyboard.json b/keyboards/wolf/ts60/keyboard.json
new file mode 100644
index 00000000000..ff5059f2f1c
--- /dev/null
+++ b/keyboards/wolf/ts60/keyboard.json
@@ -0,0 +1,200 @@
+{
+ "keyboard_name": "TS60",
+ "manufacturer": "ToastyStoemp",
+ "url": "https://www.vwolf.be/",
+ "maintainer": "ToastyStoemp",
+ "usb": {
+ "vid": "0x5453",
+ "pid": "0x0050",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"],
+ "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"]
+ },
+ "diode_direction": "COL2ROW",
+ "backlight": {
+ "pin": "B7",
+ "levels": 6
+ },
+ "rgblight": {
+ "led_count": 16,
+ "sleep": true,
+ "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
+ },
+ "default": {
+ "animation": "rainbow_swirl"
+ }
+ },
+ "ws2812": {
+ "pin": "D0"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["60_ansi"],
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [0, 7], "x": 13, "y": 0},
+ {"matrix": [1, 7], "x": 14, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [3, 1], "x": 2.5, "y": 1},
+ {"matrix": [2, 2], "x": 3.5, "y": 1},
+ {"matrix": [3, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [3, 3], "x": 6.5, "y": 1},
+ {"matrix": [2, 4], "x": 7.5, "y": 1},
+ {"matrix": [3, 4], "x": 8.5, "y": 1},
+ {"matrix": [2, 5], "x": 9.5, "y": 1},
+ {"matrix": [3, 5], "x": 10.5, "y": 1},
+ {"matrix": [2, 6], "x": 11.5, "y": 1},
+ {"matrix": [2, 7], "x": 12.5, "y": 1},
+ {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [5, 1], "x": 2.75, "y": 2},
+ {"matrix": [4, 2], "x": 3.75, "y": 2},
+ {"matrix": [5, 2], "x": 4.75, "y": 2},
+ {"matrix": [4, 3], "x": 5.75, "y": 2},
+ {"matrix": [5, 3], "x": 6.75, "y": 2},
+ {"matrix": [4, 4], "x": 7.75, "y": 2},
+ {"matrix": [5, 4], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [5, 5], "x": 10.75, "y": 2},
+ {"matrix": [4, 6], "x": 11.75, "y": 2},
+ {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [6, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+ {"matrix": [6, 6], "x": 12, "y": 3},
+ {"matrix": [6, 7], "x": 13, "y": 3},
+ {"matrix": [7, 7], "x": 14, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [8, 3], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [8, 4], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [8, 5], "x": 10, "y": 4},
+ {"matrix": [9, 5], "x": 11, "y": 4},
+ {"matrix": [8, 6], "x": 12, "y": 4},
+ {"matrix": [8, 7], "x": 13, "y": 4},
+ {"matrix": [9, 7], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [0, 7], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [3, 1], "x": 2.5, "y": 1},
+ {"matrix": [2, 2], "x": 3.5, "y": 1},
+ {"matrix": [3, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [3, 3], "x": 6.5, "y": 1},
+ {"matrix": [2, 4], "x": 7.5, "y": 1},
+ {"matrix": [3, 4], "x": 8.5, "y": 1},
+ {"matrix": [2, 5], "x": 9.5, "y": 1},
+ {"matrix": [3, 5], "x": 10.5, "y": 1},
+ {"matrix": [2, 6], "x": 11.5, "y": 1},
+ {"matrix": [2, 7], "x": 12.5, "y": 1},
+ {"matrix": [3, 7], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 2},
+ {"matrix": [5, 1], "x": 2.75, "y": 2},
+ {"matrix": [4, 2], "x": 3.75, "y": 2},
+ {"matrix": [5, 2], "x": 4.75, "y": 2},
+ {"matrix": [4, 3], "x": 5.75, "y": 2},
+ {"matrix": [5, 3], "x": 6.75, "y": 2},
+ {"matrix": [4, 4], "x": 7.75, "y": 2},
+ {"matrix": [5, 4], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [5, 5], "x": 10.75, "y": 2},
+ {"matrix": [4, 6], "x": 11.75, "y": 2},
+ {"matrix": [5, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 7], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 7], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wolf/ts60/rules.mk b/keyboards/wolf/ts60/rules.mk
index fb26dc7de5f..3437a35bdf1 100644
--- a/keyboards/wolf/ts60/rules.mk
+++ b/keyboards/wolf/ts60/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# 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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
deleted file mode 100644
index 4b007cf387e..00000000000
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Jun Wako
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json
deleted file mode 100644
index 04b8ae3b115..00000000000
--- a/keyboards/wolfmarkclub/wm1/info.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
- "keyboard_name": "WM1",
- "manufacturer": "Wolfmark Club",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x2B29",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 18,
- "sleep": true,
- "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": {
- "pin": "A3"
- },
- "matrix_pins": {
- "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "C6", "C10", "C11", "C12", "D2", "B5", "B6", "B7", "B8"],
- "rows": ["C4", "A7", "A6", "A5", "A4"]
- },
- "diode_direction": "COL2ROW",
- "layouts": {
- "LAYOUT": {
- "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": 8.75, "y": 0},
- {"matrix": [0, 8], "x": 9.75, "y": 0},
- {"matrix": [0, 9], "x": 10.75, "y": 0},
- {"matrix": [0, 10], "x": 11.75, "y": 0},
- {"matrix": [0, 11], "x": 12.75, "y": 0},
- {"matrix": [0, 12], "x": 13.75, "y": 0},
- {"matrix": [0, 13], "x": 14.75, "y": 0},
- {"matrix": [0, 14], "x": 15.75, "y": 0},
-
- {"matrix": [2, 13], "x": 17, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
-
- {"matrix": [1, 6], "x": 8.25, "y": 1},
- {"matrix": [1, 7], "x": 9.25, "y": 1},
- {"matrix": [1, 8], "x": 10.25, "y": 1},
- {"matrix": [1, 9], "x": 11.25, "y": 1},
- {"matrix": [1, 10], "x": 12.25, "y": 1},
- {"matrix": [1, 11], "x": 13.25, "y": 1},
- {"matrix": [1, 12], "x": 14.25, "y": 1},
- {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 17, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
-
- {"matrix": [2, 6], "x": 8.5, "y": 2},
- {"matrix": [2, 7], "x": 9.5, "y": 2},
- {"matrix": [2, 8], "x": 10.5, "y": 2},
- {"matrix": [2, 9], "x": 11.5, "y": 2},
- {"matrix": [2, 10], "x": 12.5, "y": 2},
- {"matrix": [2, 11], "x": 13.5, "y": 2},
- {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 2.25},
-
- {"matrix": [2, 14], "x": 17, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
-
- {"matrix": [3, 6], "x": 8, "y": 3},
- {"matrix": [3, 7], "x": 9, "y": 3},
- {"matrix": [3, 8], "x": 10, "y": 3},
- {"matrix": [3, 9], "x": 11, "y": 3},
- {"matrix": [3, 10], "x": 12, "y": 3},
- {"matrix": [3, 11], "x": 13, "y": 3},
- {"matrix": [3, 12], "x": 14, "y": 3, "w": 1.75},
-
- {"matrix": [3, 14], "x": 16.25, "y": 3.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
- {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 2},
- {"matrix": [4, 5], "x": 6.5, "y": 4},
- {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.75},
- {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5},
- {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.5},
-
- {"matrix": [4, 12], "x": 15.25, "y": 4.25},
- {"matrix": [4, 13], "x": 16.25, "y": 4.25},
- {"matrix": [4, 14], "x": 17.25, "y": 4.25}
- ]
- }
- }
-}
diff --git a/keyboards/wolfmarkclub/wm1/keyboard.json b/keyboards/wolfmarkclub/wm1/keyboard.json
new file mode 100644
index 00000000000..56c062e1024
--- /dev/null
+++ b/keyboards/wolfmarkclub/wm1/keyboard.json
@@ -0,0 +1,146 @@
+{
+ "keyboard_name": "WM1",
+ "manufacturer": "Wolfmark Club",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x2B29",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "sleep_led": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 18,
+ "sleep": true,
+ "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": {
+ "pin": "A3"
+ },
+ "matrix_pins": {
+ "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "C6", "C10", "C11", "C12", "D2", "B5", "B6", "B7", "B8"],
+ "rows": ["C4", "A7", "A6", "A5", "A4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F103",
+ "bootloader": "custom",
+ "layouts": {
+ "LAYOUT": {
+ "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": 8.75, "y": 0},
+ {"matrix": [0, 8], "x": 9.75, "y": 0},
+ {"matrix": [0, 9], "x": 10.75, "y": 0},
+ {"matrix": [0, 10], "x": 11.75, "y": 0},
+ {"matrix": [0, 11], "x": 12.75, "y": 0},
+ {"matrix": [0, 12], "x": 13.75, "y": 0},
+ {"matrix": [0, 13], "x": 14.75, "y": 0},
+ {"matrix": [0, 14], "x": 15.75, "y": 0},
+
+ {"matrix": [2, 13], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [1, 6], "x": 8.25, "y": 1},
+ {"matrix": [1, 7], "x": 9.25, "y": 1},
+ {"matrix": [1, 8], "x": 10.25, "y": 1},
+ {"matrix": [1, 9], "x": 11.25, "y": 1},
+ {"matrix": [1, 10], "x": 12.25, "y": 1},
+ {"matrix": [1, 11], "x": 13.25, "y": 1},
+ {"matrix": [1, 12], "x": 14.25, "y": 1},
+ {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [2, 6], "x": 8.5, "y": 2},
+ {"matrix": [2, 7], "x": 9.5, "y": 2},
+ {"matrix": [2, 8], "x": 10.5, "y": 2},
+ {"matrix": [2, 9], "x": 11.5, "y": 2},
+ {"matrix": [2, 10], "x": 12.5, "y": 2},
+ {"matrix": [2, 11], "x": 13.5, "y": 2},
+ {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [3, 6], "x": 8, "y": 3},
+ {"matrix": [3, 7], "x": 9, "y": 3},
+ {"matrix": [3, 8], "x": 10, "y": 3},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3},
+ {"matrix": [3, 11], "x": 13, "y": 3},
+ {"matrix": [3, 12], "x": 14, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 14], "x": 16.25, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 6.5, "y": 4},
+ {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 17.25, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk
index 512ef119fdb..63ba3477c3c 100644
--- a/keyboards/wolfmarkclub/wm1/rules.mk
+++ b/keyboards/wolfmarkclub/wm1/rules.mk
@@ -1,27 +1,5 @@
-# MCU name
-MCU = STM32F103
-
# GENERIC STM32F103C8T6 board - mass storage bootloader
MCU_LDSCRIPT = wm1_f103
BOARD = STM32_F103_STM32DUINO
-# Bootloader selection
-BOOTLOADER = custom
-
PROGRAM_CMD = echo 'CLI flashing not supported' >&2
-
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # 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
-SLEEP_LED_ENABLE = yes
-LTO_ENABLE = yes
-
diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/keyboard.json
similarity index 100%
rename from keyboards/work_louder/micro/info.json
rename to keyboards/work_louder/micro/keyboard.json
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
deleted file mode 100644
index 61c48b3e802..00000000000
--- a/keyboards/work_louder/nano/info.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
- "keyboard_name": "Nano Pad",
- "manufacturer": "Work Louder",
- "url": "https://worklouder.cc/",
- "maintainer": "Work Louder",
- "usb": {
- "vid": "0x574C",
- "pid": "0xE6F0",
- "device_version": "0.0.1",
- "max_power": 100
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true
- },
- "driver": "ws2812",
- "max_brightness": 120,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["B5", "B6", "C6"],
- "rows": ["F7"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "D7", "pin_b": "B4"}
- ]
- },
- "ws2812": {
- "pin": "F6"
- },
- "rgblight": {
- "led_count": 6,
- "driver": "custom",
- "max_brightness": 120,
- "sleep": true,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "twinkle": true
- },
- "default": {
- "hue": 170
- }
- },
- "bootmagic": {
- "matrix": [0, 2]
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0}
- ]
- }
- }
-}
diff --git a/keyboards/work_louder/nano/keyboard.json b/keyboards/work_louder/nano/keyboard.json
new file mode 100644
index 00000000000..e15d095de0f
--- /dev/null
+++ b/keyboards/work_louder/nano/keyboard.json
@@ -0,0 +1,108 @@
+{
+ "keyboard_name": "Nano Pad",
+ "manufacturer": "Work Louder",
+ "url": "https://worklouder.cc/",
+ "maintainer": "Work Louder",
+ "usb": {
+ "vid": "0x574C",
+ "pid": "0xE6F0",
+ "device_version": "0.0.1",
+ "max_power": 100
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "rgblight": true
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true
+ },
+ "driver": "ws2812",
+ "max_brightness": 120,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["B5", "B6", "C6"],
+ "rows": ["F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D7", "pin_b": "B4"}
+ ]
+ },
+ "ws2812": {
+ "pin": "F6"
+ },
+ "rgblight": {
+ "led_count": 6,
+ "driver": "custom",
+ "max_brightness": 120,
+ "sleep": true,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "twinkle": true
+ },
+ "default": {
+ "hue": 170
+ }
+ },
+ "bootmagic": {
+ "matrix": [0, 2]
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0}
+ ]
+ }
+ }
+}
diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk
index bcbb4bb31d5..e0822c009b2 100644
--- a/keyboards/work_louder/nano/rules.mk
+++ b/keyboards/work_louder/nano/rules.mk
@@ -1,18 +1 @@
-# 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
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
SRC += rgb_functions.c
diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/keyboard.json
similarity index 100%
rename from keyboards/work_louder/numpad/info.json
rename to keyboards/work_louder/numpad/keyboard.json
diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h
index bd4af23167d..4969f8e8318 100644
--- a/keyboards/wren/config.h
+++ b/keyboards/wren/config.h
@@ -18,24 +18,3 @@ along with this program. If not, see .
#pragma once
#define USE_I2C
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json
deleted file mode 100644
index a496d4babab..00000000000
--- a/keyboards/wren/info.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
- "keyboard_name": "wren",
- "manufacturer": "Walter Hanley",
- "maintainer": "walterhanley",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"],
- "rows": ["D3", "D2", "C6", "D4", "B5"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "E6", "pin_b": "B4"}
- ]
- },
- "split": {
- "encoder": {
- "right": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "E6"}
- ]
- }
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 9], "x": 0, "y": 0.5},
- {"matrix": [0, 8], "x": 1, "y": 0.5},
- {"matrix": [0, 7], "x": 2, "y": 0.5},
- {"matrix": [0, 6], "x": 3, "y": 0.5},
-
- {"matrix": [0, 5], "x": 4.5, "y": 0.5},
- {"matrix": [0, 4], "x": 5.5, "y": 0.5},
- {"matrix": [0, 3], "x": 6.5, "y": 0.25},
- {"matrix": [0, 2], "x": 7.5, "y": 0},
- {"matrix": [0, 1], "x": 8.5, "y": 0.25},
- {"matrix": [0, 0], "x": 9.5, "y": 0.5},
-
- {"matrix": [5, 0], "x": 14, "y": 0.5},
- {"matrix": [5, 1], "x": 15, "y": 0.25},
- {"matrix": [5, 2], "x": 16, "y": 0},
- {"matrix": [5, 3], "x": 17, "y": 0.25},
- {"matrix": [5, 4], "x": 18, "y": 0.5},
- {"matrix": [5, 5], "x": 19, "y": 0.5},
-
- {"matrix": [5, 6], "x": 20.5, "y": 0.5},
- {"matrix": [5, 7], "x": 21.5, "y": 0.5},
- {"matrix": [5, 8], "x": 22.5, "y": 0.5},
- {"matrix": [5, 9], "x": 23.5, "y": 0.5},
-
- {"matrix": [1, 9], "x": 0, "y": 1.5},
- {"matrix": [1, 8], "x": 1, "y": 1.5},
- {"matrix": [1, 7], "x": 2, "y": 1.5},
- {"matrix": [1, 6], "x": 3, "y": 1.5},
-
- {"matrix": [1, 5], "x": 4.5, "y": 1.5},
- {"matrix": [1, 4], "x": 5.5, "y": 1.5},
- {"matrix": [1, 3], "x": 6.5, "y": 1.25},
- {"matrix": [1, 2], "x": 7.5, "y": 1},
- {"matrix": [1, 1], "x": 8.5, "y": 1.25},
- {"matrix": [1, 0], "x": 9.5, "y": 1.5},
-
- {"matrix": [6, 0], "x": 14, "y": 1.5},
- {"matrix": [6, 1], "x": 15, "y": 1.25},
- {"matrix": [6, 2], "x": 16, "y": 1},
- {"matrix": [6, 3], "x": 17, "y": 1.25},
- {"matrix": [6, 4], "x": 18, "y": 1.5},
- {"matrix": [6, 5], "x": 19, "y": 1.5},
-
- {"matrix": [6, 6], "x": 20.5, "y": 1.5},
- {"matrix": [6, 7], "x": 21.5, "y": 1.5},
- {"matrix": [6, 8], "x": 22.5, "y": 1.5},
- {"matrix": [6, 9], "x": 23.5, "y": 1.5},
-
- {"matrix": [2, 9], "x": 0, "y": 2.5},
- {"matrix": [2, 8], "x": 1, "y": 2.5},
- {"matrix": [2, 7], "x": 2, "y": 2.5},
- {"matrix": [2, 6], "x": 3, "y": 2.5},
-
- {"matrix": [2, 5], "x": 4.5, "y": 2.5},
- {"matrix": [2, 4], "x": 5.5, "y": 2.5},
- {"matrix": [2, 3], "x": 6.5, "y": 2.25},
- {"matrix": [2, 2], "x": 7.5, "y": 2},
- {"matrix": [2, 1], "x": 8.5, "y": 2.25},
- {"matrix": [2, 0], "x": 9.5, "y": 2.5},
-
- {"matrix": [7, 0], "x": 14, "y": 2.5},
- {"matrix": [7, 1], "x": 15, "y": 2.25},
- {"matrix": [7, 2], "x": 16, "y": 2},
- {"matrix": [7, 3], "x": 17, "y": 2.25},
- {"matrix": [7, 4], "x": 18, "y": 2.5},
- {"matrix": [7, 5], "x": 19, "y": 2.5},
-
- {"matrix": [7, 6], "x": 20.5, "y": 2.5},
- {"matrix": [7, 7], "x": 21.5, "y": 2.5},
- {"matrix": [7, 8], "x": 22.5, "y": 2.5},
- {"matrix": [7, 9], "x": 23.5, "y": 2.5},
-
- {"matrix": [3, 9], "x": 0, "y": 3.5},
- {"matrix": [3, 8], "x": 1, "y": 3.5},
- {"matrix": [3, 7], "x": 2, "y": 3.5},
- {"matrix": [3, 6], "x": 3, "y": 3.5},
-
- {"matrix": [3, 5], "x": 4.5, "y": 3.5},
- {"matrix": [3, 4], "x": 5.5, "y": 3.5},
- {"matrix": [3, 3], "x": 6.5, "y": 3.25},
- {"matrix": [3, 2], "x": 7.5, "y": 3},
- {"matrix": [3, 1], "x": 8.5, "y": 3.25},
- {"matrix": [3, 0], "x": 9.5, "y": 3.5},
-
- {"matrix": [8, 0], "x": 14, "y": 3.5},
- {"matrix": [8, 1], "x": 15, "y": 3.25},
- {"matrix": [8, 2], "x": 16, "y": 3},
- {"matrix": [8, 3], "x": 17, "y": 3.25},
- {"matrix": [8, 4], "x": 18, "y": 3.5},
- {"matrix": [8, 5], "x": 19, "y": 3.5},
-
- {"matrix": [8, 6], "x": 20.5, "y": 3.5},
- {"matrix": [8, 7], "x": 21.5, "y": 3.5},
- {"matrix": [8, 8], "x": 22.5, "y": 3.5},
- {"matrix": [8, 9], "x": 23.5, "y": 3.5},
-
- {"matrix": [4, 4], "x": 6, "y": 4.5},
- {"matrix": [4, 3], "x": 7, "y": 4.5},
- {"matrix": [4, 2], "x": 8, "y": 4.5},
- {"matrix": [4, 1], "x": 9, "y": 4.75},
-
- {"matrix": [4, 0], "x": 10.75, "y": 4, "h": 2},
-
- {"matrix": [9, 0], "x": 12.75, "y": 4, "h": 2},
-
- {"matrix": [9, 1], "x": 14.5, "y": 4.75},
- {"matrix": [9, 2], "x": 15.5, "y": 4.5},
- {"matrix": [9, 3], "x": 16.5, "y": 4.5},
- {"matrix": [9, 4], "x": 17.5, "y": 4.5}
- ]
- }
- }
-}
diff --git a/keyboards/wren/keyboard.json b/keyboards/wren/keyboard.json
new file mode 100644
index 00000000000..c6d0330e2ff
--- /dev/null
+++ b/keyboards/wren/keyboard.json
@@ -0,0 +1,160 @@
+{
+ "keyboard_name": "wren",
+ "manufacturer": "Walter Hanley",
+ "maintainer": "walterhanley",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"],
+ "rows": ["D3", "D2", "C6", "D4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "E6", "pin_b": "B4"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "E6"}
+ ]
+ }
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 9], "x": 0, "y": 0.5},
+ {"matrix": [0, 8], "x": 1, "y": 0.5},
+ {"matrix": [0, 7], "x": 2, "y": 0.5},
+ {"matrix": [0, 6], "x": 3, "y": 0.5},
+
+ {"matrix": [0, 5], "x": 4.5, "y": 0.5},
+ {"matrix": [0, 4], "x": 5.5, "y": 0.5},
+ {"matrix": [0, 3], "x": 6.5, "y": 0.25},
+ {"matrix": [0, 2], "x": 7.5, "y": 0},
+ {"matrix": [0, 1], "x": 8.5, "y": 0.25},
+ {"matrix": [0, 0], "x": 9.5, "y": 0.5},
+
+ {"matrix": [5, 0], "x": 14, "y": 0.5},
+ {"matrix": [5, 1], "x": 15, "y": 0.25},
+ {"matrix": [5, 2], "x": 16, "y": 0},
+ {"matrix": [5, 3], "x": 17, "y": 0.25},
+ {"matrix": [5, 4], "x": 18, "y": 0.5},
+ {"matrix": [5, 5], "x": 19, "y": 0.5},
+
+ {"matrix": [5, 6], "x": 20.5, "y": 0.5},
+ {"matrix": [5, 7], "x": 21.5, "y": 0.5},
+ {"matrix": [5, 8], "x": 22.5, "y": 0.5},
+ {"matrix": [5, 9], "x": 23.5, "y": 0.5},
+
+ {"matrix": [1, 9], "x": 0, "y": 1.5},
+ {"matrix": [1, 8], "x": 1, "y": 1.5},
+ {"matrix": [1, 7], "x": 2, "y": 1.5},
+ {"matrix": [1, 6], "x": 3, "y": 1.5},
+
+ {"matrix": [1, 5], "x": 4.5, "y": 1.5},
+ {"matrix": [1, 4], "x": 5.5, "y": 1.5},
+ {"matrix": [1, 3], "x": 6.5, "y": 1.25},
+ {"matrix": [1, 2], "x": 7.5, "y": 1},
+ {"matrix": [1, 1], "x": 8.5, "y": 1.25},
+ {"matrix": [1, 0], "x": 9.5, "y": 1.5},
+
+ {"matrix": [6, 0], "x": 14, "y": 1.5},
+ {"matrix": [6, 1], "x": 15, "y": 1.25},
+ {"matrix": [6, 2], "x": 16, "y": 1},
+ {"matrix": [6, 3], "x": 17, "y": 1.25},
+ {"matrix": [6, 4], "x": 18, "y": 1.5},
+ {"matrix": [6, 5], "x": 19, "y": 1.5},
+
+ {"matrix": [6, 6], "x": 20.5, "y": 1.5},
+ {"matrix": [6, 7], "x": 21.5, "y": 1.5},
+ {"matrix": [6, 8], "x": 22.5, "y": 1.5},
+ {"matrix": [6, 9], "x": 23.5, "y": 1.5},
+
+ {"matrix": [2, 9], "x": 0, "y": 2.5},
+ {"matrix": [2, 8], "x": 1, "y": 2.5},
+ {"matrix": [2, 7], "x": 2, "y": 2.5},
+ {"matrix": [2, 6], "x": 3, "y": 2.5},
+
+ {"matrix": [2, 5], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 7.5, "y": 2},
+ {"matrix": [2, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 0], "x": 9.5, "y": 2.5},
+
+ {"matrix": [7, 0], "x": 14, "y": 2.5},
+ {"matrix": [7, 1], "x": 15, "y": 2.25},
+ {"matrix": [7, 2], "x": 16, "y": 2},
+ {"matrix": [7, 3], "x": 17, "y": 2.25},
+ {"matrix": [7, 4], "x": 18, "y": 2.5},
+ {"matrix": [7, 5], "x": 19, "y": 2.5},
+
+ {"matrix": [7, 6], "x": 20.5, "y": 2.5},
+ {"matrix": [7, 7], "x": 21.5, "y": 2.5},
+ {"matrix": [7, 8], "x": 22.5, "y": 2.5},
+ {"matrix": [7, 9], "x": 23.5, "y": 2.5},
+
+ {"matrix": [3, 9], "x": 0, "y": 3.5},
+ {"matrix": [3, 8], "x": 1, "y": 3.5},
+ {"matrix": [3, 7], "x": 2, "y": 3.5},
+ {"matrix": [3, 6], "x": 3, "y": 3.5},
+
+ {"matrix": [3, 5], "x": 4.5, "y": 3.5},
+ {"matrix": [3, 4], "x": 5.5, "y": 3.5},
+ {"matrix": [3, 3], "x": 6.5, "y": 3.25},
+ {"matrix": [3, 2], "x": 7.5, "y": 3},
+ {"matrix": [3, 1], "x": 8.5, "y": 3.25},
+ {"matrix": [3, 0], "x": 9.5, "y": 3.5},
+
+ {"matrix": [8, 0], "x": 14, "y": 3.5},
+ {"matrix": [8, 1], "x": 15, "y": 3.25},
+ {"matrix": [8, 2], "x": 16, "y": 3},
+ {"matrix": [8, 3], "x": 17, "y": 3.25},
+ {"matrix": [8, 4], "x": 18, "y": 3.5},
+ {"matrix": [8, 5], "x": 19, "y": 3.5},
+
+ {"matrix": [8, 6], "x": 20.5, "y": 3.5},
+ {"matrix": [8, 7], "x": 21.5, "y": 3.5},
+ {"matrix": [8, 8], "x": 22.5, "y": 3.5},
+ {"matrix": [8, 9], "x": 23.5, "y": 3.5},
+
+ {"matrix": [4, 4], "x": 6, "y": 4.5},
+ {"matrix": [4, 3], "x": 7, "y": 4.5},
+ {"matrix": [4, 2], "x": 8, "y": 4.5},
+ {"matrix": [4, 1], "x": 9, "y": 4.75},
+
+ {"matrix": [4, 0], "x": 10.75, "y": 4, "h": 2},
+
+ {"matrix": [9, 0], "x": 12.75, "y": 4, "h": 2},
+
+ {"matrix": [9, 1], "x": 14.5, "y": 4.75},
+ {"matrix": [9, 2], "x": 15.5, "y": 4.5},
+ {"matrix": [9, 3], "x": 16.5, "y": 4.5},
+ {"matrix": [9, 4], "x": 17.5, "y": 4.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wren/rules.mk b/keyboards/wren/rules.mk
deleted file mode 100644
index 6b9cc95ebf2..00000000000
--- a/keyboards/wren/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
-ENCODER_ENABLE = yes # Enables the use of one or more encoders
-SPLIT_KEYBOARD = yes # Enables split keyboard
diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json
deleted file mode 100644
index f0951430db3..00000000000
--- a/keyboards/wuque/creek70/info.json
+++ /dev/null
@@ -1,706 +0,0 @@
-{
- "keyboard_name": "creek70",
- "manufacturer": "wuque studio",
- "maintainer": "spbgzh",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "diode_direction": "COL2ROW",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true
- },
- "matrix_pins": {
- "rows": ["B3", "B2", "F0", "D3", "D1"],
- "cols": ["E6", "D4", "D7", "F7", "D2", "D5", "D6", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "B7", "B1", "B0"]
- },
- "usb": {
- "vid": "0x916D",
- "pid": "0x0001",
- "device_version": "0.0.1"
- },
- "indicators": {
- "caps_lock": "F6",
- "on_state": 0
- },
- "ws2812": {
- "pin": "D0"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 7,
- "max_brightness": 200,
- "sleep": true,
- "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
- }
- },
- "layout_aliases": {
- "LAYOUT": "LAYOUT_all"
- },
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
- {"matrix": [0, 8], "x": 8.25, "y": 0},
- {"matrix": [0, 9], "x": 9.25, "y": 0},
- {"matrix": [0, 10], "x": 10.25, "y": 0},
- {"matrix": [0, 11], "x": 11.25, "y": 0},
- {"matrix": [0, 12], "x": 12.25, "y": 0},
- {"matrix": [0, 13], "x": 13.25, "y": 0},
- {"matrix": [0, 14], "x": 14.25, "y": 0},
- {"matrix": [2, 14], "x": 15.25, "y": 0},
-
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
- {"matrix": [1, 7], "x": 7.75, "y": 1},
- {"matrix": [1, 8], "x": 8.75, "y": 1},
- {"matrix": [1, 9], "x": 9.75, "y": 1},
- {"matrix": [1, 10], "x": 10.75, "y": 1},
- {"matrix": [1, 11], "x": 11.75, "y": 1},
- {"matrix": [1, 12], "x": 12.75, "y": 1},
- {"matrix": [1, 13], "x": 13.75, "y": 1},
- {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
- {"matrix": [2, 7], "x": 8, "y": 2},
- {"matrix": [2, 8], "x": 9, "y": 2},
- {"matrix": [2, 9], "x": 10, "y": 2},
- {"matrix": [2, 10], "x": 11, "y": 2},
- {"matrix": [2, 11], "x": 12, "y": 2},
- {"matrix": [2, 12], "x": 13, "y": 2},
- {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3},
- {"matrix": [3, 5], "x": 5.5, "y": 3},
- {"matrix": [3, 6], "x": 6.5, "y": 3},
- {"matrix": [3, 7], "x": 7.5, "y": 3},
- {"matrix": [3, 8], "x": 8.5, "y": 3},
- {"matrix": [3, 9], "x": 9.5, "y": 3},
- {"matrix": [3, 10], "x": 10.5, "y": 3},
- {"matrix": [3, 11], "x": 11.5, "y": 3},
- {"matrix": [3, 12], "x": 12.5, "y": 3},
- {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [3, 16], "x": 17.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- },
- "LAYOUT_ansi": {
- "layout": [
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
- {"matrix": [0, 8], "x": 8.25, "y": 0},
- {"matrix": [0, 9], "x": 9.25, "y": 0},
- {"matrix": [0, 10], "x": 10.25, "y": 0},
- {"matrix": [0, 11], "x": 11.25, "y": 0},
- {"matrix": [0, 12], "x": 12.25, "y": 0},
- {"matrix": [0, 13], "x": 13.25, "y": 0},
- {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
- {"matrix": [1, 7], "x": 7.75, "y": 1},
- {"matrix": [1, 8], "x": 8.75, "y": 1},
- {"matrix": [1, 9], "x": 9.75, "y": 1},
- {"matrix": [1, 10], "x": 10.75, "y": 1},
- {"matrix": [1, 11], "x": 11.75, "y": 1},
- {"matrix": [1, 12], "x": 12.75, "y": 1},
- {"matrix": [1, 13], "x": 13.75, "y": 1},
- {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
- {"matrix": [2, 7], "x": 8, "y": 2},
- {"matrix": [2, 8], "x": 9, "y": 2},
- {"matrix": [2, 9], "x": 10, "y": 2},
- {"matrix": [2, 10], "x": 11, "y": 2},
- {"matrix": [2, 11], "x": 12, "y": 2},
- {"matrix": [2, 12], "x": 13, "y": 2},
- {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3},
- {"matrix": [3, 5], "x": 5.5, "y": 3},
- {"matrix": [3, 6], "x": 6.5, "y": 3},
- {"matrix": [3, 7], "x": 7.5, "y": 3},
- {"matrix": [3, 8], "x": 8.5, "y": 3},
- {"matrix": [3, 9], "x": 9.5, "y": 3},
- {"matrix": [3, 10], "x": 10.5, "y": 3},
- {"matrix": [3, 11], "x": 11.5, "y": 3},
- {"matrix": [3, 12], "x": 12.5, "y": 3},
- {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
-
- {"matrix": [3, 16], "x": 17.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- },
- "LAYOUT_ansi_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
- {"matrix": [0, 8], "x": 8.25, "y": 0},
- {"matrix": [0, 9], "x": 9.25, "y": 0},
- {"matrix": [0, 10], "x": 10.25, "y": 0},
- {"matrix": [0, 11], "x": 11.25, "y": 0},
- {"matrix": [0, 12], "x": 12.25, "y": 0},
- {"matrix": [0, 13], "x": 13.25, "y": 0},
- {"matrix": [0, 14], "x": 14.25, "y": 0},
- {"matrix": [2, 14], "x": 15.25, "y": 0},
-
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
- {"matrix": [1, 7], "x": 7.75, "y": 1},
- {"matrix": [1, 8], "x": 8.75, "y": 1},
- {"matrix": [1, 9], "x": 9.75, "y": 1},
- {"matrix": [1, 10], "x": 10.75, "y": 1},
- {"matrix": [1, 11], "x": 11.75, "y": 1},
- {"matrix": [1, 12], "x": 12.75, "y": 1},
- {"matrix": [1, 13], "x": 13.75, "y": 1},
- {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
- {"matrix": [2, 7], "x": 8, "y": 2},
- {"matrix": [2, 8], "x": 9, "y": 2},
- {"matrix": [2, 9], "x": 10, "y": 2},
- {"matrix": [2, 10], "x": 11, "y": 2},
- {"matrix": [2, 11], "x": 12, "y": 2},
- {"matrix": [2, 12], "x": 13, "y": 2},
- {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3},
- {"matrix": [3, 5], "x": 5.5, "y": 3},
- {"matrix": [3, 6], "x": 6.5, "y": 3},
- {"matrix": [3, 7], "x": 7.5, "y": 3},
- {"matrix": [3, 8], "x": 8.5, "y": 3},
- {"matrix": [3, 9], "x": 9.5, "y": 3},
- {"matrix": [3, 10], "x": 10.5, "y": 3},
- {"matrix": [3, 11], "x": 11.5, "y": 3},
- {"matrix": [3, 12], "x": 12.5, "y": 3},
- {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [3, 16], "x": 17.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
- {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- },
- "LAYOUT_ansi_split_space": {
- "layout": [
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
- {"matrix": [0, 8], "x": 8.25, "y": 0},
- {"matrix": [0, 9], "x": 9.25, "y": 0},
- {"matrix": [0, 10], "x": 10.25, "y": 0},
- {"matrix": [0, 11], "x": 11.25, "y": 0},
- {"matrix": [0, 12], "x": 12.25, "y": 0},
- {"matrix": [0, 13], "x": 13.25, "y": 0},
- {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
- {"matrix": [1, 7], "x": 7.75, "y": 1},
- {"matrix": [1, 8], "x": 8.75, "y": 1},
- {"matrix": [1, 9], "x": 9.75, "y": 1},
- {"matrix": [1, 10], "x": 10.75, "y": 1},
- {"matrix": [1, 11], "x": 11.75, "y": 1},
- {"matrix": [1, 12], "x": 12.75, "y": 1},
- {"matrix": [1, 13], "x": 13.75, "y": 1},
- {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
- {"matrix": [2, 7], "x": 8, "y": 2},
- {"matrix": [2, 8], "x": 9, "y": 2},
- {"matrix": [2, 9], "x": 10, "y": 2},
- {"matrix": [2, 10], "x": 11, "y": 2},
- {"matrix": [2, 11], "x": 12, "y": 2},
- {"matrix": [2, 12], "x": 13, "y": 2},
- {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3},
- {"matrix": [3, 5], "x": 5.5, "y": 3},
- {"matrix": [3, 6], "x": 6.5, "y": 3},
- {"matrix": [3, 7], "x": 7.5, "y": 3},
- {"matrix": [3, 8], "x": 8.5, "y": 3},
- {"matrix": [3, 9], "x": 9.5, "y": 3},
- {"matrix": [3, 10], "x": 10.5, "y": 3},
- {"matrix": [3, 11], "x": 11.5, "y": 3},
- {"matrix": [3, 12], "x": 12.5, "y": 3},
- {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
-
- {"matrix": [3, 16], "x": 17.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- },
- "LAYOUT_ansi_split_space_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
- {"matrix": [0, 8], "x": 8.25, "y": 0},
- {"matrix": [0, 9], "x": 9.25, "y": 0},
- {"matrix": [0, 10], "x": 10.25, "y": 0},
- {"matrix": [0, 11], "x": 11.25, "y": 0},
- {"matrix": [0, 12], "x": 12.25, "y": 0},
- {"matrix": [0, 13], "x": 13.25, "y": 0},
- {"matrix": [0, 14], "x": 14.25, "y": 0},
- {"matrix": [2, 14], "x": 15.25, "y": 0},
-
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
- {"matrix": [1, 7], "x": 7.75, "y": 1},
- {"matrix": [1, 8], "x": 8.75, "y": 1},
- {"matrix": [1, 9], "x": 9.75, "y": 1},
- {"matrix": [1, 10], "x": 10.75, "y": 1},
- {"matrix": [1, 11], "x": 11.75, "y": 1},
- {"matrix": [1, 12], "x": 12.75, "y": 1},
- {"matrix": [1, 13], "x": 13.75, "y": 1},
- {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
- {"matrix": [2, 7], "x": 8, "y": 2},
- {"matrix": [2, 8], "x": 9, "y": 2},
- {"matrix": [2, 9], "x": 10, "y": 2},
- {"matrix": [2, 10], "x": 11, "y": 2},
- {"matrix": [2, 11], "x": 12, "y": 2},
- {"matrix": [2, 12], "x": 13, "y": 2},
- {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3},
- {"matrix": [3, 5], "x": 5.5, "y": 3},
- {"matrix": [3, 6], "x": 6.5, "y": 3},
- {"matrix": [3, 7], "x": 7.5, "y": 3},
- {"matrix": [3, 8], "x": 8.5, "y": 3},
- {"matrix": [3, 9], "x": 9.5, "y": 3},
- {"matrix": [3, 10], "x": 10.5, "y": 3},
- {"matrix": [3, 11], "x": 11.5, "y": 3},
- {"matrix": [3, 12], "x": 12.5, "y": 3},
- {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [3, 16], "x": 17.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
- {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
- {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- },
- "LAYOUT_ansi_tsangan": {
- "layout": [
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
- {"matrix": [0, 8], "x": 8.25, "y": 0},
- {"matrix": [0, 9], "x": 9.25, "y": 0},
- {"matrix": [0, 10], "x": 10.25, "y": 0},
- {"matrix": [0, 11], "x": 11.25, "y": 0},
- {"matrix": [0, 12], "x": 12.25, "y": 0},
- {"matrix": [0, 13], "x": 13.25, "y": 0},
- {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
-
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
- {"matrix": [1, 7], "x": 7.75, "y": 1},
- {"matrix": [1, 8], "x": 8.75, "y": 1},
- {"matrix": [1, 9], "x": 9.75, "y": 1},
- {"matrix": [1, 10], "x": 10.75, "y": 1},
- {"matrix": [1, 11], "x": 11.75, "y": 1},
- {"matrix": [1, 12], "x": 12.75, "y": 1},
- {"matrix": [1, 13], "x": 13.75, "y": 1},
- {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
- {"matrix": [2, 7], "x": 8, "y": 2},
- {"matrix": [2, 8], "x": 9, "y": 2},
- {"matrix": [2, 9], "x": 10, "y": 2},
- {"matrix": [2, 10], "x": 11, "y": 2},
- {"matrix": [2, 11], "x": 12, "y": 2},
- {"matrix": [2, 12], "x": 13, "y": 2},
- {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3},
- {"matrix": [3, 5], "x": 5.5, "y": 3},
- {"matrix": [3, 6], "x": 6.5, "y": 3},
- {"matrix": [3, 7], "x": 7.5, "y": 3},
- {"matrix": [3, 8], "x": 8.5, "y": 3},
- {"matrix": [3, 9], "x": 9.5, "y": 3},
- {"matrix": [3, 10], "x": 10.5, "y": 3},
- {"matrix": [3, 11], "x": 11.5, "y": 3},
- {"matrix": [3, 12], "x": 12.5, "y": 3},
- {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
-
- {"matrix": [3, 16], "x": 17.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
- {"matrix": [4, 2], "x": 2.75, "y": 4},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
- {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [4, 13], "x": 13.75, "y": 4},
- {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- },
- "LAYOUT_ansi_tsangan_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
- {"matrix": [0, 8], "x": 8.25, "y": 0},
- {"matrix": [0, 9], "x": 9.25, "y": 0},
- {"matrix": [0, 10], "x": 10.25, "y": 0},
- {"matrix": [0, 11], "x": 11.25, "y": 0},
- {"matrix": [0, 12], "x": 12.25, "y": 0},
- {"matrix": [0, 13], "x": 13.25, "y": 0},
- {"matrix": [0, 14], "x": 14.25, "y": 0},
- {"matrix": [2, 14], "x": 15.25, "y": 0},
-
- {"matrix": [0, 15], "x": 16.5, "y": 0},
- {"matrix": [0, 16], "x": 17.5, "y": 0},
- {"matrix": [0, 17], "x": 18.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
- {"matrix": [1, 7], "x": 7.75, "y": 1},
- {"matrix": [1, 8], "x": 8.75, "y": 1},
- {"matrix": [1, 9], "x": 9.75, "y": 1},
- {"matrix": [1, 10], "x": 10.75, "y": 1},
- {"matrix": [1, 11], "x": 11.75, "y": 1},
- {"matrix": [1, 12], "x": 12.75, "y": 1},
- {"matrix": [1, 13], "x": 13.75, "y": 1},
- {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
-
- {"matrix": [1, 15], "x": 16.5, "y": 1},
- {"matrix": [1, 16], "x": 17.5, "y": 1},
- {"matrix": [1, 17], "x": 18.5, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
-
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
- {"matrix": [2, 7], "x": 8, "y": 2},
- {"matrix": [2, 8], "x": 9, "y": 2},
- {"matrix": [2, 9], "x": 10, "y": 2},
- {"matrix": [2, 10], "x": 11, "y": 2},
- {"matrix": [2, 11], "x": 12, "y": 2},
- {"matrix": [2, 12], "x": 13, "y": 2},
- {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 3], "x": 3.5, "y": 3},
- {"matrix": [3, 4], "x": 4.5, "y": 3},
- {"matrix": [3, 5], "x": 5.5, "y": 3},
- {"matrix": [3, 6], "x": 6.5, "y": 3},
- {"matrix": [3, 7], "x": 7.5, "y": 3},
- {"matrix": [3, 8], "x": 8.5, "y": 3},
- {"matrix": [3, 9], "x": 9.5, "y": 3},
- {"matrix": [3, 10], "x": 10.5, "y": 3},
- {"matrix": [3, 11], "x": 11.5, "y": 3},
- {"matrix": [3, 12], "x": 12.5, "y": 3},
- {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [3, 16], "x": 17.5, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
- {"matrix": [4, 2], "x": 2.75, "y": 4},
- {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
- {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [4, 13], "x": 13.75, "y": 4},
- {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
-
- {"matrix": [4, 15], "x": 16.5, "y": 4},
- {"matrix": [4, 16], "x": 17.5, "y": 4},
- {"matrix": [4, 17], "x": 18.5, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wuque/creek70/keyboard.json b/keyboards/wuque/creek70/keyboard.json
new file mode 100644
index 00000000000..e7227ace8e5
--- /dev/null
+++ b/keyboards/wuque/creek70/keyboard.json
@@ -0,0 +1,707 @@
+{
+ "keyboard_name": "creek70",
+ "manufacturer": "wuque studio",
+ "maintainer": "spbgzh",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "rows": ["B3", "B2", "F0", "D3", "D1"],
+ "cols": ["E6", "D4", "D7", "F7", "D2", "D5", "D6", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "B7", "B1", "B0"]
+ },
+ "usb": {
+ "vid": "0x916D",
+ "pid": "0x0001",
+ "device_version": "0.0.1"
+ },
+ "indicators": {
+ "caps_lock": "F6",
+ "on_state": 0
+ },
+ "ws2812": {
+ "pin": "D0"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 7,
+ "max_brightness": 200,
+ "sleep": true,
+ "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
+ }
+ },
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_all"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi_split_space": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi_split_space_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 2.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi_tsangan": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 2.75, "y": 4},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 13.75, "y": 4},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi_tsangan_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [2, 14], "x": 15.25, "y": 0},
+
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+ {"matrix": [1, 16], "x": 17.5, "y": 1},
+ {"matrix": [1, 17], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [3, 16], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 2.75, "y": 4},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 7},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 13.75, "y": 4},
+ {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 15], "x": 16.5, "y": 4},
+ {"matrix": [4, 16], "x": 17.5, "y": 4},
+ {"matrix": [4, 17], "x": 18.5, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wuque/creek70/rules.mk b/keyboards/wuque/creek70/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/wuque/creek70/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h
deleted file mode 100644
index db5a8d534ef..00000000000
--- a/keyboards/wuque/ikki68_aurora/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 wuquestudio
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/info.json
deleted file mode 100644
index a65b265b66c..00000000000
--- a/keyboards/wuque/ikki68_aurora/info.json
+++ /dev/null
@@ -1,618 +0,0 @@
-{
- "keyboard_name": "ikki68 Aurora",
- "manufacturer": "wuque studio",
- "url": "https://ikki68.com/",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x706B",
- "pid": "0x0011",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"],
- "rows": ["B7", "B3", "B2", "B1", "B0"]
- },
- "diode_direction": "COL2ROW",
- "indicators": {
- "caps_lock": "F7",
- "on_state": 0
- },
- "ws2812": {
- "pin": "E2"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 20,
- "max_brightness": 200,
- "sleep": true,
- "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
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["68_ansi", "68_iso"],
- "layouts": {
- "LAYOUT_68_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix": [1, 15], "x": 16.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-
- {"matrix": [4, 13], "x": 14.25, "y": 4},
- {"matrix": [4, 14], "x": 15.25, "y": 4},
- {"matrix": [4, 15], "x": 16.25, "y": 4}
- ]
- },
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix": [1, 15], "x": 16.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
- {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-
- {"matrix": [4, 13], "x": 14.25, "y": 4},
- {"matrix": [4, 14], "x": 15.25, "y": 4},
- {"matrix": [4, 15], "x": 16.25, "y": 4}
- ]
- },
- "LAYOUT_68_ansi_split_lshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix": [1, 15], "x": 16.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-
- {"matrix": [4, 13], "x": 14.25, "y": 4},
- {"matrix": [4, 14], "x": 15.25, "y": 4},
- {"matrix": [4, 15], "x": 16.25, "y": 4}
- ]
- },
- "LAYOUT_68_ansi_split_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix": [1, 15], "x": 16.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-
- {"matrix": [4, 13], "x": 14.25, "y": 4},
- {"matrix": [4, 14], "x": 15.25, "y": 4},
- {"matrix": [4, 15], "x": 16.25, "y": 4}
- ]
- },
- "LAYOUT_68_ansi_split_bs": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix": [1, 15], "x": 16.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-
- {"matrix": [4, 13], "x": 14.25, "y": 4},
- {"matrix": [4, 14], "x": 15.25, "y": 4},
- {"matrix": [4, 15], "x": 16.25, "y": 4}
- ]
- },
- "LAYOUT_68_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix": [1, 15], "x": 16.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-
- {"matrix": [4, 13], "x": 14.25, "y": 4},
- {"matrix": [4, 14], "x": 15.25, "y": 4},
- {"matrix": [4, 15], "x": 16.25, "y": 4}
- ]
- },
- "LAYOUT_68_ansi_split_space": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1},
- {"matrix": [1, 15], "x": 16.25, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [3, 14], "x": 15.25, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
- {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-
- {"matrix": [4, 13], "x": 14.25, "y": 4},
- {"matrix": [4, 14], "x": 15.25, "y": 4},
- {"matrix": [4, 15], "x": 16.25, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wuque/ikki68_aurora/keyboard.json b/keyboards/wuque/ikki68_aurora/keyboard.json
new file mode 100644
index 00000000000..31d0ff2f91e
--- /dev/null
+++ b/keyboards/wuque/ikki68_aurora/keyboard.json
@@ -0,0 +1,631 @@
+{
+ "keyboard_name": "ikki68 Aurora",
+ "manufacturer": "wuque studio",
+ "url": "https://ikki68.com/",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x706B",
+ "pid": "0x0011",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"],
+ "rows": ["B7", "B3", "B2", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "F7",
+ "on_state": 0
+ },
+ "ws2812": {
+ "pin": "E2"
+ },
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 20,
+ "max_brightness": 200,
+ "sleep": true,
+ "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
+ }
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["68_ansi", "68_iso"],
+ "layouts": {
+ "LAYOUT_68_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
+ ]
+ },
+ "LAYOUT_68_ansi_split_lshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
+ ]
+ },
+ "LAYOUT_68_ansi_split_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
+ ]
+ },
+ "LAYOUT_68_ansi_split_bs": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
+ ]
+ },
+ "LAYOUT_68_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
+ ]
+ },
+ "LAYOUT_68_ansi_split_space": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1},
+ {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4},
+ {"matrix": [4, 14], "x": 15.25, "y": 4},
+ {"matrix": [4, 15], "x": 16.25, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wuque/ikki68_aurora/rules.mk b/keyboards/wuque/ikki68_aurora/rules.mk
deleted file mode 100644
index 540e0c2514d..00000000000
--- a/keyboards/wuque/ikki68_aurora/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 = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-LAYOUT = 68_ansi 68_iso
diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/info.json
deleted file mode 100644
index f27073b2858..00000000000
--- a/keyboards/wuque/serneity65/info.json
+++ /dev/null
@@ -1,407 +0,0 @@
-{
- "keyboard_name": "serneity65",
- "manufacturer": "wuque",
- "url": "https://wuque.com/",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x906B",
- "pid": "0x0003",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"],
- "rows": ["B0", "F0", "B1", "D2", "D3"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B2", "pin_b": "B3"}
- ]
- },
- "indicators": {
- "caps_lock": "C6",
- "on_state": 0
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 15.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 13], "x": 14, "y": 0},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
- {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_split_bs": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 15.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 13], "x": 14, "y": 0},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_split_lshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_split_space": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15.5, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
- {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/wuque/serneity65/keyboard.json b/keyboards/wuque/serneity65/keyboard.json
new file mode 100644
index 00000000000..b64103d5338
--- /dev/null
+++ b/keyboards/wuque/serneity65/keyboard.json
@@ -0,0 +1,415 @@
+{
+ "keyboard_name": "serneity65",
+ "manufacturer": "wuque",
+ "url": "https://wuque.com/",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x906B",
+ "pid": "0x0003",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"],
+ "rows": ["B0", "F0", "B1", "D2", "D3"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "B3"}
+ ]
+ },
+ "indicators": {
+ "caps_lock": "C6",
+ "on_state": 0
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_split_bs": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_split_lshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_split_space": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wuque/serneity65/rules.mk b/keyboards/wuque/serneity65/rules.mk
deleted file mode 100644
index 8c163bff643..00000000000
--- a/keyboards/wuque/serneity65/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 = yes # 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
-ENCODER_ENABLE = yes # Enable Encoder
-
-LAYOUT = 65_ansi
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
deleted file mode 100644
index 487fc766983..00000000000
--- a/keyboards/xbows/woody/info.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
- "keyboard_name": "WOO-DY",
- "manufacturer": "X-BOWS",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x1224",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "solid_reactive_simple": true,
- "solid_reactive": true
- },
- "driver": "is31fl3731",
- "led_flush_limit": 26,
- "led_process_limit": 4,
- "max_brightness": 200,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["B6", "C6", "C7", "F4", "F5", "F6", "F7", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
- "rows": ["B3", "B2", "B1", "B0", "B5"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "layouts": {
- "LAYOUT": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 1.5},
- {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xbows/woody/keyboard.json b/keyboards/xbows/woody/keyboard.json
new file mode 100644
index 00000000000..538354507e0
--- /dev/null
+++ b/keyboards/xbows/woody/keyboard.json
@@ -0,0 +1,140 @@
+{
+ "keyboard_name": "WOO-DY",
+ "manufacturer": "X-BOWS",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1224",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true
+ },
+ "driver": "is31fl3731",
+ "led_flush_limit": 26,
+ "led_process_limit": 4,
+ "max_brightness": 200,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["B6", "C6", "C7", "F4", "F5", "F6", "F7", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+ "rows": ["B3", "B2", "B1", "B0", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "layouts": {
+ "LAYOUT": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xbows/woody/rules.mk b/keyboards/xbows/woody/rules.mk
deleted file mode 100644
index d9a69f35bb6..00000000000
--- a/keyboards/xbows/woody/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-BACKLIGHT_ENABLE = no
-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
-AUDIO_ENABLE = no
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/xelus/dawn60/info.json b/keyboards/xelus/dawn60/info.json
index 4bdc6df8a93..aafac25e05d 100644
--- a/keyboards/xelus/dawn60/info.json
+++ b/keyboards/xelus/dawn60/info.json
@@ -8,6 +8,12 @@
"pid": "0x0060",
"device_version": "0.0.1"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
index 25529426351..e64b0895fac 100644
--- a/keyboards/xelus/dawn60/rev1/config.h
+++ b/keyboards/xelus/dawn60/rev1/config.h
@@ -20,11 +20,6 @@
#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
#define IS31FL3731_LED_COUNT 64
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/xelus/dawn60/rev1/info.json b/keyboards/xelus/dawn60/rev1/info.json
deleted file mode 100644
index 872bf0d33a3..00000000000
--- a/keyboards/xelus/dawn60/rev1/info.json
+++ /dev/null
@@ -1,225 +0,0 @@
-{
- "ws2812": {
- "pin": "F0"
- },
- "matrix_pins": {
- "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["B1", "B3", "F1", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "layouts": {
- "LAYOUT_60_ansi_arrow": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 13, "y": 3},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 13, "y": 3},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/dawn60/rev1/keyboard.json b/keyboards/xelus/dawn60/rev1/keyboard.json
new file mode 100644
index 00000000000..bfdaf26e764
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1/keyboard.json
@@ -0,0 +1,231 @@
+{
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "ws2812": {
+ "pin": "F0"
+ },
+ "matrix_pins": {
+ "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["B1", "B3", "F1", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT_60_ansi_arrow": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk
index 0a72a60eca1..879710e8e7a 100644
--- a/keyboards/xelus/dawn60/rev1/rules.mk
+++ b/keyboards/xelus/dawn60/rev1/rules.mk
@@ -3,27 +3,12 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
WS2812_DRIVER_REQUIRED = yes
-
# project specific files
SRC += keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
drivers/led/issi/is31fl3731.c
-
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index 81d5dc1e83e..b54fcaee2ad 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -15,11 +15,6 @@
*/
#pragma once
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
//RGB Underglow defines
#define WS2812_LED_TOTAL 20
diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/info.json
deleted file mode 100644
index 12d6a5d5292..00000000000
--- a/keyboards/xelus/dawn60/rev1_qmk/info.json
+++ /dev/null
@@ -1,274 +0,0 @@
-{
- "ws2812": {
- "pin": "F0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "default": {
- "val": 80
- },
- "driver": "custom"
- },
- "matrix_pins": {
- "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["B1", "B3", "F1", "F6", "F7"]
- },
- "diode_direction": "COL2ROW",
- "layouts": {
- "LAYOUT_60_ansi_arrow": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 13, "y": 3},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 13, "y": 3},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/dawn60/rev1_qmk/keyboard.json b/keyboards/xelus/dawn60/rev1_qmk/keyboard.json
new file mode 100644
index 00000000000..7c3aa607dfe
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1_qmk/keyboard.json
@@ -0,0 +1,285 @@
+{
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "ws2812": {
+ "pin": "F0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "val": 80
+ },
+ "driver": "custom"
+ },
+ "matrix_pins": {
+ "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["B1", "B3", "F1", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT_60_ansi_arrow": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
index edb15fa760d..5a17af39fcd 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk
+++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
@@ -3,28 +3,9 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# 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 = yes # 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
-FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow
-
-RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
+I2C_DRIVER_REQUIRED = yes
WS2812_DRIVER_REQUIRED = yes
-COMMON_VPATH += $(DRIVER_PATH)/issi
-
# project specific files
+COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += drivers/led/issi/is31fl3731.c
-
-I2C_DRIVER_REQUIRED = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
deleted file mode 100755
index c8b4a6e5b16..00000000000
--- a/keyboards/xelus/la_plus/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-// Custom Startup Animation
-// comment out for solid animation
-// #define STARTUP_ANIMATION_DOTS
diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json
deleted file mode 100644
index 85e4e60215c..00000000000
--- a/keyboards/xelus/la_plus/info.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
- "keyboard_name": "MechaMaker La+",
- "manufacturer": "Xelus",
- "url": "",
- "maintainer": "Xelus22",
- "usb": {
- "vid": "0x5845",
- "pid": "0x4C50",
- "device_version": "0.0.1"
- },
- "ws2812": {
- "pin": "F1"
- },
- "rgb_matrix": {
- "animations": {
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_fractal": true,
- "pixel_rain": true
- },
- "default": {
- "animation": "cycle_all",
- "val": 80
- },
- "driver": "ws2812",
- "max_brightness": 180,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
- "rows": ["B0", "B1", "F0", "F4", "F5"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
- },
- "layouts": {
- "LAYOUT_65_ansi_rwkl": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_rwkl_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/la_plus/keyboard.json b/keyboards/xelus/la_plus/keyboard.json
new file mode 100644
index 00000000000..902364471ff
--- /dev/null
+++ b/keyboards/xelus/la_plus/keyboard.json
@@ -0,0 +1,232 @@
+{
+ "keyboard_name": "MechaMaker La+",
+ "manufacturer": "Xelus",
+ "url": "",
+ "maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x4C50",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "ws2812": {
+ "pin": "F1"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "pixel_rain": true
+ },
+ "default": {
+ "animation": "cycle_all",
+ "val": 80
+ },
+ "driver": "ws2812",
+ "max_brightness": 180,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["B0", "B1", "F0", "F4", "F5"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi_rwkl": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_rwkl_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/la_plus/rules.mk b/keyboards/xelus/la_plus/rules.mk
index 7f3c8075a53..942ef4c5dbd 100755
--- a/keyboards/xelus/la_plus/rules.mk
+++ b/keyboards/xelus/la_plus/rules.mk
@@ -1,16 +1 @@
-# 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 = 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
-
-RGB_MATRIX_ENABLE = yes
RGB_MATRIX_CUSTOM_KB = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/xelus/pachi/rgb/info.json b/keyboards/xelus/pachi/rgb/info.json
new file mode 100644
index 00000000000..9bf3ca04ef7
--- /dev/null
+++ b/keyboards/xelus/pachi/rgb/info.json
@@ -0,0 +1,20 @@
+{
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ }
+}
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index 6cb40a9fae4..8ed9a356334 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/keyboard.json
similarity index 100%
rename from keyboards/xelus/pachi/rgb/rev1/info.json
rename to keyboards/xelus/pachi/rgb/rev1/keyboard.json
diff --git a/keyboards/xelus/pachi/rgb/rev1/rules.mk b/keyboards/xelus/pachi/rgb/rev1/rules.mk
index 4c27f450080..8ecbd28acc4 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev1/rules.mk
@@ -1,20 +1,4 @@
-# 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 = 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
-FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
-
-RGB_MATRIX_ENABLE = yes
-
COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += drivers/led/issi/is31fl3741.c
-LTO_ENABLE = yes
OPT = 2
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index 50f7d6ac1df..a5fc38e0708 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PIN B6
#define I2C1_SDA_PIN B7
diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/keyboard.json
similarity index 100%
rename from keyboards/xelus/pachi/rgb/rev2/info.json
rename to keyboards/xelus/pachi/rgb/rev2/keyboard.json
diff --git a/keyboards/xelus/pachi/rgb/rev2/rules.mk b/keyboards/xelus/pachi/rgb/rev2/rules.mk
index 62bb12bfb04..8ecbd28acc4 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev2/rules.mk
@@ -1,19 +1,4 @@
-# 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 = 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
-
-RGB_MATRIX_ENABLE = yes
-
COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += drivers/led/issi/is31fl3741.c
-LTO_ENABLE = yes
OPT = 2
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
index 45f2a545309..3d3bc49228f 100644
--- a/keyboards/xelus/rs108/config.h
+++ b/keyboards/xelus/rs108/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
// I2C config
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json
deleted file mode 100644
index 0342177e641..00000000000
--- a/keyboards/xelus/rs108/info.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
- "keyboard_name": "RS108",
- "manufacturer": "Xelus",
- "url": "",
- "maintainer": "xelus22",
- "usb": {
- "vid": "0x5845",
- "pid": "0x5208",
- "device_version": "0.0.2",
- "force_nkro": true
- },
- "matrix_pins": {
- "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B1", "B10", "B4", "B3", "A15"],
- "rows": ["B5", "B6", "B7", "A1", "A0", "C13", "B0", "A7", "A5", "A4", "A3", "A2"]
- },
- "diode_direction": "COL2ROW",
- "eeprom": {
- "driver": "i2c"
- },
- "indicators": {
- "caps_lock": "A6",
- "num_lock": "A14",
- "scroll_lock": "A13"
- },
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_108_fullsize_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [1, 1], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0},
- {"matrix": [1, 2], "x": 5, "y": 0},
-
- {"matrix": [0, 3], "x": 6.5, "y": 0},
- {"matrix": [1, 3], "x": 7.5, "y": 0},
- {"matrix": [0, 4], "x": 8.5, "y": 0},
- {"matrix": [1, 4], "x": 9.5, "y": 0},
-
- {"matrix": [0, 5], "x": 11, "y": 0},
- {"matrix": [1, 5], "x": 12, "y": 0},
- {"matrix": [0, 6], "x": 13, "y": 0},
- {"matrix": [1, 6], "x": 14, "y": 0},
-
- {"matrix": [0, 7], "x": 15.25, "y": 0},
- {"matrix": [1, 7], "x": 16.25, "y": 0},
- {"matrix": [0, 8], "x": 17.25, "y": 0},
-
- {"matrix": [1, 8], "x": 18.5, "y": 0},
- {"matrix": [0, 9], "x": 19.5, "y": 0},
- {"matrix": [1, 9], "x": 20.5, "y": 0},
- {"matrix": [0, 10], "x": 21.5, "y": 0},
-
- {"matrix": [2, 0], "x": 0, "y": 1.25},
- {"matrix": [3, 0], "x": 1, "y": 1.25},
- {"matrix": [2, 1], "x": 2, "y": 1.25},
- {"matrix": [3, 1], "x": 3, "y": 1.25},
- {"matrix": [2, 2], "x": 4, "y": 1.25},
- {"matrix": [3, 2], "x": 5, "y": 1.25},
- {"matrix": [2, 3], "x": 6, "y": 1.25},
- {"matrix": [3, 3], "x": 7, "y": 1.25},
- {"matrix": [2, 4], "x": 8, "y": 1.25},
- {"matrix": [3, 4], "x": 9, "y": 1.25},
- {"matrix": [2, 5], "x": 10, "y": 1.25},
- {"matrix": [3, 5], "x": 11, "y": 1.25},
- {"matrix": [2, 6], "x": 12, "y": 1.25},
- {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [2, 7], "x": 15.25, "y": 1.25},
- {"matrix": [3, 7], "x": 16.25, "y": 1.25},
- {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
- {"matrix": [3, 8], "x": 18.5, "y": 1.25},
- {"matrix": [2, 9], "x": 19.5, "y": 1.25},
- {"matrix": [3, 9], "x": 20.5, "y": 1.25},
- {"matrix": [2, 10], "x": 21.5, "y": 1.25},
-
- {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [5, 0], "x": 1.5, "y": 2.25},
- {"matrix": [4, 1], "x": 2.5, "y": 2.25},
- {"matrix": [5, 1], "x": 3.5, "y": 2.25},
- {"matrix": [4, 2], "x": 4.5, "y": 2.25},
- {"matrix": [5, 2], "x": 5.5, "y": 2.25},
- {"matrix": [4, 3], "x": 6.5, "y": 2.25},
- {"matrix": [5, 3], "x": 7.5, "y": 2.25},
- {"matrix": [4, 4], "x": 8.5, "y": 2.25},
- {"matrix": [5, 4], "x": 9.5, "y": 2.25},
- {"matrix": [4, 5], "x": 10.5, "y": 2.25},
- {"matrix": [5, 5], "x": 11.5, "y": 2.25},
- {"matrix": [4, 6], "x": 12.5, "y": 2.25},
- {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [4, 7], "x": 15.25, "y": 2.25},
- {"matrix": [5, 7], "x": 16.25, "y": 2.25},
- {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
- {"matrix": [5, 8], "x": 18.5, "y": 2.25},
- {"matrix": [4, 9], "x": 19.5, "y": 2.25},
- {"matrix": [5, 9], "x": 20.5, "y": 2.25},
-
- {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [7, 0], "x": 1.75, "y": 3.25},
- {"matrix": [6, 1], "x": 2.75, "y": 3.25},
- {"matrix": [7, 1], "x": 3.75, "y": 3.25},
- {"matrix": [6, 2], "x": 4.75, "y": 3.25},
- {"matrix": [7, 2], "x": 5.75, "y": 3.25},
- {"matrix": [6, 3], "x": 6.75, "y": 3.25},
- {"matrix": [7, 3], "x": 7.75, "y": 3.25},
- {"matrix": [6, 4], "x": 8.75, "y": 3.25},
- {"matrix": [7, 4], "x": 9.75, "y": 3.25},
- {"matrix": [6, 5], "x": 10.75, "y": 3.25},
- {"matrix": [7, 5], "x": 11.75, "y": 3.25},
- {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [7, 8], "x": 18.5, "y": 3.25},
- {"matrix": [6, 9], "x": 19.5, "y": 3.25},
- {"matrix": [7, 9], "x": 20.5, "y": 3.25},
- {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
-
- {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [9, 0], "x": 2.25, "y": 4.25},
- {"matrix": [8, 1], "x": 3.25, "y": 4.25},
- {"matrix": [9, 1], "x": 4.25, "y": 4.25},
- {"matrix": [8, 2], "x": 5.25, "y": 4.25},
- {"matrix": [9, 2], "x": 6.25, "y": 4.25},
- {"matrix": [8, 3], "x": 7.25, "y": 4.25},
- {"matrix": [9, 3], "x": 8.25, "y": 4.25},
- {"matrix": [8, 4], "x": 9.25, "y": 4.25},
- {"matrix": [9, 4], "x": 10.25, "y": 4.25},
- {"matrix": [8, 5], "x": 11.25, "y": 4.25},
- {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
- {"matrix": [9, 8], "x": 18.5, "y": 4.25},
- {"matrix": [8, 9], "x": 19.5, "y": 4.25},
- {"matrix": [9, 9], "x": 20.5, "y": 4.25},
-
- {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
- {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
- {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
- {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
- {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-
- {"matrix": [11, 7], "x": 16.25, "y": 5.25},
- {"matrix": [10, 8], "x": 17.25, "y": 5.25},
- {"matrix": [10, 9], "x": 18.5, "y": 5.25, "w": 2},
-
- {"matrix": [11, 9], "x": 20.5, "y": 5.25},
- {"matrix": [10, 10], "x": 21.5, "y": 4.25, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/rs108/keyboard.json b/keyboards/xelus/rs108/keyboard.json
new file mode 100644
index 00000000000..12ffbb3fdc2
--- /dev/null
+++ b/keyboards/xelus/rs108/keyboard.json
@@ -0,0 +1,176 @@
+{
+ "keyboard_name": "RS108",
+ "manufacturer": "Xelus",
+ "url": "",
+ "maintainer": "xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5208",
+ "device_version": "0.0.2",
+ "force_nkro": true,
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B1", "B10", "B4", "B3", "A15"],
+ "rows": ["B5", "B6", "B7", "A1", "A0", "C13", "B0", "A7", "A5", "A4", "A3", "A2"]
+ },
+ "diode_direction": "COL2ROW",
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "indicators": {
+ "caps_lock": "A6",
+ "num_lock": "A14",
+ "scroll_lock": "A13"
+ },
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT_108_fullsize_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [1, 5], "x": 12, "y": 0},
+ {"matrix": [0, 6], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.25, "y": 0},
+ {"matrix": [1, 7], "x": 16.25, "y": 0},
+ {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 8], "x": 18.5, "y": 0},
+ {"matrix": [0, 9], "x": 19.5, "y": 0},
+ {"matrix": [1, 9], "x": 20.5, "y": 0},
+ {"matrix": [0, 10], "x": 21.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+ {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+ {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+ {"matrix": [3, 8], "x": 18.5, "y": 1.25},
+ {"matrix": [2, 9], "x": 19.5, "y": 1.25},
+ {"matrix": [3, 9], "x": 20.5, "y": 1.25},
+ {"matrix": [2, 10], "x": 21.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+ {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+ {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+ {"matrix": [5, 8], "x": 18.5, "y": 2.25},
+ {"matrix": [4, 9], "x": 19.5, "y": 2.25},
+ {"matrix": [5, 9], "x": 20.5, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [7, 8], "x": 18.5, "y": 3.25},
+ {"matrix": [6, 9], "x": 19.5, "y": 3.25},
+ {"matrix": [7, 9], "x": 20.5, "y": 3.25},
+ {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+ {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+ {"matrix": [8, 9], "x": 19.5, "y": 4.25},
+ {"matrix": [9, 9], "x": 20.5, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+
+ {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 17.25, "y": 5.25},
+ {"matrix": [10, 9], "x": 18.5, "y": 5.25, "w": 2},
+
+ {"matrix": [11, 9], "x": 20.5, "y": 5.25},
+ {"matrix": [10, 10], "x": 21.5, "y": 4.25, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/rs108/rules.mk b/keyboards/xelus/rs108/rules.mk
deleted file mode 100644
index b763de52c78..00000000000
--- a/keyboards/xelus/rs108/rules.mk
+++ /dev/null
@@ -1,16 +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 = 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
-
-# Save hid interface
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json
index 98b545a9e81..c1771427f13 100644
--- a/keyboards/xelus/rs60/info.json
+++ b/keyboards/xelus/rs60/info.json
@@ -7,5 +7,11 @@
"vid": "0x5845",
"pid": "0x5253"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_ansi_tsangan", "60_tsangan_hhkb"]
}
diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h
deleted file mode 100644
index 3c53ebc8bcf..00000000000
--- a/keyboards/xelus/rs60/rev1/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-#pragma once
-
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h
index 45f2a545309..3d3bc49228f 100644
--- a/keyboards/xelus/rs60/rev2_0/config.h
+++ b/keyboards/xelus/rs60/rev2_0/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
// I2C config
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json
deleted file mode 100644
index 499a5a922fc..00000000000
--- a/keyboards/xelus/rs60/rev2_0/info.json
+++ /dev/null
@@ -1,299 +0,0 @@
-{
- "usb": {
- "device_version": "0.2.0",
- "force_nkro": true
- },
- "matrix_pins": {
- "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
- "rows": ["B15", "B14", "B12", "B1", "B0"]
- },
- "diode_direction": "COL2ROW",
- "eeprom": {
- "driver": "i2c"
- },
- "indicators": {
- "caps_lock": "A1"
- },
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_60_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_tsangan": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/rs60/rev2_0/keyboard.json b/keyboards/xelus/rs60/rev2_0/keyboard.json
new file mode 100644
index 00000000000..9cb7b24043e
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_0/keyboard.json
@@ -0,0 +1,310 @@
+{
+ "usb": {
+ "device_version": "0.2.0",
+ "force_nkro": true,
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["B15", "B14", "B12", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "indicators": {
+ "caps_lock": "A1"
+ },
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_tsangan": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/rs60/rev2_0/rules.mk b/keyboards/xelus/rs60/rev2_0/rules.mk
deleted file mode 100644
index b763de52c78..00000000000
--- a/keyboards/xelus/rs60/rev2_0/rules.mk
+++ /dev/null
@@ -1,16 +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 = 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
-
-# Save hid interface
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h
deleted file mode 100644
index 430a5a47f7f..00000000000
--- a/keyboards/xelus/rs60/rev2_1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-#pragma once
-
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json
deleted file mode 100644
index fe87561e61c..00000000000
--- a/keyboards/xelus/rs60/rev2_1/info.json
+++ /dev/null
@@ -1,302 +0,0 @@
-{
- "usb": {
- "device_version": "0.2.1",
- "force_nkro": true
- },
- "matrix_pins": {
- "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
- "rows": ["B15", "B14", "B12", "B1", "B0"]
- },
- "diode_direction": "COL2ROW",
- "eeprom": {
- "wear_leveling": {
- "backing_size": 4096
- }
- },
- "indicators": {
- "caps_lock": "A1",
- "on_state": 0
- },
- "processor": "STM32L412",
- "bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_60_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_tsangan": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/rs60/rev2_1/keyboard.json b/keyboards/xelus/rs60/rev2_1/keyboard.json
new file mode 100644
index 00000000000..d7e56fe1cfc
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_1/keyboard.json
@@ -0,0 +1,313 @@
+{
+ "usb": {
+ "device_version": "0.2.1",
+ "force_nkro": true,
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["B15", "B14", "B12", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
+ "eeprom": {
+ "wear_leveling": {
+ "backing_size": 4096
+ }
+ },
+ "indicators": {
+ "caps_lock": "A1",
+ "on_state": 0
+ },
+ "processor": "STM32L412",
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_tsangan": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/rs60/rev2_1/rules.mk b/keyboards/xelus/rs60/rev2_1/rules.mk
deleted file mode 100644
index b763de52c78..00000000000
--- a/keyboards/xelus/rs60/rev2_1/rules.mk
+++ /dev/null
@@ -1,16 +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 = 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
-
-# Save hid interface
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/xelus/trinityxttkl/config.h b/keyboards/xelus/trinityxttkl/config.h
deleted file mode 100644
index 651f613045d..00000000000
--- a/keyboards/xelus/trinityxttkl/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/info.json
deleted file mode 100644
index f3b8956b137..00000000000
--- a/keyboards/xelus/trinityxttkl/info.json
+++ /dev/null
@@ -1,511 +0,0 @@
-{
- "keyboard_name": "Trinity XT TKL",
- "manufacturer": "Xelus",
- "url": "",
- "maintainer": "Xelus22",
- "usb": {
- "vid": "0x5845",
- "pid": "0x5854",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A10", "B9", "B4"],
- "rows": ["A14", "A15", "B3", "A2", "B6", "B5"]
- },
- "diode_direction": "COL2ROW",
- "indicators": {
- "caps_lock": "A1",
- "scroll_lock": "A13"
- },
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_ansi_split_space_split_bs_rshift"
- },
- "layouts": {
- "LAYOUT_ansi_split_space": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
- {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
- {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
- {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
- {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
- {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
- {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
- {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
- {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
- {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
- {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
- {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
- {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
- {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
- {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
- {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
- {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
- {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
- {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
- {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
- {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
- {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
- {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
- {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
- {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
- {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
- {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
- {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
- {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
- {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
- {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
- {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_split_space_split_bs_rshift": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
- {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
- {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
- {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
- {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
- {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
- {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
- {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
- {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
- {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
- {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
- {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
- {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
- {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
- {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
- {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
- {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
- {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
- {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
- {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
- {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
- {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
- {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
- {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
- {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
- {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
- {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
- {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
- {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
- {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
- {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
- {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
- {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
- {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_wkl": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
- {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
- {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
- {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
- {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
- {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
- {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
- {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
- {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
- {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
- {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
- {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
- {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
- {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
- {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
- {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
- {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
- {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
- {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
- {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
- {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
- {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
- {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
- {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
- {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
- {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
- {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
- {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
- {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_wkl_split_bs_rshift": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
- {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
- {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
- {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
- {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
- {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
- {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
- {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
- {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
- {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
- {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
- {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
- {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
- {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
- {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
- {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
- {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
- {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
- {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
- {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
- {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
- {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
- {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
- {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
- {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
- {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
- {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
- {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
- {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
- {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
- {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/trinityxttkl/keyboard.json b/keyboards/xelus/trinityxttkl/keyboard.json
new file mode 100644
index 00000000000..eea94c59792
--- /dev/null
+++ b/keyboards/xelus/trinityxttkl/keyboard.json
@@ -0,0 +1,524 @@
+{
+ "keyboard_name": "Trinity XT TKL",
+ "manufacturer": "Xelus",
+ "url": "",
+ "maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5854",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A10", "B9", "B4"],
+ "rows": ["A14", "A15", "B3", "A2", "B6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "A1",
+ "scroll_lock": "A13"
+ },
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_ansi_split_space_split_bs_rshift"
+ },
+ "layouts": {
+ "LAYOUT_ansi_split_space": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+ {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+ {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+ {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+ {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+ {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+ {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+ {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+ {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+ {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+ {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+ {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+ {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+ {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+ {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+ {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+ {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+ {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+ {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+ {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+ {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+ {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+ {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
+ {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
+ {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
+ {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_split_space_split_bs_rshift": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+ {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+ {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+ {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+ {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+ {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+ {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+ {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+ {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+ {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+ {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+ {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+ {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+ {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+ {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+ {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+ {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+ {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+ {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+ {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+ {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
+ {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+ {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+ {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
+ {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
+ {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
+ {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_wkl": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+ {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+ {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+ {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+ {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+ {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+ {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+ {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+ {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+ {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+ {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+ {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+ {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+ {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+ {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+ {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+ {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+ {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+ {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+ {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+ {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+ {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+ {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_wkl_split_bs_rshift": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+ {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+ {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+ {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+ {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+ {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+ {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+ {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+ {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+ {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+ {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+ {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+ {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+ {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+ {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+ {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+ {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+ {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+ {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+ {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+ {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
+ {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+ {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+ {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/trinityxttkl/rules.mk b/keyboards/xelus/trinityxttkl/rules.mk
index ef90964f9b3..0ab54aaaf71 100644
--- a/keyboards/xelus/trinityxttkl/rules.mk
+++ b/keyboards/xelus/trinityxttkl/rules.mk
@@ -1,16 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# 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 = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-
-
diff --git a/keyboards/xelus/valor/info.json b/keyboards/xelus/valor/info.json
new file mode 100644
index 00000000000..588361fc989
--- /dev/null
+++ b/keyboards/xelus/valor/info.json
@@ -0,0 +1,8 @@
+{
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ }
+}
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
deleted file mode 100644
index fe18ba5b717..00000000000
--- a/keyboards/xelus/valor/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index 9491d1f175d..7b968ea2a39 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
deleted file mode 100644
index 196c1ad1c43..00000000000
--- a/keyboards/xelus/valor/rev2/info.json
+++ /dev/null
@@ -1,240 +0,0 @@
-{
- "keyboard_name": "Valor Rev2",
- "manufacturer": "Xelus",
- "url": "",
- "maintainer": "Xelus22",
- "usb": {
- "vid": "0x5845",
- "pid": "0x5653",
- "device_version": "0.0.1"
- },
- "ws2812": {
- "pin": "A9",
- "driver": "pwm"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "driver": "ws2812",
- "max_brightness": 200,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
- "rows": ["B11", "B10", "A3", "A1", "A2"]
- },
- "diode_direction": "COL2ROW",
- "eeprom": {
- "driver": "i2c"
- },
- "processor": "STM32L422",
- "bootloader": "stm32-dfu",
- "community_layouts": ["alice", "alice_split_bs"],
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_alice_split_bs"
- },
- "layouts": {
- "LAYOUT_alice": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"matrix": [0, 8], "x": 10.25, "y": 0},
- {"matrix": [0, 9], "x": 11.25, "y": 0},
- {"matrix": [0, 10], "x": 12.25, "y": 0},
- {"matrix": [0, 11], "x": 13.25, "y": 0},
- {"matrix": [0, 12], "x": 14.25, "y": 0},
- {"matrix": [0, 13], "x": 15.25, "y": 0},
- {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
-
- {"matrix": [1, 7], "x": 9.75, "y": 1},
- {"matrix": [1, 8], "x": 10.75, "y": 1},
- {"matrix": [1, 9], "x": 11.75, "y": 1},
- {"matrix": [1, 10], "x": 12.75, "y": 1},
- {"matrix": [1, 11], "x": 13.75, "y": 1},
- {"matrix": [1, 12], "x": 14.75, "y": 1},
- {"matrix": [1, 13], "x": 15.75, "y": 1},
- {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
-
- {"matrix": [2, 7], "x": 10, "y": 2},
- {"matrix": [2, 8], "x": 11, "y": 2},
- {"matrix": [2, 9], "x": 12, "y": 2},
- {"matrix": [2, 10], "x": 13, "y": 2},
- {"matrix": [2, 11], "x": 14, "y": 2},
- {"matrix": [2, 12], "x": 15, "y": 2},
- {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [3, 7], "x": 9.5, "y": 3},
- {"matrix": [3, 8], "x": 10.5, "y": 3},
- {"matrix": [3, 9], "x": 11.5, "y": 3},
- {"matrix": [3, 10], "x": 12.5, "y": 3},
- {"matrix": [3, 11], "x": 13.5, "y": 3},
- {"matrix": [3, 12], "x": 14.5, "y": 3},
- {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 17.25, "y": 3},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
- {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
- {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
- {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_alice_split_bs": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"matrix": [0, 8], "x": 10.25, "y": 0},
- {"matrix": [0, 9], "x": 11.25, "y": 0},
- {"matrix": [0, 10], "x": 12.25, "y": 0},
- {"matrix": [0, 11], "x": 13.25, "y": 0},
- {"matrix": [0, 12], "x": 14.25, "y": 0},
- {"matrix": [0, 13], "x": 15.25, "y": 0},
- {"matrix": [0, 14], "x": 16.25, "y": 0},
- {"matrix": [2, 14], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
-
- {"matrix": [1, 7], "x": 9.75, "y": 1},
- {"matrix": [1, 8], "x": 10.75, "y": 1},
- {"matrix": [1, 9], "x": 11.75, "y": 1},
- {"matrix": [1, 10], "x": 12.75, "y": 1},
- {"matrix": [1, 11], "x": 13.75, "y": 1},
- {"matrix": [1, 12], "x": 14.75, "y": 1},
- {"matrix": [1, 13], "x": 15.75, "y": 1},
- {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
-
- {"matrix": [2, 7], "x": 10, "y": 2},
- {"matrix": [2, 8], "x": 11, "y": 2},
- {"matrix": [2, 9], "x": 12, "y": 2},
- {"matrix": [2, 10], "x": 13, "y": 2},
- {"matrix": [2, 11], "x": 14, "y": 2},
- {"matrix": [2, 12], "x": 15, "y": 2},
- {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [3, 7], "x": 9.5, "y": 3},
- {"matrix": [3, 8], "x": 10.5, "y": 3},
- {"matrix": [3, 9], "x": 11.5, "y": 3},
- {"matrix": [3, 10], "x": 12.5, "y": 3},
- {"matrix": [3, 11], "x": 13.5, "y": 3},
- {"matrix": [3, 12], "x": 14.5, "y": 3},
- {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 17.25, "y": 3},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
- {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
- {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
- {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/valor/rev2/keyboard.json b/keyboards/xelus/valor/rev2/keyboard.json
new file mode 100644
index 00000000000..21de5fb4a2a
--- /dev/null
+++ b/keyboards/xelus/valor/rev2/keyboard.json
@@ -0,0 +1,250 @@
+{
+ "keyboard_name": "Valor Rev2",
+ "manufacturer": "Xelus",
+ "url": "",
+ "maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5653",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "ws2812": {
+ "pin": "A9",
+ "driver": "pwm"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "driver": "ws2812",
+ "max_brightness": 200,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["B11", "B10", "A3", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "processor": "STM32L422",
+ "bootloader": "stm32-dfu",
+ "community_layouts": ["alice", "alice_split_bs"],
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 8], "x": 10.25, "y": 0},
+ {"matrix": [0, 9], "x": 11.25, "y": 0},
+ {"matrix": [0, 10], "x": 12.25, "y": 0},
+ {"matrix": [0, 11], "x": 13.25, "y": 0},
+ {"matrix": [0, 12], "x": 14.25, "y": 0},
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+ {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [1, 7], "x": 9.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.75, "y": 1},
+ {"matrix": [1, 9], "x": 11.75, "y": 1},
+ {"matrix": [1, 10], "x": 12.75, "y": 1},
+ {"matrix": [1, 11], "x": 13.75, "y": 1},
+ {"matrix": [1, 12], "x": 14.75, "y": 1},
+ {"matrix": [1, 13], "x": 15.75, "y": 1},
+ {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2},
+ {"matrix": [2, 10], "x": 13, "y": 2},
+ {"matrix": [2, 11], "x": 14, "y": 2},
+ {"matrix": [2, 12], "x": 15, "y": 2},
+ {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.5, "y": 3},
+ {"matrix": [3, 8], "x": 10.5, "y": 3},
+ {"matrix": [3, 9], "x": 11.5, "y": 3},
+ {"matrix": [3, 10], "x": 12.5, "y": 3},
+ {"matrix": [3, 11], "x": 13.5, "y": 3},
+ {"matrix": [3, 12], "x": 14.5, "y": 3},
+ {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 8], "x": 10.25, "y": 0},
+ {"matrix": [0, 9], "x": 11.25, "y": 0},
+ {"matrix": [0, 10], "x": 12.25, "y": 0},
+ {"matrix": [0, 11], "x": 13.25, "y": 0},
+ {"matrix": [0, 12], "x": 14.25, "y": 0},
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+ {"matrix": [0, 14], "x": 16.25, "y": 0},
+ {"matrix": [2, 14], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [1, 7], "x": 9.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.75, "y": 1},
+ {"matrix": [1, 9], "x": 11.75, "y": 1},
+ {"matrix": [1, 10], "x": 12.75, "y": 1},
+ {"matrix": [1, 11], "x": 13.75, "y": 1},
+ {"matrix": [1, 12], "x": 14.75, "y": 1},
+ {"matrix": [1, 13], "x": 15.75, "y": 1},
+ {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2},
+ {"matrix": [2, 10], "x": 13, "y": 2},
+ {"matrix": [2, 11], "x": 14, "y": 2},
+ {"matrix": [2, 12], "x": 15, "y": 2},
+ {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.5, "y": 3},
+ {"matrix": [3, 8], "x": 10.5, "y": 3},
+ {"matrix": [3, 9], "x": 11.5, "y": 3},
+ {"matrix": [3, 10], "x": 12.5, "y": 3},
+ {"matrix": [3, 11], "x": 13.5, "y": 3},
+ {"matrix": [3, 12], "x": 14.5, "y": 3},
+ {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/valor/rev2/rules.mk b/keyboards/xelus/valor/rev2/rules.mk
index 7fd72e35e76..8d76aac36cc 100644
--- a/keyboards/xelus/valor/rev2/rules.mk
+++ b/keyboards/xelus/valor/rev2/rules.mk
@@ -1,17 +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
-RGB_MATRIX_ENABLE = yes
RGB_MATRIX_CUSTOM_KB = yes
OPT = 2
-LTO_ENABLE = yes
diff --git a/keyboards/xelus/valor_frl_tkl/info.json b/keyboards/xelus/valor_frl_tkl/info.json
index fee349b989a..a0b7a70a89f 100644
--- a/keyboards/xelus/valor_frl_tkl/info.json
+++ b/keyboards/xelus/valor_frl_tkl/info.json
@@ -6,6 +6,12 @@
"vid": "0x5845",
"pid": "0x4654"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"layout_aliases": {
"LAYOUT_all": "LAYOUT_ansi_split_bs_rshift"
},
diff --git a/keyboards/xelus/valor_frl_tkl/rev1/config.h b/keyboards/xelus/valor_frl_tkl/rev1/config.h
index af702fcafda..44406be7b59 100644
--- a/keyboards/xelus/valor_frl_tkl/rev1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev1/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C OLED defines
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
index cb37aaa4ccb..b085b99d884 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
@@ -16,10 +16,4 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define STM32_HSECLK 16000000
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
deleted file mode 100644
index d3e21777934..00000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "keyboard_name": "Valor FRL TKL Rev2.0",
- "usb": {
- "device_version": "0.0.2"
- },
- "matrix_pins": {
- "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
- "rows": ["A15", "A14", "A10", "B3", "B4"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F411",
- "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json b/keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json
new file mode 100644
index 00000000000..36db1d4398e
--- /dev/null
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json
@@ -0,0 +1,24 @@
+{
+ "keyboard_name": "Valor FRL TKL Rev2.0",
+ "usb": {
+ "device_version": "0.0.2",
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+ "rows": ["A15", "A14", "A10", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F411",
+ "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
deleted file mode 100644
index 8ee0c3e8fe8..00000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/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
-
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
index cb37aaa4ccb..b085b99d884 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
@@ -16,10 +16,4 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define STM32_HSECLK 16000000
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
deleted file mode 100644
index 61a26ca4c97..00000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "keyboard_name": "Valor FRL TKL Rev2.2",
- "usb": {
- "device_version": "0.0.3"
- },
- "matrix_pins": {
- "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
- "rows": ["A15", "A14", "A13", "B3", "B4"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F401",
- "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json b/keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json
new file mode 100644
index 00000000000..376d73a4299
--- /dev/null
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json
@@ -0,0 +1,24 @@
+{
+ "keyboard_name": "Valor FRL TKL Rev2.2",
+ "usb": {
+ "device_version": "0.0.3",
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+ "rows": ["A15", "A14", "A13", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu"
+}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk
deleted file mode 100644
index 8ee0c3e8fe8..00000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/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
-
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h
index 877313776ad..17967f05f59 100644
--- a/keyboards/xelus/xs60/hotswap/config.h
+++ b/keyboards/xelus/xs60/hotswap/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PAL_MODE 4
#define I2C1_SDA_PAL_MODE 4
diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/keyboard.json
similarity index 100%
rename from keyboards/xelus/xs60/hotswap/info.json
rename to keyboards/xelus/xs60/hotswap/keyboard.json
diff --git a/keyboards/xelus/xs60/hotswap/rules.mk b/keyboards/xelus/xs60/hotswap/rules.mk
index f632b896ab1..3aa0e2bf061 100644
--- a/keyboards/xelus/xs60/hotswap/rules.mk
+++ b/keyboards/xelus/xs60/hotswap/rules.mk
@@ -1,16 +1 @@
-# 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 = 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
-
-RGBLIGHT_ENABLE = yes
-
-LTO_ENABLE = yes
OPT = 2
diff --git a/keyboards/xelus/xs60/info.json b/keyboards/xelus/xs60/info.json
new file mode 100644
index 00000000000..719cf2aac12
--- /dev/null
+++ b/keyboards/xelus/xs60/info.json
@@ -0,0 +1,19 @@
+{
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ }
+}
diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h
index 5b966800c68..8ab23ab40cf 100644
--- a/keyboards/xelus/xs60/soldered/config.h
+++ b/keyboards/xelus/xs60/soldered/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PAL_MODE 4
#define I2C1_SDA_PAL_MODE 4
diff --git a/keyboards/xelus/xs60/soldered/info.json b/keyboards/xelus/xs60/soldered/keyboard.json
similarity index 100%
rename from keyboards/xelus/xs60/soldered/info.json
rename to keyboards/xelus/xs60/soldered/keyboard.json
diff --git a/keyboards/xelus/xs60/soldered/rules.mk b/keyboards/xelus/xs60/soldered/rules.mk
index f632b896ab1..3aa0e2bf061 100644
--- a/keyboards/xelus/xs60/soldered/rules.mk
+++ b/keyboards/xelus/xs60/soldered/rules.mk
@@ -1,16 +1 @@
-# 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 = 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
-
-RGBLIGHT_ENABLE = yes
-
-LTO_ENABLE = yes
OPT = 2
diff --git a/keyboards/xenon/config.h b/keyboards/xenon/config.h
deleted file mode 100644
index 4a0752d3718..00000000000
--- a/keyboards/xenon/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2020 Kyrre Havik Eriksen
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-#ifdef OLED_ENABLE
- #define OLED_DISPLAY_128X32
-#endif
-
-// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
-// #define SPLIT_USB_DETECT
-// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json
deleted file mode 100644
index 2bc916fde4a..00000000000
--- a/keyboards/xenon/info.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
- "keyboard_name": "Xenon",
- "manufacturer": "narinari",
- "url": "https://github.com/narinari/xenon-keyboard",
- "maintainer": "Kyrremann",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3404",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B6", "pin_b": "B5"}
- ]
- },
- "split": {
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 6], "x": 0, "y": 0.75},
- {"matrix": [0, 5], "x": 1, "y": 0.75},
- {"matrix": [0, 4], "x": 2, "y": 0.25},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0.25},
- {"matrix": [0, 1], "x": 5, "y": 0.5},
-
- {"matrix": [5, 1], "x": 9, "y": 0.5},
- {"matrix": [5, 2], "x": 10, "y": 0.25},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0.25},
- {"matrix": [5, 5], "x": 13, "y": 0.75},
- {"matrix": [5, 6], "x": 14, "y": 0.75},
-
- {"matrix": [1, 6], "x": 0, "y": 1.75},
- {"matrix": [1, 5], "x": 1, "y": 1.75},
- {"matrix": [1, 4], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 2], "x": 4, "y": 1.25},
- {"matrix": [1, 1], "x": 5, "y": 1.5},
-
- {"matrix": [6, 1], "x": 9, "y": 1.5},
- {"matrix": [6, 2], "x": 10, "y": 1.25},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1.25},
- {"matrix": [6, 5], "x": 13, "y": 1.75},
- {"matrix": [6, 6], "x": 14, "y": 1.75},
-
- {"matrix": [2, 6], "x": 0, "y": 2.75},
- {"matrix": [2, 5], "x": 1, "y": 2.75},
- {"matrix": [2, 4], "x": 2, "y": 2.25},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 2], "x": 4, "y": 2.25},
- {"matrix": [2, 1], "x": 5, "y": 2.5},
-
- {"matrix": [7, 1], "x": 9, "y": 2.5},
- {"matrix": [7, 2], "x": 10, "y": 2.25},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2.25},
- {"matrix": [7, 5], "x": 13, "y": 2.75},
- {"matrix": [7, 6], "x": 14, "y": 2.75},
-
- {"matrix": [3, 4], "x": 2, "y": 3.25},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 2], "x": 4, "y": 3.25},
- {"matrix": [3, 1], "x": 5, "y": 3.5},
- {"matrix": [3, 0], "x": 6, "y": 3.5},
-
- {"matrix": [8, 0], "x": 8, "y": 3.5},
- {"matrix": [8, 1], "x": 9, "y": 3.5},
- {"matrix": [8, 2], "x": 10, "y": 3.25},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3.25},
-
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 2], "x": 4, "y": 4.25},
- {"matrix": [4, 1], "x": 5, "y": 4.5},
- {"matrix": [4, 0], "x": 6, "y": 4.5},
-
- {"matrix": [9, 0], "x": 8, "y": 4.5},
- {"matrix": [9, 1], "x": 9, "y": 4.5},
- {"matrix": [9, 2], "x": 10, "y": 4.25},
- {"matrix": [9, 3], "x": 11, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xenon/keyboard.json b/keyboards/xenon/keyboard.json
new file mode 100644
index 00000000000..7f78988525a
--- /dev/null
+++ b/keyboards/xenon/keyboard.json
@@ -0,0 +1,111 @@
+{
+ "keyboard_name": "Xenon",
+ "manufacturer": "narinari",
+ "url": "https://github.com/narinari/xenon-keyboard",
+ "maintainer": "Kyrremann",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3404",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "oled": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B6", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 6], "x": 0, "y": 0.75},
+ {"matrix": [0, 5], "x": 1, "y": 0.75},
+ {"matrix": [0, 4], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0.25},
+ {"matrix": [0, 1], "x": 5, "y": 0.5},
+
+ {"matrix": [5, 1], "x": 9, "y": 0.5},
+ {"matrix": [5, 2], "x": 10, "y": 0.25},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0.25},
+ {"matrix": [5, 5], "x": 13, "y": 0.75},
+ {"matrix": [5, 6], "x": 14, "y": 0.75},
+
+ {"matrix": [1, 6], "x": 0, "y": 1.75},
+ {"matrix": [1, 5], "x": 1, "y": 1.75},
+ {"matrix": [1, 4], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1.25},
+ {"matrix": [1, 1], "x": 5, "y": 1.5},
+
+ {"matrix": [6, 1], "x": 9, "y": 1.5},
+ {"matrix": [6, 2], "x": 10, "y": 1.25},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1.25},
+ {"matrix": [6, 5], "x": 13, "y": 1.75},
+ {"matrix": [6, 6], "x": 14, "y": 1.75},
+
+ {"matrix": [2, 6], "x": 0, "y": 2.75},
+ {"matrix": [2, 5], "x": 1, "y": 2.75},
+ {"matrix": [2, 4], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2.25},
+ {"matrix": [2, 1], "x": 5, "y": 2.5},
+
+ {"matrix": [7, 1], "x": 9, "y": 2.5},
+ {"matrix": [7, 2], "x": 10, "y": 2.25},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2.25},
+ {"matrix": [7, 5], "x": 13, "y": 2.75},
+ {"matrix": [7, 6], "x": 14, "y": 2.75},
+
+ {"matrix": [3, 4], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3.25},
+ {"matrix": [3, 1], "x": 5, "y": 3.5},
+ {"matrix": [3, 0], "x": 6, "y": 3.5},
+
+ {"matrix": [8, 0], "x": 8, "y": 3.5},
+ {"matrix": [8, 1], "x": 9, "y": 3.5},
+ {"matrix": [8, 2], "x": 10, "y": 3.25},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3.25},
+
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 2], "x": 4, "y": 4.25},
+ {"matrix": [4, 1], "x": 5, "y": 4.5},
+ {"matrix": [4, 0], "x": 6, "y": 4.5},
+
+ {"matrix": [9, 0], "x": 8, "y": 4.5},
+ {"matrix": [9, 1], "x": 9, "y": 4.5},
+ {"matrix": [9, 2], "x": 10, "y": 4.25},
+ {"matrix": [9, 3], "x": 11, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xenon/rules.mk b/keyboards/xenon/rules.mk
deleted file mode 100644
index 190ff6ca62b..00000000000
--- a/keyboards/xenon/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 = yes # 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
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/xiaomi/mk02/config.h b/keyboards/xiaomi/mk02/config.h
index 093618f2b33..fc20837593b 100644
--- a/keyboards/xiaomi/mk02/config.h
+++ b/keyboards/xiaomi/mk02/config.h
@@ -18,19 +18,3 @@ along with this program. If not, see .
#pragma once
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiaomi/mk02/info.json b/keyboards/xiaomi/mk02/info.json
deleted file mode 100644
index 16cbfd1703b..00000000000
--- a/keyboards/xiaomi/mk02/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
- "keyboard_name": "MK02",
- "manufacturer": "Xiaomi",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0B91",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C14", "C15", "B11", "A1", "A2", "B12"],
- "rows": ["A3", "A4", "A5", "A6", "A7", "B0"]
- },
- "diode_direction": "ROW2COL",
- "layouts": {
- "LAYOUT_tkl_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"matrix": [1, 5], "x": 5, "y": 1.5},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
- {"matrix": [1, 7], "x": 7, "y": 1.5},
- {"matrix": [1, 8], "x": 8, "y": 1.5},
- {"matrix": [1, 9], "x": 9, "y": 1.5},
- {"matrix": [1, 10], "x": 10, "y": 1.5},
- {"matrix": [1, 11], "x": 11, "y": 1.5},
- {"matrix": [1, 12], "x": 12, "y": 1.5},
- {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.5},
- {"matrix": [1, 15], "x": 16.25, "y": 1.5},
- {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.5},
- {"matrix": [2, 2], "x": 2.5, "y": 2.5},
- {"matrix": [2, 3], "x": 3.5, "y": 2.5},
- {"matrix": [2, 4], "x": 4.5, "y": 2.5},
- {"matrix": [2, 5], "x": 5.5, "y": 2.5},
- {"matrix": [2, 6], "x": 6.5, "y": 2.5},
- {"matrix": [2, 7], "x": 7.5, "y": 2.5},
- {"matrix": [2, 8], "x": 8.5, "y": 2.5},
- {"matrix": [2, 9], "x": 9.5, "y": 2.5},
- {"matrix": [2, 10], "x": 10.5, "y": 2.5},
- {"matrix": [2, 11], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.5},
- {"matrix": [2, 15], "x": 16.25, "y": 2.5},
- {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.5},
- {"matrix": [3, 2], "x": 2.75, "y": 3.5},
- {"matrix": [3, 3], "x": 3.75, "y": 3.5},
- {"matrix": [3, 4], "x": 4.75, "y": 3.5},
- {"matrix": [3, 5], "x": 5.75, "y": 3.5},
- {"matrix": [3, 6], "x": 6.75, "y": 3.5},
- {"matrix": [3, 7], "x": 7.75, "y": 3.5},
- {"matrix": [3, 8], "x": 8.75, "y": 3.5},
- {"matrix": [3, 9], "x": 9.75, "y": 3.5},
- {"matrix": [3, 10], "x": 10.75, "y": 3.5},
- {"matrix": [3, 11], "x": 11.75, "y": 3.5},
- {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [4, 1], "x": 2.25, "y": 4.5},
- {"matrix": [4, 2], "x": 3.25, "y": 4.5},
- {"matrix": [4, 3], "x": 4.25, "y": 4.5},
- {"matrix": [4, 4], "x": 5.25, "y": 4.5},
- {"matrix": [4, 5], "x": 6.25, "y": 4.5},
- {"matrix": [4, 6], "x": 7.25, "y": 4.5},
- {"matrix": [4, 7], "x": 8.25, "y": 4.5},
- {"matrix": [4, 8], "x": 9.25, "y": 4.5},
- {"matrix": [4, 9], "x": 10.25, "y": 4.5},
- {"matrix": [4, 10], "x": 11.25, "y": 4.5},
- {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [4, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 13], "x": 15.25, "y": 5.5},
- {"matrix": [5, 14], "x": 16.25, "y": 5.5},
- {"matrix": [5, 15], "x": 17.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/xiaomi/mk02/keyboard.json b/keyboards/xiaomi/mk02/keyboard.json
new file mode 100644
index 00000000000..28d5d8a17d3
--- /dev/null
+++ b/keyboards/xiaomi/mk02/keyboard.json
@@ -0,0 +1,124 @@
+{
+ "keyboard_name": "MK02",
+ "manufacturer": "Xiaomi",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0B91",
+ "device_version": "0.0.1"
+ },
+ "processor": "STM32F072",
+ "bootloader": "custom",
+ "matrix_pins": {
+ "cols": ["B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C14", "C15", "B11", "A1", "A2", "B12"],
+ "rows": ["A3", "A4", "A5", "A6", "A7", "B0"]
+ },
+ "diode_direction": "ROW2COL",
+ "layouts": {
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xiaomi/mk02/rules.mk b/keyboards/xiaomi/mk02/rules.mk
index c20d67dd89d..5920e3de5fa 100644
--- a/keyboards/xiaomi/mk02/rules.mk
+++ b/keyboards/xiaomi/mk02/rules.mk
@@ -1,19 +1,6 @@
-# MCU name
-MCU = STM32F072
+# custom bootloader
BOARD = ST_STM32F072B_DISCOVERY
MCU_LDSCRIPT = STM32F072_0x2000_bootloader
-# Bootloader selection
-BOOTLOADER = custom
-
DFU_ARGS = -d 0483:df11 -a 0 -s 0x08002000:leave
DFU_SUFFIX_ARGS = -v 0483 -p DF11
-
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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 # This is broken on 072 for some reason
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
deleted file mode 100644
index 1e0b22f96b1..00000000000
--- a/keyboards/xiudi/xd002/info.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "keyboard_name": "XD002",
- "manufacturer": "XIUDI",
- "url": "https://kprepublic.com/products/xd002-xiudi-2-custom-mechanical-keyboard-2-keys-underglow-and-switch-rgb-pcb-programmed-hot-swappable-macro-key-aluminum-case",
- "maintainer": "zvecr",
- "usb": {
- "vid": "0x7844",
- "pid": "0x0202",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 2
- },
- "ws2812": {
- "pin": "B2"
- },
- "matrix_pins": {
- "direct": [
- ["B0", "B1"]
- ]
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]},
- {"x": 1, "y": 0, "matrix": [0, 1]}
- ]
- }
- }
-}
diff --git a/keyboards/xiudi/xd002/keyboard.json b/keyboards/xiudi/xd002/keyboard.json
new file mode 100644
index 00000000000..98b06cb84ac
--- /dev/null
+++ b/keyboards/xiudi/xd002/keyboard.json
@@ -0,0 +1,40 @@
+{
+ "keyboard_name": "XD002",
+ "manufacturer": "XIUDI",
+ "url": "https://kprepublic.com/products/xd002-xiudi-2-custom-mechanical-keyboard-2-keys-underglow-and-switch-rgb-pcb-programmed-hot-swappable-macro-key-aluminum-case",
+ "maintainer": "zvecr",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x0202",
+ "device_version": "0.0.1"
+ },
+ "processor": "attiny85",
+ "bootloader": "custom",
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "grave_esc": false,
+ "magic": false,
+ "space_cadet": false
+ },
+ "rgblight": {
+ "led_count": 2
+ },
+ "ws2812": {
+ "pin": "B2"
+ },
+ "matrix_pins": {
+ "direct": [
+ ["B0", "B1"]
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xiudi/xd002/rules.mk b/keyboards/xiudi/xd002/rules.mk
index 70c620c8f06..e31f5d531fd 100644
--- a/keyboards/xiudi/xd002/rules.mk
+++ b/keyboards/xiudi/xd002/rules.mk
@@ -1,26 +1,3 @@
-# MCU name
-MCU = attiny85
-
-# Bootloader selection
-BOOTLOADER = custom
+# custom bootloader
OPT_DEFS += -DBOOTLOADER_SIZE=1862
PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-
-# Save as much space as we can...
-LTO_ENABLE = yes
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index 0ad3910060c..e40e570c14d 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -16,28 +16,6 @@
#pragma once
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
deleted file mode 100644
index b97efe9cf85..00000000000
--- a/keyboards/xiudi/xd84/info.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
- "keyboard_name": "XD84",
- "manufacturer": "KPrepublic",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x7844",
- "pid": "0x8484",
- "device_version": "0.0.1"
- },
- "backlight": {
- "pin": "B5",
- "levels": 10,
- "on_state": 0
- },
- "indicators": {
- "caps_lock": "B6",
- "on_state": 0
- },
- "rgblight": {
- "led_count": 7,
- "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": {
- "pin": "C7"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["75_ansi", "75_iso"],
- "layouts": {
- "LAYOUT_75_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5},
- {"matrix": [5, 11], "x": 11, "y": 5},
- {"matrix": [5, 8], "x": 12, "y": 5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5}
- ]
- },
- "LAYOUT_75_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 12], "x": 12.75, "y": 3},
- {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5},
- {"matrix": [5, 11], "x": 11, "y": 5},
- {"matrix": [5, 8], "x": 12, "y": 5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/xiudi/xd84/keyboard.json b/keyboards/xiudi/xd84/keyboard.json
new file mode 100644
index 00000000000..0411869633d
--- /dev/null
+++ b/keyboards/xiudi/xd84/keyboard.json
@@ -0,0 +1,247 @@
+{
+ "keyboard_name": "XD84",
+ "manufacturer": "KPrepublic",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x8484",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "backlight": {
+ "pin": "B5",
+ "levels": 10,
+ "on_state": 0
+ },
+ "indicators": {
+ "caps_lock": "B6",
+ "on_state": 0
+ },
+ "rgblight": {
+ "led_count": 7,
+ "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": {
+ "pin": "C7"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["75_ansi", "75_iso"],
+ "layouts": {
+ "LAYOUT_75_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 8], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 8], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xiudi/xd84/rules.mk b/keyboards/xiudi/xd84/rules.mk
index 89d05c5487e..e11c65db028 100644
--- a/keyboards/xiudi/xd84/rules.mk
+++ b/keyboards/xiudi/xd84/rules.mk
@@ -1,17 +1,3 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
# custom matrix setup
CUSTOM_MATRIX = lite
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 059b57a0c6f..6eb4fc5f58e 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -16,28 +16,6 @@
#pragma once
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 18
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
deleted file mode 100644
index 2b4ee4aad0a..00000000000
--- a/keyboards/xiudi/xd96/info.json
+++ /dev/null
@@ -1,373 +0,0 @@
-{
- "keyboard_name": "XD96",
- "manufacturer": "KPrepublic",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x7844",
- "pid": "0x9696",
- "device_version": "0.0.1"
- },
- "backlight": {
- "pin": "B5",
- "levels": 10
- },
- "rgblight": {
- "led_count": 16,
- "max_brightness": 50,
- "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
- }
- },
- "indicators": {
- "caps_lock": "B6",
- "num_lock": "C6",
- "on_state": 0
- },
- "ws2812": {
- "pin": "C7"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_96_ansi": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
- {"matrix": [0, 15], "x": 16, "y": 0},
- {"matrix": [0, 16], "x": 17, "y": 0},
- {"matrix": [0, 17], "x": 18, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 14], "x": 15, "y": 1},
- {"matrix": [1, 15], "x": 16, "y": 1},
- {"matrix": [1, 16], "x": 17, "y": 1},
- {"matrix": [1, 17], "x": 18, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 14], "x": 15, "y": 2},
- {"matrix": [2, 15], "x": 16, "y": 2},
- {"matrix": [2, 16], "x": 17, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
- {"matrix": [3, 14], "x": 15, "y": 3},
- {"matrix": [3, 15], "x": 16, "y": 3},
- {"matrix": [3, 16], "x": 17, "y": 3},
- {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
- {"matrix": [4, 15], "x": 16, "y": 4},
- {"matrix": [4, 16], "x": 17, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
- {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5},
- {"matrix": [5, 15], "x": 16, "y": 5},
- {"matrix": [5, 16], "x": 17, "y": 5},
- {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
- ]
- },
- "LAYOUT_96_iso": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
- {"matrix": [0, 15], "x": 16, "y": 0},
- {"matrix": [0, 16], "x": 17, "y": 0},
- {"matrix": [0, 17], "x": 18, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 14], "x": 15, "y": 1},
- {"matrix": [1, 15], "x": 16, "y": 1},
- {"matrix": [1, 16], "x": 17, "y": 1},
- {"matrix": [1, 17], "x": 18, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 14], "x": 15, "y": 2},
- {"matrix": [2, 15], "x": 16, "y": 2},
- {"matrix": [2, 16], "x": 17, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 12], "x": 12.75, "y": 3},
- {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
- {"matrix": [3, 14], "x": 15, "y": 3},
- {"matrix": [3, 15], "x": 16, "y": 3},
- {"matrix": [3, 16], "x": 17, "y": 3},
- {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
- {"matrix": [4, 15], "x": 16, "y": 4},
- {"matrix": [4, 16], "x": 17, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
- {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5},
- {"matrix": [5, 15], "x": 16, "y": 5},
- {"matrix": [5, 16], "x": 17, "y": 5},
- {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
- ]
- },
- "LAYOUT_all": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
- {"matrix": [0, 15], "x": 16, "y": 0},
- {"matrix": [0, 16], "x": 17, "y": 0},
- {"matrix": [0, 17], "x": 18, "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": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1},
- {"matrix": [5, 9], "x": 14, "y": 1},
- {"matrix": [1, 14], "x": 15, "y": 1},
- {"matrix": [1, 15], "x": 16, "y": 1},
- {"matrix": [1, 16], "x": 17, "y": 1},
- {"matrix": [1, 17], "x": 18, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 14], "x": 15, "y": 2},
- {"matrix": [2, 15], "x": 16, "y": 2},
- {"matrix": [2, 16], "x": 17, "y": 2},
- {"matrix": [2, 17], "x": 18, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 12], "x": 12.75, "y": 3},
- {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
- {"matrix": [3, 14], "x": 15, "y": 3},
- {"matrix": [3, 15], "x": 16, "y": 3},
- {"matrix": [3, 16], "x": 17, "y": 3},
- {"matrix": [3, 17], "x": 18, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
- {"matrix": [4, 15], "x": 16, "y": 4},
- {"matrix": [4, 16], "x": 17, "y": 4},
- {"matrix": [4, 17], "x": 18, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
- {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5},
- {"matrix": [5, 15], "x": 16, "y": 5},
- {"matrix": [5, 16], "x": 17, "y": 5},
- {"matrix": [5, 17], "x": 18, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/xiudi/xd96/keyboard.json b/keyboards/xiudi/xd96/keyboard.json
new file mode 100644
index 00000000000..df1fd1cfd44
--- /dev/null
+++ b/keyboards/xiudi/xd96/keyboard.json
@@ -0,0 +1,390 @@
+{
+ "keyboard_name": "XD96",
+ "manufacturer": "KPrepublic",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x9696",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "backlight": {
+ "pin": "B5",
+ "levels": 10
+ },
+ "rgblight": {
+ "led_count": 16,
+ "max_brightness": 50,
+ "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
+ }
+ },
+ "indicators": {
+ "caps_lock": "B6",
+ "num_lock": "C6",
+ "on_state": 0
+ },
+ "ws2812": {
+ "pin": "C7"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_96_ansi": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [0, 15], "x": 16, "y": 0},
+ {"matrix": [0, 16], "x": 17, "y": 0},
+ {"matrix": [0, 17], "x": 18, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1},
+ {"matrix": [1, 16], "x": 17, "y": 1},
+ {"matrix": [1, 17], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [2, 15], "x": 16, "y": 2},
+ {"matrix": [2, 16], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+ {"matrix": [3, 16], "x": 17, "y": 3},
+ {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+ {"matrix": [4, 15], "x": 16, "y": 4},
+ {"matrix": [4, 16], "x": 17, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5},
+ {"matrix": [5, 15], "x": 16, "y": 5},
+ {"matrix": [5, 16], "x": 17, "y": 5},
+ {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+ ]
+ },
+ "LAYOUT_96_iso": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [0, 15], "x": 16, "y": 0},
+ {"matrix": [0, 16], "x": 17, "y": 0},
+ {"matrix": [0, 17], "x": 18, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1},
+ {"matrix": [1, 16], "x": 17, "y": 1},
+ {"matrix": [1, 17], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [2, 15], "x": 16, "y": 2},
+ {"matrix": [2, 16], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+ {"matrix": [3, 16], "x": 17, "y": 3},
+ {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+ {"matrix": [4, 15], "x": 16, "y": 4},
+ {"matrix": [4, 16], "x": 17, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5},
+ {"matrix": [5, 15], "x": 16, "y": 5},
+ {"matrix": [5, 16], "x": 17, "y": 5},
+ {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+ ]
+ },
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [0, 15], "x": 16, "y": 0},
+ {"matrix": [0, 16], "x": 17, "y": 0},
+ {"matrix": [0, 17], "x": 18, "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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [5, 9], "x": 14, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1},
+ {"matrix": [1, 16], "x": 17, "y": 1},
+ {"matrix": [1, 17], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [2, 15], "x": 16, "y": 2},
+ {"matrix": [2, 16], "x": 17, "y": 2},
+ {"matrix": [2, 17], "x": 18, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+ {"matrix": [3, 16], "x": 17, "y": 3},
+ {"matrix": [3, 17], "x": 18, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+ {"matrix": [4, 15], "x": 16, "y": 4},
+ {"matrix": [4, 16], "x": 17, "y": 4},
+ {"matrix": [4, 17], "x": 18, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5},
+ {"matrix": [5, 15], "x": 16, "y": 5},
+ {"matrix": [5, 16], "x": 17, "y": 5},
+ {"matrix": [5, 17], "x": 18, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xiudi/xd96/rules.mk b/keyboards/xiudi/xd96/rules.mk
index 89d05c5487e..e11c65db028 100644
--- a/keyboards/xiudi/xd96/rules.mk
+++ b/keyboards/xiudi/xd96/rules.mk
@@ -1,17 +1,3 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
# custom matrix setup
CUSTOM_MATRIX = lite
diff --git a/keyboards/xw60/config.h b/keyboards/xw60/config.h
index 32516a5ec2b..7bc4f081160 100644
--- a/keyboards/xw60/config.h
+++ b/keyboards/xw60/config.h
@@ -1,9 +1,5 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-
#define SOLENOID_PIN F6
#define SOLENOID_ACTIVE true
#define SOLENOID_DEFAULT_DWELL 75
diff --git a/keyboards/xw60/info.json b/keyboards/xw60/info.json
deleted file mode 100644
index 50315c5ffde..00000000000
--- a/keyboards/xw60/info.json
+++ /dev/null
@@ -1,166 +0,0 @@
-{
- "keyboard_name": "XW60",
- "manufacturer": "Drclick",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x6060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
- "rows": ["D0", "D1", "D2", "D3", "D5"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [4, 9], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
- {"matrix": [4, 6], "x": 8, "y": 4, "w": 2},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_pingjunior": {
- "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": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [4, 9], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- }
- }
- }
diff --git a/keyboards/xw60/keyboard.json b/keyboards/xw60/keyboard.json
new file mode 100644
index 00000000000..6316f944e50
--- /dev/null
+++ b/keyboards/xw60/keyboard.json
@@ -0,0 +1,178 @@
+{
+ "keyboard_name": "XW60",
+ "manufacturer": "Drclick",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": false,
+ "haptic": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 2},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_pingjunior": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+ }
diff --git a/keyboards/xw60/rules.mk b/keyboards/xw60/rules.mk
index 710fb4ca887..a521203b326 100644
--- a/keyboards/xw60/rules.mk
+++ b/keyboards/xw60/rules.mk
@@ -1,14 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # 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
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
index 1f01ffde5f9..8084f1f7bd8 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/info.json
+++ b/keyboards/yushakobo/navpad/10_helix_r/info.json
@@ -19,6 +19,7 @@
]
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D2",
"encoder": {
"right": {
diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
index aa146fa1d2d..f30c00650ce 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/rules.mk
+++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
ENCODER_ENABLE = yes
SRC += navpad_prefs.c
diff --git a/quantum/process_keycode/process_led_matrix.c b/quantum/process_keycode/process_led_matrix.c
index 217c9a2c28a..7f95bf10115 100644
--- a/quantum/process_keycode/process_led_matrix.c
+++ b/quantum/process_keycode/process_led_matrix.c
@@ -7,24 +7,39 @@
bool process_led_matrix(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
switch (keycode) {
- case QK_BACKLIGHT_ON:
+ case QK_BACKLIGHT_ON: // TODO: Remove backlight keycodes
+ case QK_LED_MATRIX_ON:
led_matrix_enable();
return false;
case QK_BACKLIGHT_OFF:
+ case QK_LED_MATRIX_OFF:
led_matrix_disable();
return false;
- case QK_BACKLIGHT_DOWN:
- led_matrix_decrease_val();
- return false;
- case QK_BACKLIGHT_UP:
- led_matrix_increase_val();
- return false;
case QK_BACKLIGHT_TOGGLE:
+ case QK_LED_MATRIX_TOGGLE:
led_matrix_toggle();
return false;
case QK_BACKLIGHT_STEP:
+ case QK_LED_MATRIX_MODE_NEXT:
led_matrix_step();
return false;
+ case QK_LED_MATRIX_MODE_PREVIOUS:
+ led_matrix_step_reverse();
+ return false;
+ case QK_BACKLIGHT_UP:
+ case QK_LED_MATRIX_BRIGHTNESS_UP:
+ led_matrix_increase_val();
+ return false;
+ case QK_BACKLIGHT_DOWN:
+ case QK_LED_MATRIX_BRIGHTNESS_DOWN:
+ led_matrix_decrease_val();
+ return false;
+ case QK_LED_MATRIX_SPEED_UP:
+ led_matrix_increase_speed();
+ return false;
+ case QK_LED_MATRIX_SPEED_DOWN:
+ led_matrix_decrease_speed();
+ return false;
}
}