Merge branch 'develop' into chaining_osl_and_mo

.github/workflows/ci_builds.yml

@@ -1,74 +0,0 @@
-name: CI Builds
-
-permissions:
-  contents: read
-
-on:
-  push:
-    branches: [master, develop]
-  workflow_dispatch:
-    inputs:
-      branch:
-        type: choice
-        description: 'Branch to build'
-        options: [master, develop]
-
-concurrency: ci_build-${{ github.event.inputs.branch || github.ref_name }}
-
-jobs:
-  ci_builds:
-    if: github.repository == 'qmk/qmk_firmware'
-    name: "CI Build"
-    runs-on: self-hosted
-    timeout-minutes: 1380
-
-    strategy:
-      fail-fast: false
-      matrix:
-        keymap: [default, via]
-
-    container: ghcr.io/qmk/qmk_cli
-
-    steps:
-    - name: Disable safe.directory check
-      run : git config --global --add safe.directory '*'
-
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-        ref: ${{ github.event.inputs.branch || github.ref }}
-
-    - name: Install dependencies
-      run: pip3 install -r requirements.txt
-
-    - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
-      run: |
-        export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
-        qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed
-        # Generate the step summary markdown
-        ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
-        # Truncate to a maximum of 1MB to deal with GitHub workflow limit
-        truncate --size='<960K' $GITHUB_STEP_SUMMARY || true
-        # Exit with failure if the compilation stage failed
-        [ ! -f .failed ] || exit 1
-
-    - name: 'Upload artifacts'
-      uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: artifacts-${{ github.event.inputs.branch || github.ref_name }}-${{ matrix.keymap }}
-        if-no-files-found: ignore
-        path: |
-          *.bin
-          *.hex
-          *.uf2
-          .build/failed.*
-
-    - name: 'CI Discord Notification'
-      if: always()
-      working-directory: util/ci/
-      env:
-        DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
-      run: |
-        python3 -m pip install -r requirements.txt
-        python3 ./discord-results.py --branch ${{ github.event.inputs.branch || github.ref_name }} --keymap ${{ matrix.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/docs.yml

@@ -37,7 +37,7 @@ jobs:
         qmk --verbose generate-docs
 
     - name: Deploy
-      uses: JamesIves/github-pages-deploy-action@v4.5.0
+      uses: JamesIves/github-pages-deploy-action@v4.6.0
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BASE_BRANCH: master

builddefs/common_features.mk

@@ -353,7 +353,7 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations
     COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners
     POST_CONFIG_H += $(QUANTUM_DIR)/led_matrix/post_config.h
-    SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_led_matrix.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c
     SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c
     LIB8TION_ENABLE := yes

data/constants/keycodes/keycodes_0.0.4_lighting.hjson

@@ -0,0 +1,67 @@
+{
+    "keycodes": {
+        "0x7810": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_ON",
+            "aliases": [
+                "LM_ON"
+            ]
+        },
+        "0x7811": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_OFF",
+            "aliases": [
+                "LM_OFF"
+            ]
+        },
+        "0x7812": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_TOGGLE",
+            "aliases": [
+                "LM_TOGG"
+            ]
+        },
+        "0x7813": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_MODE_NEXT",
+            "aliases": [
+                "LM_NEXT"
+            ]
+        },
+        "0x7814": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_MODE_PREVIOUS",
+            "aliases": [
+                "LM_PREV"
+            ]
+        },
+        "0x7815": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_BRIGHTNESS_UP",
+            "aliases": [
+                "LM_BRIU"
+            ]
+        },
+        "0x7816": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_BRIGHTNESS_DOWN",
+            "aliases": [
+                "LM_BRID"
+            ]
+        },
+        "0x7817": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_SPEED_UP",
+            "aliases": [
+                "LM_SPDU"
+            ]
+        },
+        "0x7818": {
+            "group": "led_matrix",
+            "key": "QK_LED_MATRIX_SPEED_DOWN",
+            "aliases": [
+                "LM_SPDD"
+            ]
+        }
+    }
+}

data/mappings/info_config.hjson

@@ -164,7 +164,6 @@
     "RGBLIGHT_DEFAULT_SAT": {"info_key": "rgblight.default.sat", "value_type": "int"},
     "RGBLIGHT_DEFAULT_VAL": {"info_key": "rgblight.default.val", "value_type": "int"},
     "RGBLIGHT_DEFAULT_SPD": {"info_key": "rgblight.default.speed", "value_type": "int"},
-    "RGBW": {"info_key": "rgblight.rgbw", "value_type": "flag"},
 
     // Secure
     "SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"},
@@ -215,6 +214,7 @@
     "WS2812_DI_PIN": {"info_key": "ws2812.pin"},
     "WS2812_I2C_ADDRESS": {"info_key": "ws2812.i2c_address", "value_type": "hex"},
     "WS2812_I2C_TIMEOUT": {"info_key": "ws2812.i2c_timeout", "value_type": "int"},
+    "WS2812_RGBW": {"info_key": "ws2812.rgbw", "value_type": "flag"},
 
     "LAYOUTS": {"info_key": "layout_aliases", "value_type": "mapping"},
 
@@ -229,6 +229,7 @@
     "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true},
     "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
     "RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"},
+    "RGBW": {"info_key": "rgblight.rgbw", "invalid": true, "replace_with": "WS2812_RGBW"},
     "RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.rgb_matrix_sleep", "invalid": true, "replace_with": "RGB_MATRIX_SLEEP"},
     "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "flag", "invalid": true},
     "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "flag", "deprecated": true},

data/mappings/info_rules.hjson

@@ -11,6 +11,7 @@
     // invalid: Default `false`. Set to `true` to generate errors when a value exists
     // replace_with: use with a key marked deprecated or invalid to designate a replacement
 
+    "AUDIO_DRIVER": {"info_key": "audio.driver"},
     "BACKLIGHT_DRIVER": {"info_key": "backlight.driver"},
     "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"},
     "BOARD": {"info_key": "board"},
@@ -23,6 +24,7 @@
     "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
     "ENCODER_DRIVER": {"info_key": "encoder.driver"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
+    "HAPTIC_DRIVER": {"info_key": "haptic.driver"},
     "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
     "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
     "LED_MATRIX_DRIVER": {"info_key": "led_matrix.driver"},
@@ -43,7 +45,7 @@
     "SPLIT_TRANSPORT": {"info_key": "split.transport.protocol", "to_c": false},
     "STENO_ENABLE": {"info_key": "stenography.enabled", "value_type": "bool"},
     "STENO_PROTOCOL": {"info_key": "stenography.protocol"},
-    "WAIT_FOR_USB": {"info_key": "usb.wait_for", "value_type": "bool"},
+    "USB_WAIT_FOR_ENUMERATION": {"info_key": "usb.wait_for_enumeration", "value_type": "bool"},
     "WEAR_LEVELING_DRIVER": {"info_key": "eeprom.wear_leveling.driver"},
     "WS2812_DRIVER": {"info_key": "ws2812.driver"},
 

data/schemas/keyboard.jsonschema

@@ -133,6 +133,10 @@
                         "clicky": {"type": "boolean"}
                     }
                 },
+                "driver": {
+                    "type": "string",
+                    "enum": ["dac_additive", "dac_basic", "pwm_software", "pwm_hardware"]
+                },
                 "macro_beep": {"type": "boolean"},
                 "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
                 "power_control": {
@@ -387,6 +391,15 @@
                 }
             }
         },
+        "haptic": {
+            "type": "object",
+            "properties": {
+                "driver": {
+                    "type": "string",
+                    "enum": ["drv2605l", "solenoid"]
+                }
+            }
+        },
         "leader_key": {
             "type": "object",
             "properties": {
@@ -648,7 +661,10 @@
                     "$ref": "qmk.definitions.v1#/mcu_pin",
                     "$comment": "Deprecated: use ws2812.pin instead"
                 },
-                "rgbw": {"type": "boolean"},
+                "rgbw": {
+                    "type": "boolean",
+                    "$comment": "Deprecated: use ws2812.rgbw instead"
+                },
                 "saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "sleep": {"type": "boolean"},
                 "split": {"type": "boolean"},
@@ -885,7 +901,7 @@
                     }
                 },
                 "suspend_wakeup_delay": {"$ref": "qmk.definitions.v1#/unsigned_int"},
-                "wait_for": {"type": "boolean"}
+                "wait_for_enumeration": {"type": "boolean"}
             }
         },
         "qmk": {
@@ -924,6 +940,7 @@
                     "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"]
                 },
                 "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"},
+                "rgbw": {"type": "boolean"},
                 "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"},
                 "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"}
             }

docs/config_options.md

@@ -237,7 +237,7 @@ If you define these options you will enable the associated feature, which may in
   * units to step when in/decreasing saturation
 * `#define RGBLIGHT_VAL_STEP 12`
   * units to step when in/decreasing value (brightness)
-* `#define RGBW`
+* `#define WS2812_RGBW`
   * Enables RGBW LED support
 
 ## Mouse Key Options
@@ -446,7 +446,7 @@ Use these to enable or disable building certain features. The more you have enab
   * Allows replacing the standard matrix scanning routine with a custom one.
 * `DEBOUNCE_TYPE`
   * Allows replacing the standard key debouncing routine with an alternative or custom one.
-* `WAIT_FOR_USB`
+* `USB_WAIT_FOR_ENUMERATION`
   * Forces the keyboard to wait for a USB connection to be established before it starts up
 * `NO_USB_STARTUP_CHECK`
   * Disables usb suspend check after keyboard startup. Usually the keyboard waits for the host to wake it up before any tasks are performed. This is useful for split keyboards as one half will not get a wakeup call but must send commands to the master.

docs/feature_led_matrix.md

@@ -217,16 +217,17 @@ As mentioned earlier, the center of the keyboard by default is expected to be `{
 
 ## Keycodes :id=keycodes
 
-All LED matrix keycodes are currently shared with the [Backlight feature](feature_backlight.md).
-
-| Key                     | Aliases   | Description                   |
-|-------------------------|-----------|-------------------------------|
-| `QK_BACKLIGHT_TOGGLE`   | `BL_TOGG` | Toggle LED Matrix on or off   |
-| `QK_BACKLIGHT_STEP`     | `BL_STEP` | Cycle through modes           |
-| `QK_BACKLIGHT_ON`       | `BL_ON`   | Turn on LED Matrix            |
-| `QK_BACKLIGHT_OFF`      | `BL_OFF`  | Turn off LED Matrix           |
-| `QK_BACKLIGHT_UP`       | `BL_UP`   | Increase the brightness level |
-| `QK_BACKLIGHT_DOWN`     | `BL_DOWN` | Decrease the brightness level |
+|Key                            |Aliases  |Description                        |
+|-------------------------------|---------|-----------------------------------|
+|`QK_LED_MATRIX_ON`             |`LM_ON`  |Turn on LED Matrix                 |
+|`QK_LED_MATRIX_OFF`            |`LM_OFF` |Turn off LED Matrix                |
+|`QK_LED_MATRIX_TOGGLE`         |`LM_TOGG`|Toggle LED Matrix on or off        |
+|`QK_LED_MATRIX_MODE_NEXT`      |`LM_NEXT`|Cycle through animations           |
+|`QK_LED_MATRIX_MODE_PREVIOUS`  |`LM_PREV`|Cycle through animations in reverse|
+|`QK_LED_MATRIX_BRIGHTNESS_UP`  |`LM_BRIU`|Increase the brightness level      |
+|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level      |
+|`QK_LED_MATRIX_SPEED_UP`       |`LM_SPDU`|Increase the animation speed       |
+|`QK_LED_MATRIX_SPEED_DOWN`     |`LM_SPDD`|Decrease the animation speed       |
 
 ## LED Matrix Effects :id=led-matrix-effects
 

docs/feature_rgblight.md

@@ -6,7 +6,7 @@ QMK has the ability to control RGB LEDs attached to your keyboard. This is commo
 
 Some keyboards come with RGB LEDs preinstalled. Others must have them installed after the fact. See the [Hardware Modification](#hardware-modification) section for information on adding RGB lighting to your keyboard.
 
-Currently QMK supports the following addressable LEDs (however, the white LED in RGBW variants is not supported):
+Currently QMK supports the following addressable LEDs:
 
  * WS2811, WS2812, WS2812B, WS2812C, etc.
  * SK6812, SK6812MINI, SK6805

docs/ja/config_options.md

@@ -378,7 +378,7 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
   * 標準マトリックス走査ルーチンを独自のものに置き換えることができます。
 * `DEBOUNCE_TYPE`
   * 標準キーデバウンスルーチンを代替または独自のものに置き換えることができます。
-* `WAIT_FOR_USB`
+* `USB_WAIT_FOR_ENUMERATION`
   * キーボードが起動する前に、USB 接続が確立されるのをキーボードに待機させます
 * `NO_USB_STARTUP_CHECK`
   * キーボードの起動後の usb サスペンドチェックを無効にします。通常、キーボードはタスクが実行される前にホストがウェイク アップするのを待ちます。分割キーボードは半分はウェイクアップコールを取得できませんが、マスタにコマンドを送信する必要があるため、役に立ちます。

docs/keycodes.md

@@ -398,6 +398,22 @@ See also: [Leader Key](feature_leader_key.md)
 |---------|------------------------|
 |`QK_LEAD`|Begins a leader sequence|
 
+## LED Matrix :id=led-matrix
+
+See also: [LED Matrix](feature_led_matrix.md)
+
+|Key                            |Aliases  |Description                        |
+|-------------------------------|---------|-----------------------------------|
+|`QK_LED_MATRIX_ON`             |`LM_ON`  |Turn on LED Matrix                 |
+|`QK_LED_MATRIX_OFF`            |`LM_OFF` |Turn off LED Matrix                |
+|`QK_LED_MATRIX_TOGGLE`         |`LM_TOGG`|Toggle LED Matrix on or off        |
+|`QK_LED_MATRIX_MODE_NEXT`      |`LM_NEXT`|Cycle through animations           |
+|`QK_LED_MATRIX_MODE_PREVIOUS`  |`LM_PREV`|Cycle through animations in reverse|
+|`QK_LED_MATRIX_BRIGHTNESS_UP`  |`LM_BRIU`|Increase the brightness level      |
+|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level      |
+|`QK_LED_MATRIX_SPEED_UP`       |`LM_SPDU`|Increase the animation speed       |
+|`QK_LED_MATRIX_SPEED_DOWN`     |`LM_SPDD`|Decrease the animation speed       |
+
 ## Magic Keycodes :id=magic-keycodes
 
 See also: [Magic Keycodes](keycodes_magic.md)

docs/pr_checklist.md

@@ -148,6 +148,13 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
   - For instance, only `wilba_tech` boards shall include `keyboards/wilba_tech/wt_main.c` and  `keyboards/wilba_tech/wt_rgb_backlight.c`. But including `drivers/sensors/pmw3360.c` is absolutely fine for any and all boards that require it.
   - Code that needs to be used by multiple boards is a candidate for core code changes, and should be separated out.
 
+Wireless-capable boards:
+- Given license abuse from vendors, QMK does not accept any vendor PRs for wireless- or Bluetooth-capable keyboards without wireless and/or Bluetooth code
+    - Historically, vendors have done this in bad faith in order to attain downstream VIA compatibility with no intention of releasing wireless sources
+    - QMK's license, the GPL2+, requires full source disclosure for any distributed binary -- including full sources for any keyboard shipped by vendors containing QMK and/or firmware-side VIA code
+    - If a vendor's wireless-capable keyboard PR submission is lacking wireless capability, then the PR will be left on-hold and unmergeable until wireless bindings are provided
+    - If a vendor's wireless-capable keyboard is merged into QMK before it's known that the board is wireless, then all existing and future PRs from the same vendor will be put on hold until wireless bindings for the offending keyboard are provided
+
 Also, specific to ChibiOS:
 - **strong** preference to using existing ChibiOS board definitions.
     - a lot of the time, an equivalent Nucleo board can be used with a different flash size or slightly different model in the same family

docs/reference_info_json.md

@@ -118,6 +118,8 @@ Configures the [Audio](feature_audio.md) feature.
         * `clicky`
             * The default audio clicky enabled state.
             * Default: `true`
+    * `driver`
+        * The driver to use. Must be one of `dac_additive`, `dac_basic`, `pwm_software`, `pwm_hardware`.
     * `macro_beep`
         * Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros.
         * Default: `false`
@@ -586,9 +588,6 @@ Configures the [RGB Lighting](feature_rgblight.md) feature.
     * `max_brightness`
         * The maximum value which the HSV "V" component is scaled to, from 0 to 255.
         * Default: `255`
-    * `rgbw`
-        * Enable RGBW LEDs.
-        * Default: `false`
     * `saturation_steps`
         * The number of saturation adjustment steps.
         * Default: `17`
@@ -833,7 +832,7 @@ Configures the [Stenography](feature_stenography.md) feature.
     * `suspend_wakeup_delay`
         * The amount of time to wait after sending a wakeup packet, in milliseconds.
         * Default: `0` (disabled)
-    * `wait_for`
+    * `wait_for_enumeration`
         * Force the keyboard to wait for USB enumeration before starting up.
         * Default: `false`
 
@@ -853,3 +852,6 @@ Configures the [WS2812](ws2812_driver.md) driver.
     * `i2c_timeout`
         * The I²C timeout in milliseconds (`i2c` driver only).
         * Default: `100` (100 ms)
+    * `rgbw`
+        * Enable RGBW LEDs.
+        * Default: `false`

docs/ws2812_driver.md

@@ -33,6 +33,7 @@ Add the following to your `config.h`:
 |`WS2812_T0H`       |`350`                  |The length of a "0" bit's high phase in nanoseconds                                             |
 |`WS2812_TRST_US`   |`280`                  |The length of the reset phase in microseconds                                                   |
 |`WS2812_BYTE_ORDER`|`WS2812_BYTE_ORDER_GRB`|The byte order of the RGB data                                                                  |
+|`WS2812_RGBW`      |*Not defined*          |Enables RGBW support (except `i2c` driver)                                                      |
 
 ### Timing Adjustment :id=timing-adjustment
 
@@ -58,6 +59,27 @@ Where the byte order may be one of:
 |`RGB`     |WS2812B-2020                |
 |`BGR`     |TM1812                      |
 
+### RGBW Support :id=rgbw-support
+
+Rendering the color white with RGB LEDs is typically inconsistent due to inherent variations between each individual LED die. However, some WS2812 variants (such as SK6812RGBW) also possess a white LED along with the red, green, and blue channels, which allows for a more accurate white to be displayed.
+
+QMK can automatically convert the RGB data to be sent to the LEDs to mix in the white channel:
+
+```
+w = min(r, g, b)
+r -= w
+g -= w
+b -= w
+```
+
+Thus, an RGB triplet of `255,255,255` will simply turn on the white LED fully (`0,0,0,255`).
+
+To enable RGBW conversion, add the following to your `config.h`:
+
+```c
+#define WS2812_RGBW
+```
+
 ## Driver Configuration :id=driver-configuration
 
 Driver selection can be configured in `rules.mk` as `WS2812_DRIVER`, or in `info.json` as `ws2812.driver`. Valid values are `bitbang` (default), `i2c`, `spi`, `pwm`, `vendor`, or `custom`. See below for information on individual drivers.

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/adafruit/macropad/info.json

@@ -1,130 +0,0 @@
-{
-    "keyboard_name": "Macropad RP2040",
-    "manufacturer": "Adafruit",
-    "url": "https://learn.adafruit.com/adafruit-macropad-rp2040",
-    "maintainer": "Jpe230",
-    "usb": {
-        "vid": "0x239A",
-        "pid": "0x0108",
-        "device_version": "0.0.1"
-    },
-    "features": {
-        "bootmagic": true,
-        "mousekey": false,
-        "extrakey": true,
-        "nkro": true,
-        "audio": true,
-        "encoder": true,
-        "rgb_matrix": true,
-        "oled": true
-    },
-    "audio": {
-        "power_control": {
-            "pin": "GP14"
-        }
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "GP18", "pin_b": "GP17"}
-        ]
-    },
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "gradient_up_down": true,
-            "gradient_left_right": true,
-            "breathing": true,
-            "band_sat": true,
-            "band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "pixel_rain": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
-            "solid_reactive": true,
-            "solid_reactive_wide": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_multinexus": true,
-            "splash": true,
-            "multisplash": true,
-            "solid_splash": true,
-            "solid_multisplash": true
-        },
-        "driver": "ws2812",
-        "layout": [
-            {"matrix": [1, 0], "x": 0, "y": 0, "flags": 4},
-            {"matrix": [1, 1], "x": 112, "y": 0, "flags": 4},
-            {"matrix": [1, 2], "x": 224, "y": 0, "flags": 4},
-            {"matrix": [2, 0], "x": 0, "y": 21, "flags": 4},
-            {"matrix": [2, 1], "x": 112, "y": 21, "flags": 4},
-            {"matrix": [2, 2], "x": 224, "y": 21, "flags": 4},
-            {"matrix": [3, 0], "x": 0, "y": 42, "flags": 4},
-            {"matrix": [3, 1], "x": 112, "y": 42, "flags": 4},
-            {"matrix": [3, 2], "x": 224, "y": 42, "flags": 4},
-            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
-            {"matrix": [4, 1], "x": 112, "y": 64, "flags": 4},
-            {"matrix": [4, 2], "x": 224, "y": 64, "flags": 4}
-        ]
-    },
-    "bootmagic": {
-        "matrix": [1, 2]
-    },
-    "ws2812": {
-        "pin": "GP19",
-        "driver": "vendor"
-    },
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "matrix_pins": {
-        "direct": [
-            [null, null, "GP0"],
-            ["GP1", "GP2", "GP3"],
-            ["GP4", "GP5", "GP6"],
-            ["GP7", "GP8", "GP9"],
-            ["GP10", "GP11", "GP12"]
-        ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 2, "y": 0, "matrix": [0, 2]},
-                {"x": 0, "y": 1, "matrix": [1, 0]},
-                {"x": 1, "y": 1, "matrix": [1, 1]},
-                {"x": 2, "y": 1, "matrix": [1, 2]},
-                {"x": 0, "y": 2, "matrix": [2, 0]},
-                {"x": 1, "y": 2, "matrix": [2, 1]},
-                {"x": 2, "y": 2, "matrix": [2, 2]},
-                {"x": 0, "y": 3, "matrix": [3, 0]},
-                {"x": 1, "y": 3, "matrix": [3, 1]},
-                {"x": 2, "y": 3, "matrix": [3, 2]},
-                {"x": 0, "y": 4, "matrix": [4, 0]},
-                {"x": 1, "y": 4, "matrix": [4, 1]},
-                {"x": 2, "y": 4, "matrix": [4, 2]}
-            ]
-        }
-    }
-}

keyboards/adafruit/macropad/keyboard.json

@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Macropad RP2040",
+    "manufacturer": "Adafruit",
+    "url": "https://learn.adafruit.com/adafruit-macropad-rp2040",
+    "maintainer": "Jpe230",
+    "usb": {
+        "vid": "0x239A",
+        "pid": "0x0108",
+        "device_version": "0.0.1"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": false,
+        "extrakey": true,
+        "nkro": true,
+        "audio": true,
+        "encoder": true,
+        "rgb_matrix": true,
+        "oled": true
+    },
+    "audio": {
+        "driver": "pwm_hardware",
+        "power_control": {
+            "pin": "GP14"
+        }
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP18", "pin_b": "GP17"}
+        ]
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_rain": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [1, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [1, 1], "x": 112, "y": 0, "flags": 4},
+            {"matrix": [1, 2], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [2, 0], "x": 0, "y": 21, "flags": 4},
+            {"matrix": [2, 1], "x": 112, "y": 21, "flags": 4},
+            {"matrix": [2, 2], "x": 224, "y": 21, "flags": 4},
+            {"matrix": [3, 0], "x": 0, "y": 42, "flags": 4},
+            {"matrix": [3, 1], "x": 112, "y": 42, "flags": 4},
+            {"matrix": [3, 2], "x": 224, "y": 42, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [4, 1], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [4, 2], "x": 224, "y": 64, "flags": 4}
+        ]
+    },
+    "bootmagic": {
+        "matrix": [1, 2]
+    },
+    "ws2812": {
+        "pin": "GP19",
+        "driver": "vendor"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "matrix_pins": {
+        "direct": [
+            [null, null, "GP0"],
+            ["GP1", "GP2", "GP3"],
+            ["GP4", "GP5", "GP6"],
+            ["GP7", "GP8", "GP9"],
+            ["GP10", "GP11", "GP12"]
+        ]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 2, "y": 4, "matrix": [4, 2]}
+            ]
+        }
+    }
+}

keyboards/adafruit/macropad/rules.mk

@@ -1,2 +1 @@
-AUDIO_DRIVER = pwm_hardware
 OLED_TRANSPORT = spi

keyboards/ai03/lunar_ii/info.json

@@ -1,106 +0,0 @@
-{
-    "keyboard_name": "Lunar II",
-    "manufacturer": "ai03 Design Studio",
-    "url": "https://ai03.com/projects/lunar-ii",
-    "maintainer": "ai03-2725",
-    "usb": {
-        "vid": "0xA103",
-        "pid": "0x0016",
-        "device_version": "1.0.0"
-    },
-    "features": {
-        "bootmagic": true,
-        "mousekey": true,
-        "extrakey": true,
-        "console": true,
-        "nkro": true,
-        "haptic": true
-    },
-    "qmk": {
-        "locking": {
-            "enabled": true,
-            "resync": true
-        }
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "rows": ["D0", "D1", "D2", "F0", "F1"],
-        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"]
-    },
-    "indicators": {
-        "caps_lock": "B3",
-        "on_state": 0
-    },
-    "build": {
-        "debounce_type": "asym_eager_defer_pk"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 12], "x": 14, "y": 0},
-                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
-                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 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], "w": 2.25, "x": 12.75, "y": 2},
-                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
-                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3},
-                {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
-                {"matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4},
-                {"matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4},
-                {"matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4},
-                {"matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4},
-                {"matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4},
-                {"matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4}
-            ]
-        }
-    }
-}

keyboards/ai03/lunar_ii/keyboard.json

@@ -0,0 +1,109 @@
+{
+    "keyboard_name": "Lunar II",
+    "manufacturer": "ai03 Design Studio",
+    "url": "https://ai03.com/projects/lunar-ii",
+    "maintainer": "ai03-2725",
+    "usb": {
+        "vid": "0xA103",
+        "pid": "0x0016",
+        "device_version": "1.0.0"
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": true,
+        "nkro": true,
+        "haptic": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "haptic": {
+        "driver": "solenoid"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["D0", "D1", "D2", "F0", "F1"],
+        "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"]
+    },
+    "indicators": {
+        "caps_lock": "B3",
+        "on_state": 0
+    },
+    "build": {
+        "debounce_type": "asym_eager_defer_pk"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 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], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3},
+                {"matrix": [4, 0], "w": 1.5, "x": 0, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4},
+                {"matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4},
+                {"matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4},
+                {"matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4}
+            ]
+        }
+    }
+}

keyboards/ai03/lunar_ii/rules.mk

@@ -1 +0,0 @@
-HAPTIC_DRIVER = solenoid

keyboards/arrowmechanics/wings/info.json

@@ -1,320 +0,0 @@
-{
-    "manufacturer": "Arrow Mechanics",
-    "keyboard_name": "WINGS Mark 1",
-    "maintainer": "arrowmechanics",
-    "bootloader": "rp2040",
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "GP6", "pin_b": "GP7", "resolution": 2}
-        ]
-    },
-    "features": {
-        "audio": true,
-        "bootmagic": true,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "rgb_matrix": true
-    },
-    "matrix_pins": {
-        "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
-        "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"]
-    },
-    "processor": "RP2040",
-    "rgb_matrix": {
-        "animations": {
-            "alphas_mods": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_sat": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "band_val": true,
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "cycle_up_down": true,
-            "digital_rain": true,
-            "dual_beacon": true,
-            "gradient_left_right": true,
-            "gradient_up_down": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "jellybean_raindrops": true,
-            "multisplash": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "pixel_rain": true,
-            "rainbow_beacon": true,
-            "rainbow_moving_chevron": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "solid_multisplash": true,
-            "solid_reactive": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_multinexus": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_simple": true,
-            "solid_reactive_wide": true,
-            "solid_splash": true,
-            "splash": true,
-            "typing_heatmap": true
-        },
-        "default": {
-            "animation": "breathing",
-            "hue": 192
-        },
-        "driver": "ws2812",
-        "layout": [
-            {"matrix": [0, 7], "x": 93, "y": 2, "flags": 4},
-            {"matrix": [0, 6], "x": 80, "y": 1, "flags": 4},
-            {"matrix": [0, 5], "x": 67, "y": 0, "flags": 4},
-            {"matrix": [0, 4], "x": 54, "y": 1, "flags": 4},
-            {"matrix": [0, 3], "x": 42, "y": 3, "flags": 4},
-            {"matrix": [0, 2], "x": 29, "y": 5, "flags": 4},
-            {"matrix": [0, 1], "x": 16, "y": 5, "flags": 4},
-            {"matrix": [0, 0], "x": 3, "y": 5, "flags": 4},
-
-            {"matrix": [1, 0], "x": 3, "y": 17, "flags": 4},
-            {"matrix": [1, 1], "x": 16, "y": 17, "flags": 4},
-            {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4},
-            {"matrix": [1, 3], "x": 42, "y": 15, "flags": 4},
-            {"matrix": [1, 4], "x": 54, "y": 13, "flags": 4},
-            {"matrix": [1, 5], "x": 67, "y": 12, "flags": 4},
-            {"matrix": [1, 6], "x": 80, "y": 13, "flags": 4},
-            {"matrix": [1, 7], "x": 93, "y": 14, "flags": 4},
-
-            {"matrix": [2, 8], "x": 106, "y": 25, "flags": 4},
-            {"matrix": [2, 7], "x": 93, "y": 25, "flags": 4},
-            {"matrix": [2, 6], "x": 80, "y": 25, "flags": 4},
-            {"matrix": [2, 5], "x": 67, "y": 24, "flags": 4},
-            {"matrix": [2, 4], "x": 54, "y": 25, "flags": 4},
-            {"matrix": [2, 3], "x": 42, "y": 27, "flags": 4},
-            {"matrix": [2, 2], "x": 26, "y": 29, "flags": 4},
-            {"matrix": [2, 0], "x": 6, "y": 29, "flags": 4},
-
-            {"matrix": [3, 0], "x": 3, "y": 40, "flags": 4},
-            {"matrix": [3, 2], "x": 22, "y": 40, "flags": 4},
-            {"matrix": [3, 3], "x": 42, "y": 38, "flags": 4},
-            {"matrix": [3, 4], "x": 54, "y": 36, "flags": 4},
-            {"matrix": [3, 5], "x": 67, "y": 35, "flags": 4},
-            {"matrix": [3, 6], "x": 80, "y": 36, "flags": 4},
-            {"matrix": [3, 7], "x": 93, "y": 37, "flags": 4},
-            {"matrix": [3, 8], "x": 106, "y": 37, "flags": 4},
-
-            {"matrix": [4, 8], "x": 106, "y": 49, "flags": 4},
-            {"matrix": [4, 7], "x": 93, "y": 49, "flags": 4},
-            {"matrix": [4, 6], "x": 80, "y": 48, "flags": 4},
-            {"matrix": [4, 5], "x": 67, "y": 47, "flags": 4},
-            {"matrix": [4, 4], "x": 54, "y": 48, "flags": 4},
-            {"matrix": [4, 3], "x": 42, "y": 50, "flags": 4},
-            {"matrix": [4, 1], "x": 21, "y": 52, "flags": 4},
-            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 4},
-
-            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
-            {"matrix": [5, 1], "x": 13, "y": 64, "flags": 4},
-            {"matrix": [5, 2], "x": 26, "y": 64, "flags": 4},
-            {"matrix": [5, 3], "x": 43, "y": 62, "flags": 4},
-            {"matrix": [5, 4], "x": 59, "y": 60, "flags": 4},
-            {"matrix": [5, 6], "x": 75, "y": 60, "flags": 4},
-            {"matrix": [5, 7], "x": 98, "y": 61, "flags": 4},
-
-            {"matrix": [6, 1], "x": 131, "y": 2, "flags": 4},
-            {"matrix": [6, 2], "x": 144, "y": 1, "flags": 4},
-            {"matrix": [6, 3], "x": 157, "y": 0, "flags": 4},
-            {"matrix": [6, 4], "x": 170, "y": 1, "flags": 4},
-            {"matrix": [6, 5], "x": 182, "y": 3, "flags": 4},
-            {"matrix": [6, 6], "x": 195, "y": 5, "flags": 4},
-            {"matrix": [6, 7], "x": 208, "y": 5, "flags": 4},
-            {"matrix": [6, 8], "x": 221, "y": 5, "flags": 4},
-
-            {"matrix": [7, 8], "x": 214, "y": 17, "flags": 4},
-            {"matrix": [7, 6], "x": 195, "y": 17, "flags": 4},
-            {"matrix": [7, 5], "x": 182, "y": 15, "flags": 4},
-            {"matrix": [7, 4], "x": 170, "y": 13, "flags": 4},
-            {"matrix": [7, 3], "x": 157, "y": 12, "flags": 4},
-            {"matrix": [7, 2], "x": 144, "y": 13, "flags": 4},
-            {"matrix": [7, 1], "x": 131, "y": 14, "flags": 4},
-
-            {"matrix": [8, 0], "x": 118, "y": 25, "flags": 4},
-            {"matrix": [8, 1], "x": 131, "y": 25, "flags": 4},
-            {"matrix": [8, 2], "x": 144, "y": 25, "flags": 4},
-            {"matrix": [8, 3], "x": 157, "y": 24, "flags": 4},
-            {"matrix": [8, 4], "x": 170, "y": 25, "flags": 4},
-            {"matrix": [8, 5], "x": 182, "y": 27, "flags": 4},
-            {"matrix": [8, 6], "x": 195, "y": 29, "flags": 4},
-            {"matrix": [8, 7], "x": 208, "y": 29, "flags": 4},
-            {"matrix": [8, 8], "x": 221, "y": 29, "flags": 4},
-
-            {"matrix": [9, 8], "x": 216, "y": 40, "flags": 4},
-            {"matrix": [9, 6], "x": 195, "y": 40, "flags": 4},
-            {"matrix": [9, 5], "x": 182, "y": 38, "flags": 4},
-            {"matrix": [9, 4], "x": 170, "y": 36, "flags": 4},
-            {"matrix": [9, 3], "x": 157, "y": 35, "flags": 4},
-            {"matrix": [9, 2], "x": 144, "y": 36, "flags": 4},
-            {"matrix": [9, 1], "x": 131, "y": 37, "flags": 4},
-            {"matrix": [9, 0], "x": 118, "y": 37, "flags": 4},
-
-            {"matrix": [10, 0], "x": 118, "y": 49, "flags": 4},
-            {"matrix": [10, 1], "x": 131, "y": 49, "flags": 4},
-            {"matrix": [10, 2], "x": 144, "y": 48, "flags": 4},
-            {"matrix": [10, 3], "x": 157, "y": 47, "flags": 4},
-            {"matrix": [10, 4], "x": 170, "y": 48, "flags": 4},
-            {"matrix": [10, 5], "x": 182, "y": 50, "flags": 4},
-            {"matrix": [10, 6], "x": 197, "y": 52, "flags": 4},
-            {"matrix": [10, 7], "x": 211, "y": 52, "flags": 4},
-            {"matrix": [10, 8], "x": 224, "y": 52, "flags": 4},
-
-            {"matrix": [11, 8], "x": 224, "y": 64, "flags": 4},
-            {"matrix": [11, 7], "x": 211, "y": 64, "flags": 4},
-            {"matrix": [11, 6], "x": 198, "y": 64, "flags": 4},
-            {"matrix": [11, 5], "x": 181, "y": 62, "flags": 4},
-            {"matrix": [11, 4], "x": 165, "y": 60, "flags": 4},
-            {"matrix": [11, 2], "x": 149, "y": 60, "flags": 4},
-            {"matrix": [11, 1], "x": 126, "y": 61, "flags": 4}
-        ],
-        "split_count": [47, 48]
-    },
-    "split": {
-        "enabled": true,
-        "transport": {
-            "sync": {
-                "layer_state": true,
-                "matrix_state": true
-            }
-        }
-    },
-    "tags": ["columnar", "split", "rgb", "hotswap", "encoder"],
-    "url": "https://arrowmechanics.com",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x3134",
-        "vid": "0xA880"
-    },
-    "ws2812": {
-        "driver": "vendor",
-        "pin": "GP26"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0.25, "y": 0.43},
-                {"matrix": [0, 1], "x": 1.25, "y": 0.43},
-                {"matrix": [0, 2], "x": 2.25, "y": 0.43},
-                {"matrix": [0, 3], "x": 3.25, "y": 0.25},
-                {"matrix": [0, 4], "x": 4.25, "y": 0.08},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0.08},
-                {"matrix": [0, 7], "x": 7.25, "y": 0.15},
-
-                {"matrix": [6, 1], "x": 10.45, "y": 0.15},
-                {"matrix": [6, 2], "x": 11.45, "y": 0.08},
-                {"matrix": [6, 3], "x": 12.45, "y": 0},
-                {"matrix": [6, 4], "x": 13.45, "y": 0.08},
-                {"matrix": [6, 5], "x": 14.45, "y": 0.25},
-                {"matrix": [6, 6], "x": 15.45, "y": 0.43},
-                {"matrix": [6, 7], "x": 16.45, "y": 0.43},
-                {"matrix": [6, 8], "x": 17.45, "y": 0.43},
-
-                {"matrix": [1, 0], "x": 0.25, "y": 1.43},
-                {"matrix": [1, 1], "x": 1.25, "y": 1.43},
-                {"matrix": [1, 2], "x": 2.25, "y": 1.43},
-                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.25, "y": 1.08},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.08},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.15},
-                {"matrix": [1, 8], "x": 8.25, "y": 1.15, "encoder": 0},
-
-                {"matrix": [7, 0], "x": 9.45, "y": 1.15},
-                {"matrix": [7, 1], "x": 10.45, "y": 1.15},
-                {"matrix": [7, 2], "x": 11.45, "y": 1.08},
-                {"matrix": [7, 3], "x": 12.45, "y": 1},
-                {"matrix": [7, 4], "x": 13.45, "y": 1.08},
-                {"matrix": [7, 5], "x": 14.45, "y": 1.25},
-                {"matrix": [7, 6], "x": 15.45, "y": 1.43},
-                {"matrix": [7, 8], "x": 16.45, "y": 1.43, "w": 2},
-
-                {"matrix": [2, 0], "x": 0.25, "y": 2.43, "w": 1.5},
-                {"matrix": [2, 2], "x": 1.75, "y": 2.43, "w": 1.5},
-                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.25, "y": 2.08},
-                {"matrix": [2, 5], "x": 5.25, "y": 2},
-                {"matrix": [2, 6], "x": 6.25, "y": 2.08},
-                {"matrix": [2, 7], "x": 7.25, "y": 2.15},
-                {"matrix": [2, 8], "x": 8.25, "y": 2.15},
-
-                {"matrix": [8, 0], "x": 9.45, "y": 2.15},
-                {"matrix": [8, 1], "x": 10.45, "y": 2.15},
-                {"matrix": [8, 2], "x": 11.45, "y": 2.08},
-                {"matrix": [8, 3], "x": 12.45, "y": 2},
-                {"matrix": [8, 4], "x": 13.45, "y": 2.08},
-                {"matrix": [8, 5], "x": 14.45, "y": 2.25},
-                {"matrix": [8, 6], "x": 15.45, "y": 2.43},
-                {"matrix": [8, 7], "x": 16.45, "y": 2.43},
-                {"matrix": [8, 8], "x": 17.45, "y": 2.43},
-
-                {"matrix": [3, 0], "x": 0, "y": 3.43, "w": 1.5},
-                {"matrix": [3, 2], "x": 1.5, "y": 3.43, "w": 1.75},
-                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 4], "x": 4.25, "y": 3.08},
-                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"matrix": [3, 6], "x": 6.25, "y": 3.08},
-                {"matrix": [3, 7], "x": 7.25, "y": 3.15},
-                {"matrix": [3, 8], "x": 8.25, "y": 3.15},
-
-                {"matrix": [9, 0], "x": 9.45, "y": 3.15},
-                {"matrix": [9, 1], "x": 10.45, "y": 3.15},
-                {"matrix": [9, 2], "x": 11.45, "y": 3.08},
-                {"matrix": [9, 3], "x": 12.45, "y": 3},
-                {"matrix": [9, 4], "x": 13.45, "y": 3.08},
-                {"matrix": [9, 5], "x": 14.45, "y": 3.25},
-                {"matrix": [9, 6], "x": 15.45, "y": 3.43},
-                {"matrix": [9, 8], "x": 16.45, "y": 3.43, "w": 2.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.43},
-                {"matrix": [4, 1], "x": 1, "y": 4.43, "w": 2.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.08},
-                {"matrix": [4, 5], "x": 5.25, "y": 4},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.08},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.15},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.15},
-
-                {"matrix": [10, 0], "x": 9.45, "y": 4.15},
-                {"matrix": [10, 1], "x": 10.45, "y": 4.15},
-                {"matrix": [10, 2], "x": 11.45, "y": 4.08},
-                {"matrix": [10, 3], "x": 12.45, "y": 4},
-                {"matrix": [10, 4], "x": 13.45, "y": 4.08},
-                {"matrix": [10, 5], "x": 14.45, "y": 4.25},
-                {"matrix": [10, 6], "x": 15.45, "y": 4.43, "w": 1.25},
-                {"matrix": [10, 7], "x": 16.7, "y": 4.43},
-                {"matrix": [10, 8], "x": 17.7, "y": 4.43},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.43},
-                {"matrix": [5, 1], "x": 1, "y": 5.43},
-                {"matrix": [5, 2], "x": 2, "y": 5.43},
-                {"matrix": [5, 3], "x": 3.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 4.5, "y": 5.08, "w": 1.25},
-                {"matrix": [5, 6], "x": 5.75, "y": 5.08, "w": 1.25},
-                {"matrix": [5, 7], "x": 7, "y": 5.15, "w": 2.25},
-
-                {"matrix": [11, 1], "x": 9.45, "y": 5.15, "w": 2.25},
-                {"matrix": [11, 2], "x": 11.7, "y": 5.08, "w": 1.25},
-                {"matrix": [11, 4], "x": 12.95, "y": 5.08, "w": 1.25},
-                {"matrix": [11, 5], "x": 14.2, "y": 5.25, "w": 1.25},
-                {"matrix": [11, 6], "x": 15.7, "y": 5.43},
-                {"matrix": [11, 7], "x": 16.7, "y": 5.43},
-                {"matrix": [11, 8], "x": 17.7, "y": 5.43}
-            ]
-        }
-    }
-}

keyboards/arrowmechanics/wings/keyboard.json

@@ -0,0 +1,323 @@
+{
+    "manufacturer": "Arrow Mechanics",
+    "keyboard_name": "WINGS Mark 1",
+    "maintainer": "arrowmechanics",
+    "bootloader": "rp2040",
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "GP6", "pin_b": "GP7", "resolution": 2}
+        ]
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
+    "audio": {
+        "driver": "pwm_hardware"
+    },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"],
+        "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"]
+    },
+    "processor": "RP2040",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "breathing",
+            "hue": 192
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 7], "x": 93, "y": 2, "flags": 4},
+            {"matrix": [0, 6], "x": 80, "y": 1, "flags": 4},
+            {"matrix": [0, 5], "x": 67, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 54, "y": 1, "flags": 4},
+            {"matrix": [0, 3], "x": 42, "y": 3, "flags": 4},
+            {"matrix": [0, 2], "x": 29, "y": 5, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 5, "flags": 4},
+            {"matrix": [0, 0], "x": 3, "y": 5, "flags": 4},
+
+            {"matrix": [1, 0], "x": 3, "y": 17, "flags": 4},
+            {"matrix": [1, 1], "x": 16, "y": 17, "flags": 4},
+            {"matrix": [1, 2], "x": 29, "y": 17, "flags": 4},
+            {"matrix": [1, 3], "x": 42, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 54, "y": 13, "flags": 4},
+            {"matrix": [1, 5], "x": 67, "y": 12, "flags": 4},
+            {"matrix": [1, 6], "x": 80, "y": 13, "flags": 4},
+            {"matrix": [1, 7], "x": 93, "y": 14, "flags": 4},
+
+            {"matrix": [2, 8], "x": 106, "y": 25, "flags": 4},
+            {"matrix": [2, 7], "x": 93, "y": 25, "flags": 4},
+            {"matrix": [2, 6], "x": 80, "y": 25, "flags": 4},
+            {"matrix": [2, 5], "x": 67, "y": 24, "flags": 4},
+            {"matrix": [2, 4], "x": 54, "y": 25, "flags": 4},
+            {"matrix": [2, 3], "x": 42, "y": 27, "flags": 4},
+            {"matrix": [2, 2], "x": 26, "y": 29, "flags": 4},
+            {"matrix": [2, 0], "x": 6, "y": 29, "flags": 4},
+
+            {"matrix": [3, 0], "x": 3, "y": 40, "flags": 4},
+            {"matrix": [3, 2], "x": 22, "y": 40, "flags": 4},
+            {"matrix": [3, 3], "x": 42, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 54, "y": 36, "flags": 4},
+            {"matrix": [3, 5], "x": 67, "y": 35, "flags": 4},
+            {"matrix": [3, 6], "x": 80, "y": 36, "flags": 4},
+            {"matrix": [3, 7], "x": 93, "y": 37, "flags": 4},
+            {"matrix": [3, 8], "x": 106, "y": 37, "flags": 4},
+
+            {"matrix": [4, 8], "x": 106, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 93, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 80, "y": 48, "flags": 4},
+            {"matrix": [4, 5], "x": 67, "y": 47, "flags": 4},
+            {"matrix": [4, 4], "x": 54, "y": 48, "flags": 4},
+            {"matrix": [4, 3], "x": 42, "y": 50, "flags": 4},
+            {"matrix": [4, 1], "x": 21, "y": 52, "flags": 4},
+            {"matrix": [4, 0], "x": 0, "y": 52, "flags": 4},
+
+            {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
+            {"matrix": [5, 1], "x": 13, "y": 64, "flags": 4},
+            {"matrix": [5, 2], "x": 26, "y": 64, "flags": 4},
+            {"matrix": [5, 3], "x": 43, "y": 62, "flags": 4},
+            {"matrix": [5, 4], "x": 59, "y": 60, "flags": 4},
+            {"matrix": [5, 6], "x": 75, "y": 60, "flags": 4},
+            {"matrix": [5, 7], "x": 98, "y": 61, "flags": 4},
+
+            {"matrix": [6, 1], "x": 131, "y": 2, "flags": 4},
+            {"matrix": [6, 2], "x": 144, "y": 1, "flags": 4},
+            {"matrix": [6, 3], "x": 157, "y": 0, "flags": 4},
+            {"matrix": [6, 4], "x": 170, "y": 1, "flags": 4},
+            {"matrix": [6, 5], "x": 182, "y": 3, "flags": 4},
+            {"matrix": [6, 6], "x": 195, "y": 5, "flags": 4},
+            {"matrix": [6, 7], "x": 208, "y": 5, "flags": 4},
+            {"matrix": [6, 8], "x": 221, "y": 5, "flags": 4},
+
+            {"matrix": [7, 8], "x": 214, "y": 17, "flags": 4},
+            {"matrix": [7, 6], "x": 195, "y": 17, "flags": 4},
+            {"matrix": [7, 5], "x": 182, "y": 15, "flags": 4},
+            {"matrix": [7, 4], "x": 170, "y": 13, "flags": 4},
+            {"matrix": [7, 3], "x": 157, "y": 12, "flags": 4},
+            {"matrix": [7, 2], "x": 144, "y": 13, "flags": 4},
+            {"matrix": [7, 1], "x": 131, "y": 14, "flags": 4},
+
+            {"matrix": [8, 0], "x": 118, "y": 25, "flags": 4},
+            {"matrix": [8, 1], "x": 131, "y": 25, "flags": 4},
+            {"matrix": [8, 2], "x": 144, "y": 25, "flags": 4},
+            {"matrix": [8, 3], "x": 157, "y": 24, "flags": 4},
+            {"matrix": [8, 4], "x": 170, "y": 25, "flags": 4},
+            {"matrix": [8, 5], "x": 182, "y": 27, "flags": 4},
+            {"matrix": [8, 6], "x": 195, "y": 29, "flags": 4},
+            {"matrix": [8, 7], "x": 208, "y": 29, "flags": 4},
+            {"matrix": [8, 8], "x": 221, "y": 29, "flags": 4},
+
+            {"matrix": [9, 8], "x": 216, "y": 40, "flags": 4},
+            {"matrix": [9, 6], "x": 195, "y": 40, "flags": 4},
+            {"matrix": [9, 5], "x": 182, "y": 38, "flags": 4},
+            {"matrix": [9, 4], "x": 170, "y": 36, "flags": 4},
+            {"matrix": [9, 3], "x": 157, "y": 35, "flags": 4},
+            {"matrix": [9, 2], "x": 144, "y": 36, "flags": 4},
+            {"matrix": [9, 1], "x": 131, "y": 37, "flags": 4},
+            {"matrix": [9, 0], "x": 118, "y": 37, "flags": 4},
+
+            {"matrix": [10, 0], "x": 118, "y": 49, "flags": 4},
+            {"matrix": [10, 1], "x": 131, "y": 49, "flags": 4},
+            {"matrix": [10, 2], "x": 144, "y": 48, "flags": 4},
+            {"matrix": [10, 3], "x": 157, "y": 47, "flags": 4},
+            {"matrix": [10, 4], "x": 170, "y": 48, "flags": 4},
+            {"matrix": [10, 5], "x": 182, "y": 50, "flags": 4},
+            {"matrix": [10, 6], "x": 197, "y": 52, "flags": 4},
+            {"matrix": [10, 7], "x": 211, "y": 52, "flags": 4},
+            {"matrix": [10, 8], "x": 224, "y": 52, "flags": 4},
+
+            {"matrix": [11, 8], "x": 224, "y": 64, "flags": 4},
+            {"matrix": [11, 7], "x": 211, "y": 64, "flags": 4},
+            {"matrix": [11, 6], "x": 198, "y": 64, "flags": 4},
+            {"matrix": [11, 5], "x": 181, "y": 62, "flags": 4},
+            {"matrix": [11, 4], "x": 165, "y": 60, "flags": 4},
+            {"matrix": [11, 2], "x": 149, "y": 60, "flags": 4},
+            {"matrix": [11, 1], "x": 126, "y": 61, "flags": 4}
+        ],
+        "split_count": [47, 48]
+    },
+    "split": {
+        "enabled": true,
+        "transport": {
+            "sync": {
+                "layer_state": true,
+                "matrix_state": true
+            }
+        }
+    },
+    "tags": ["columnar", "split", "rgb", "hotswap", "encoder"],
+    "url": "https://arrowmechanics.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3134",
+        "vid": "0xA880"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP26"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.25, "y": 0.43},
+                {"matrix": [0, 1], "x": 1.25, "y": 0.43},
+                {"matrix": [0, 2], "x": 2.25, "y": 0.43},
+                {"matrix": [0, 3], "x": 3.25, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.08},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0.08},
+                {"matrix": [0, 7], "x": 7.25, "y": 0.15},
+
+                {"matrix": [6, 1], "x": 10.45, "y": 0.15},
+                {"matrix": [6, 2], "x": 11.45, "y": 0.08},
+                {"matrix": [6, 3], "x": 12.45, "y": 0},
+                {"matrix": [6, 4], "x": 13.45, "y": 0.08},
+                {"matrix": [6, 5], "x": 14.45, "y": 0.25},
+                {"matrix": [6, 6], "x": 15.45, "y": 0.43},
+                {"matrix": [6, 7], "x": 16.45, "y": 0.43},
+                {"matrix": [6, 8], "x": 17.45, "y": 0.43},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.43},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.43},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.43},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.08},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.08},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.15},
+                {"matrix": [1, 8], "x": 8.25, "y": 1.15, "encoder": 0},
+
+                {"matrix": [7, 0], "x": 9.45, "y": 1.15},
+                {"matrix": [7, 1], "x": 10.45, "y": 1.15},
+                {"matrix": [7, 2], "x": 11.45, "y": 1.08},
+                {"matrix": [7, 3], "x": 12.45, "y": 1},
+                {"matrix": [7, 4], "x": 13.45, "y": 1.08},
+                {"matrix": [7, 5], "x": 14.45, "y": 1.25},
+                {"matrix": [7, 6], "x": 15.45, "y": 1.43},
+                {"matrix": [7, 8], "x": 16.45, "y": 1.43, "w": 2},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.43, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.75, "y": 2.43, "w": 1.5},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.08},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2.08},
+                {"matrix": [2, 7], "x": 7.25, "y": 2.15},
+                {"matrix": [2, 8], "x": 8.25, "y": 2.15},
+
+                {"matrix": [8, 0], "x": 9.45, "y": 2.15},
+                {"matrix": [8, 1], "x": 10.45, "y": 2.15},
+                {"matrix": [8, 2], "x": 11.45, "y": 2.08},
+                {"matrix": [8, 3], "x": 12.45, "y": 2},
+                {"matrix": [8, 4], "x": 13.45, "y": 2.08},
+                {"matrix": [8, 5], "x": 14.45, "y": 2.25},
+                {"matrix": [8, 6], "x": 15.45, "y": 2.43},
+                {"matrix": [8, 7], "x": 16.45, "y": 2.43},
+                {"matrix": [8, 8], "x": 17.45, "y": 2.43},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.43, "w": 1.5},
+                {"matrix": [3, 2], "x": 1.5, "y": 3.43, "w": 1.75},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.08},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.08},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.15},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.15},
+
+                {"matrix": [9, 0], "x": 9.45, "y": 3.15},
+                {"matrix": [9, 1], "x": 10.45, "y": 3.15},
+                {"matrix": [9, 2], "x": 11.45, "y": 3.08},
+                {"matrix": [9, 3], "x": 12.45, "y": 3},
+                {"matrix": [9, 4], "x": 13.45, "y": 3.08},
+                {"matrix": [9, 5], "x": 14.45, "y": 3.25},
+                {"matrix": [9, 6], "x": 15.45, "y": 3.43},
+                {"matrix": [9, 8], "x": 16.45, "y": 3.43, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.43},
+                {"matrix": [4, 1], "x": 1, "y": 4.43, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.08},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.08},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.15},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.15},
+
+                {"matrix": [10, 0], "x": 9.45, "y": 4.15},
+                {"matrix": [10, 1], "x": 10.45, "y": 4.15},
+                {"matrix": [10, 2], "x": 11.45, "y": 4.08},
+                {"matrix": [10, 3], "x": 12.45, "y": 4},
+                {"matrix": [10, 4], "x": 13.45, "y": 4.08},
+                {"matrix": [10, 5], "x": 14.45, "y": 4.25},
+                {"matrix": [10, 6], "x": 15.45, "y": 4.43, "w": 1.25},
+                {"matrix": [10, 7], "x": 16.7, "y": 4.43},
+                {"matrix": [10, 8], "x": 17.7, "y": 4.43},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.43},
+                {"matrix": [5, 1], "x": 1, "y": 5.43},
+                {"matrix": [5, 2], "x": 2, "y": 5.43},
+                {"matrix": [5, 3], "x": 3.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 4.5, "y": 5.08, "w": 1.25},
+                {"matrix": [5, 6], "x": 5.75, "y": 5.08, "w": 1.25},
+                {"matrix": [5, 7], "x": 7, "y": 5.15, "w": 2.25},
+
+                {"matrix": [11, 1], "x": 9.45, "y": 5.15, "w": 2.25},
+                {"matrix": [11, 2], "x": 11.7, "y": 5.08, "w": 1.25},
+                {"matrix": [11, 4], "x": 12.95, "y": 5.08, "w": 1.25},
+                {"matrix": [11, 5], "x": 14.2, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 15.7, "y": 5.43},
+                {"matrix": [11, 7], "x": 16.7, "y": 5.43},
+                {"matrix": [11, 8], "x": 17.7, "y": 5.43}
+            ]
+        }
+    }
+}

keyboards/arrowmechanics/wings/rules.mk

@@ -1,2 +1 @@
 SERIAL_DRIVER = vendor
-AUDIO_DRIVER = pwm_hardware

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