Merge remote-tracking branch 'upstream/develop' into dev_board

keyboards/10bleoledhub/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

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

keyboards/1k/info.json

@@ -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]}
-      ]
-    }
-  }
-}

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]}
+      ]
+    }
+  }
+}

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

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": {

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": {

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": {

keyboards/1upkeyboards/pi40/rules.mk

@@ -1,3 +1 @@
-OLED_ENABLE     = yes
-
 DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0

keyboards/25keys/zinc/rules.mk

@@ -1,4 +1 @@
 DEFAULT_FOLDER = 25keys/zinc/rev1
-
-#SRC += i2c.c
-SRC += serial.c

keyboards/3w6/rev1/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

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

keyboards/3w6/rev2/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

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

keyboards/bacca70/config.h

@@ -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 <http://www.gnu.org/licenses/>.
-*/
-
-#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
-
-

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"]

keyboards/baguette/config.h

@@ -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 <http://www.gnu.org/licenses/>.
-*/
-
-#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

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"]

keyboards/baion_808/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

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

keyboards/bajjak/config.h

@@ -43,11 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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)) || \

keyboards/bajjak/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

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

keyboards/bandominedoni/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

keyboards/bandominedoni/rules.mk

@@ -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

keyboards/bantam44/config.h

@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.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 <http://www.gnu.org/licenses/>.
-*/
-
-#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

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"]

keyboards/barleycorn_smd/config.h

@@ -41,11 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* 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.

keyboards/barleycorn_smd/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

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

keyboards/barracuda/config.h

@@ -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 <http://www.gnu.org/licenses/>.
- */
-
-#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

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"]

keyboards/basekeys/slice/rev1/config.h

@@ -21,8 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#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

keyboards/basekeys/slice/rev1/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

keyboards/basekeys/slice/rev1/rules.mk

@@ -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

keyboards/basekeys/slice/rev1_rgb/config.h

@@ -21,9 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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"

keyboards/basekeys/slice/rev1_rgb/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

keyboards/basekeys/slice/rev1_rgb/rules.mk

@@ -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

keyboards/basekeys/trifecta/config.h

@@ -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 <http://www.gnu.org/licenses/>.
- */
-
-#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

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",

keyboards/basekeys/trifecta/trifecta.c

@@ -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 <http://www.gnu.org/licenses/>.
- */
-
-#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

keyboards/basketweave/config.h

@@ -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 <http://www.gnu.org/licenses/>.
- */
-
-#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

keyboards/basketweave/info.json

@@ -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}
-            ]
-        }
-    }
-}

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}
+            ]
+        }
+    }
+}

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

keyboards/bastardkb/charybdis/3x5/blackpill/info.json

@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

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": {

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

keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json

@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",

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

keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json

@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {

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
 

keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json

@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {

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
 

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"

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

keyboards/bastardkb/charybdis/3x6/blackpill/info.json

@@ -6,6 +6,9 @@
     "eeprom": {
         "driver": "spi"
     },
+    "split": {
+        "enabled": true
+    },
     "rgb_matrix": {
         "driver": "ws2812"
     },

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

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": {

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

keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json

@@ -15,6 +15,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D2"
     },
     "processor": "atmega32u4",

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

keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json

@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {

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
 

keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json

@@ -12,6 +12,7 @@
     },
     "diode_direction": "ROW2COL",
     "split": {
+        "enabled": true,
         "soft_serial_pin": "GP1"
     },
     "ws2812": {

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