Merge branch 'develop' into octagon_layout_fix

.github/workflows/format.yml

@@ -35,7 +35,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v43
+      uses: tj-actions/changed-files@v44
       with:
         use_rest_api: true
 

.github/workflows/lint.yml

@@ -27,7 +27,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v43
+      uses: tj-actions/changed-files@v44
       with:
         use_rest_api: true
 

builddefs/converters.mk

@@ -5,8 +5,10 @@ ifneq ($(findstring yes, $(CTPC)$(CONVERT_TO_PROTON_C)),)
 $(call CATASTROPHIC_ERROR,The `CONVERT_TO_PROTON_C` and `CTPC` options are now deprecated. `CONVERT_TO=proton_c` should be used instead.)
 endif
 
-# TODO: opt in rather than assume everything uses a pro micro
-PIN_COMPATIBLE ?= promicro
+ifneq (,$(filter $(MCU),atmega32u4))
+    # TODO: opt in rather than assume everything uses a pro micro
+    PIN_COMPATIBLE ?= promicro
+endif
 
 # Remove whitespace from any rule.mk provided vars
 #   - env cannot be overwritten but cannot have whitespace anyway
@@ -16,6 +18,10 @@ ifneq ($(CONVERT_TO),)
     # stash so we can overwrite env provided vars if needed
     ACTIVE_CONVERTER=$(CONVERT_TO)
 
+    ifeq ($(PIN_COMPATIBLE),)
+        $(call CATASTROPHIC_ERROR,Converting to '$(CONVERT_TO)' not possible!)
+    endif
+
     # glob to search each platfrorm and/or check for valid converter
     CONVERTER := $(wildcard $(PLATFORM_PATH)/*/converters/$(PIN_COMPATIBLE)_to_$(CONVERT_TO)/)
     ifeq ($(CONVERTER),)

data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson

@@ -335,5 +335,9 @@
             "key": "ES_CIRC",
             "label": "^",
         }
+        "ALGR(KC_NUHS)": {
+            "key": "ES_GRV",
+            "label": "`",
+        }
     }
 }

docs/feature_rgblight.md

@@ -356,27 +356,12 @@ Usually lighting layers apply their configured brightness once activated. If you
 
 If you need to change your RGB lighting in code, for example in a macro to change the color whenever you switch layers, QMK provides a set of functions to assist you. See [`rgblight.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight/rgblight.h) for the full list, but the most commonly used functions include:
 
-### Utility Functions
-|Function                                    |Description                                                        |
-|--------------------------------------------|-------------------------------------------------------------------|
-|`sethsv(hue, sat, val, ledbuf)`             |Set ledbuf to the given HSV value                                  |
-|`sethsv_raw(hue, sat, val, ledbuf)`         |Set ledbuf to the given HSV value without RGBLIGHT_LIMIT_VAL check |
-|`setrgb(r, g, b, ledbuf)`                   |Set ledbuf to the given RGB value where `r`/`g`/`b`                |
-
 ### Low level Functions
 |Function                                    |Description                                |
 |--------------------------------------------|-------------------------------------------|
 |`rgblight_set()`                            |Flush out led buffers to LEDs              |
 |`rgblight_set_clipping_range(pos, num)`     |Set clipping Range. see [Clipping Range](#clipping-range) |
 
-Example:
-```c
-sethsv(HSV_WHITE, (rgb_led_t *)&led[0]); // led 0
-sethsv(HSV_RED,   (rgb_led_t *)&led[1]); // led 1
-sethsv(HSV_GREEN, (rgb_led_t *)&led[2]); // led 2
-rgblight_set(); // Utility functions do not call rgblight_set() automatically, so they need to be called explicitly.
-```
-
 ### Effects and Animations Functions
 #### effect range setting
 |Function                                    |Description       |

docs/flashing.md

@@ -464,4 +464,4 @@ CLI Flashing sequence:
 3. Flash via QMK CLI eg. `qmk flash --keyboard handwired/onekey/rpi_pico --keymap default`
 4. Wait for the keyboard to become available
 
-<sup>1</sup>: This works only if QMK was compiled with `RP2040_BOOTLOADER_DOUBLE_TAP_RESET` defined.
+<sup>1</sup>: This works only if the controller has been flashed with QMK Firmware with `RP2040_BOOTLOADER_DOUBLE_TAP_RESET` defined.

docs/pr_checklist.md

@@ -9,6 +9,7 @@ If there are any inconsistencies with these recommendations, you're best off [cr
 - PR should be submitted using a non-`master` branch on the source repository
     - this does not mean you target a different branch for your PR, rather that you're not working out of your own master branch
     - if submitter _does_ use their own `master` branch, they'll be given a link to the ["how to git"](newbs_git_using_your_master_branch.md) page after merging -- (end of this document will contain the contents of the message)
+    - Note, frequently merging upstream with your branch is not needed and is discouraged. Valid reason for updating your branch may be resolving merge conflicts and pulling in new changes relevant to your PR.
 - PRs should contain the smallest amount of modifications required for a single change to the codebase
     - multiple keyboards at the same time is not acceptable
     - **the smaller the PR, the higher likelihood of a quicker review, higher likelihood of quicker merge, and less chance of conflicts**
@@ -43,10 +44,10 @@ If there are any inconsistencies with these recommendations, you're best off [cr
 
 - PRs for vendor specific keymaps will be permitted. The naming convention for these should be `default_${vendor}`, `via_${vendor}` i.e. `via_clueboard`.
     - vendor specific keymaps do not necessarily need to be "vanilla" and can be more richly featured than `default` or `via` stock keymaps.
-- #include QMK_KEYBOARD_H preferred to including specific board files
+- `#include QMK_KEYBOARD_H` preferred to including specific board files
 - prefer layer enums to #defines
-- custom keycode enums must have first entry = SAFE_RANGE
-- some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap
+- custom keycode enums must have first entry = `QK_USER`
+- some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap. Spaces are preferred to tabs
 
 ## Keyboard PRs
 
@@ -81,6 +82,8 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
       - Encoder Configuration
       - Bootmagic Configuration
       - LED Indicator Configuration
+      - RGB Light Configuration
+      - RGB Matrix Configuration
     - Run `qmk format-json` on this file before submitting your PR. Be sure to append the `-i` flag to directly modify the file, or paste the outputted code into the file. 
 - `readme.md`
     - must follow the [template](https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md)
@@ -90,8 +93,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - a picture about the keyboard and preferably about the PCB, too
         - images are not to be placed in the `qmk_firmware` repository
         - images should be uploaded to an external image hosting service, such as [imgur](https://imgur.com/).
-        - if imgur is used, images should be resized appropriately: append "h" to the image url i.e. [https://i.imgur.com/vqgE7Ok.jpg](https://i.imgur.com/vqgE7Ok.jpg) becomes [https://i.imgur.com/vqgE7Ok**h**.jpg](https://i.imgur.com/vqgE7Okh.jpg)
-        - image links should link directly to the image, not a "preview" -- i.e. [https://imgur.com/vqgE7Ok](https://imgur.com/vqgE7Ok) should be [https://i.imgur.com/vqgE7Okh.jpg](https://i.imgur.com/vqgE7Okh.jpg) when using imgur
+        - image links should link directly to the image, not a "preview" -- i.e. [https://imgur.com/vqgE7Ok](https://imgur.com/vqgE7Ok) should be [https://i.imgur.com/vqgE7Ok.jpg](https://i.imgur.com/vqgE7Ok.jpg) when using imgur
 - `rules.mk`
     - removed `MIDI_ENABLE`, `FAUXCLICKY_ENABLE` and `HD44780_ENABLE`
     - modified `# Enable Bluetooth with the Adafruit EZ-Key HID` -> `# Enable Bluetooth`
@@ -204,7 +206,7 @@ Additionally, PR reviews are something that is done in our free time. We are not
 ## Example GPLv2 Header
 
 ```
-/* Copyright 2021 Your Name (@yourgithub)
+/* Copyright 2024 Your Name (@yourgithub)
  *
  * 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
@@ -224,6 +226,6 @@ Additionally, PR reviews are something that is done in our free time. We are not
 Or, optionally, using [SPDX identifier](https://spdx.org/licenses/) instead:
 
 ```
-// Copyright 2021 Your Name (@yourgithub)
+// Copyright 2024 Your Name (@yourgithub)
 // SPDX-License-Identifier: GPL-2.0-or-later
 ```

docs/serial_driver.md

@@ -1,6 +1,6 @@
 # 'serial' Driver
 
-The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available, depending on the platform of your split keyboard. Note that none of the drivers support split keyboards with more than two halves.
+The Serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature. Several implementations are available that cater to the platform and capabilites of MCU in use. Note that none of the drivers support split keyboards with more than two halves.
 
 | Driver                                  | AVR                | ARM                | Connection between halves                                                                     |
 | --------------------------------------- | ------------------ | ------------------ | --------------------------------------------------------------------------------------------- |
@@ -14,7 +14,7 @@ The serial driver powers the [Split Keyboard](feature_split_keyboard.md) feature
 
 ## Bitbang
 
-This is the Default driver, the absence of configuration assumes this driver. It works by [bit banging](https://en.wikipedia.org/wiki/Bit_banging) a GPIO pin using the CPU. It is therefore not as efficient as a dedicated hardware peripheral, which the Half-duplex and Full-duplex drivers use.
+This is the Default driver, absence of configuration assumes this driver. It works by [bit banging](https://en.wikipedia.org/wiki/Bit_banging) a GPIO pin using the CPU. It is therefore not as efficient as a dedicated hardware peripheral, which the Half-duplex and Full-duplex drivers use.
 
 !> On ARM platforms the bitbang driver causes connection issues when using it together with the bitbang WS2812 driver. Choosing alternate drivers for both serial and WS2812 (instead of bitbang) is strongly recommended.
 
@@ -31,7 +31,7 @@ This is the Default driver, the absence of configuration assumes this driver. It
 +-------+                 +-------+
 ```
 
-One GPIO pin is needed for the bitbang driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SOFT_SERIAL_PIN` (SSP) in the configuration. A simple TRS or USB cable provides enough conductors for this driver to work. 
+One GPIO pin is needed for the bitbang driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SOFT_SERIAL_PIN` (SSP) in the configuration. A TRS or USB cable provides enough conductors for this driver to function. 
 
 ### Setup
 
@@ -57,7 +57,7 @@ SERIAL_DRIVER = bitbang
 
 ## USART Half-duplex
 
-Targeting ARM boards based on ChibiOS, where communication is offloaded to a USART hardware device that supports Half-duplex operation. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose this driver or the Full-duplex driver whenever possible.
+Targeting ARM boards based on ChibiOS, where communication is offloaded to a USART hardware device that supports Half-duplex operation. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose Half-duplex over Bitbang if MCU is capable of utilising Half-duplex, and Full-duplex can't be used instead (e.g. lack of available GPIO pins, or imcompatible PCB design).
 
 ### Pin configuration
 
@@ -74,11 +74,13 @@ Targeting ARM boards based on ChibiOS, where communication is offloaded to a USA
 +-------+                 +-------+
 ```
 
-Only one GPIO pin is needed for the Half-duplex driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SERIAL_USART_TX_PIN` in the configuration. Take care that the pin you chose can act as the TX pin of the USART peripheral. A simple TRS or USB cable provides enough conductors for this driver to work. As the split connection is configured to work in open-drain mode, an **external pull-up resistor is needed to keep the line high**. Resistor values of 1.5kΩ to 8.2kΩ are known to work.
+Only one GPIO pin is needed for the Half-duplex driver, as only one wire is used for receiving and transmitting data. This pin is referred to as the `SERIAL_USART_TX_PIN` in the configuration. Ensure that the pin chosen for split communication can operate as the TX pin of the contoller's USART peripheral. A TRS or USB cable provides enough conductors for this driver to function. As the split connection is configured to operate in open-drain mode, an **external pull-up resistor is needed to keep the line high**. Resistor values of 1.5kΩ to 8.2kΩ are known to work. 
+
+!> ***Note:*** A pull-up resistor isn't required for RP2040 controllers configured with PIO subsystem.
 
 ### Setup
 
-To use the Half-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation skip step 1.
+To use the Half-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation, start at step 2.
 
 1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file:
 
@@ -86,7 +88,9 @@ To use the Half-duplex driver follow these steps to activate it. If you target t
 SERIAL_DRIVER = usart
 ```
 
-2. (RP2040 PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
+Skip to step 3.
+
+2. (RP2040 + PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
 
 ```make
 SERIAL_DRIVER = vendor
@@ -105,13 +109,13 @@ For STM32 MCUs several GPIO configuration options can be changed as well. See th
 #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 ```
 
-4. Decide either for `SERIAL`, `SIO` or `PIO` subsystem, see the section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
+4. Decide either for `SERIAL`, `SIO`, or `PIO` subsystem. See section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
 
 <hr>
 
 ## USART Full-duplex
 
-Targeting ARM boards based on ChibiOS where communication is offloaded to an USART hardware device. The advantages over bitbanging are fast, accurate timings and reduced CPU usage. Therefore it is advised to choose this driver or the Full-duplex driver whenever possible. Due to its internal design it is slightly more efficient then the Half-duplex driver, but it should be primarily chosen if Half-duplex operation is not supported by the USART peripheral.
+Targeting ARM boards based on ChibiOS where communication is offloaded to an USART hardware device. The advantages over bitbanging are fast, accurate timings and reduced CPU usage; therefore it is advised to choose this driver over all others where possible. Due to its internal design Full-duplex is slightly more efficient than the Half-duplex driver, but Full-duplex should be primarily chosen if Half-duplex operation is not supported by the controller's USART peripheral.
 
 ### Pin configuration
 
@@ -129,13 +133,13 @@ Targeting ARM boards based on ChibiOS where communication is offloaded to an USA
 +-------+                 +-------+
 ```
 
-Two GPIO pins are needed for the Full-duplex driver, as two distinct wires are used for receiving and transmitting data. The pin transmitting data is the `TX` pin and refereed to as the `SERIAL_USART_TX_PIN`, the pin receiving data is the `RX` pin and refereed to as the `SERIAL_USART_RX_PIN` in this configuration. Please note that `TX` pin of the master half has to be connected with the `RX` pin of the slave half and the `RX` pin of the master half has to be connected with the `TX` pin of the slave half! Usually this pin swap has to be done outside of the MCU e.g. with cables or on the PCB. Some MCUs like the STM32F303 used on the Proton-C allow this pin swap directly inside the MCU. A simple TRRS or USB cable provides enough conductors for this driver to work.
+Two GPIO pins are needed for the Full-duplex driver, as two distinct wires are used for receiving and transmitting data. The pin transmitting data is the `TX` pin and refereed to as the `SERIAL_USART_TX_PIN`, the pin receiving data is the `RX` pin and refereed to as the `SERIAL_USART_RX_PIN` in this configuration. Please note that `TX` pin of the master half has to be connected with the `RX` pin of the slave half and the `RX` pin of the master half has to be connected with the `TX` pin of the slave half! Usually this pin swap has to be done outside of the MCU e.g. with cables or on the PCB. Some MCUs like the STM32F303 used on the Proton-C allow this pin swap directly inside the MCU. A TRRS or USB cable provides enough conductors for this driver to function.
 
-To use this driver the usart peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Refer to the corresponding datasheets of your MCU or find those settings in the section ["Alternate Functions for selected STM32 MCUs"](#alternate-functions-for-selected-stm32-mcus).
+To use this driver the USART peripherals `TX` and `RX` pins must be configured with the correct Alternate-functions. If you are using a Proton-C development board everything is already setup, same is true for STM32F103 MCUs. For MCUs which are using a modern flexible GPIO configuration you have to specify these by setting `SERIAL_USART_TX_PAL_MODE` and `SERIAL_USART_RX_PAL_MODE`. Refer to the corresponding datasheets of your MCU or find those settings in the section ["Alternate Functions for selected STM32 MCUs"](#alternate-functions-for-selected-stm32-mcus).
 
 ### Setup
 
-To use the Full-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation skip step 1.
+To use the Full-duplex driver follow these steps to activate it. If you target the Raspberry Pi RP2040 PIO implementation, start at step 2
 
 1. Change the `SERIAL_DRIVER` to `usart` in your keyboards `rules.mk` file:
 
@@ -143,7 +147,9 @@ To use the Full-duplex driver follow these steps to activate it. If you target t
 SERIAL_DRIVER = usart
 ```
 
-2. (RP2040 PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
+Skip to step 3
+
+2. (RP2040 + PIO only!) Change the `SERIAL_DRIVER` to `vendor` in your keyboards `rules.mk` file:
 
 ```make
 SERIAL_DRIVER = vendor
@@ -165,7 +171,7 @@ For STM32 MCUs several GPIO configuration options, including the ability for `TX
 #define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 ```
 
-1. Decide either for `SERIAL`, `SIO` or `PIO` subsystem, see the section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
+4. Decide either for `SERIAL`, `SIO`, or `PIO` subsystem. See section ["Choosing a driver subsystem"](#choosing-a-driver-subsystem).
 
 <hr>
 
@@ -225,7 +231,7 @@ Just below `#include_next <mcuconf.h>` add:
 
 Where 'n' matches the peripheral number of your selected USART on the MCU.
 
-3. In you keyboards `config.h`: override the default USART `SIO` driver if you use a USART peripheral that does not belong to the default selected `SIOD1` driver. For instance, if you selected `STM32_SERIAL_USE_USART3` the matching driver would be `SIOD3`.
+3. In the keyboard's `config.h` file: override the default USART `SIO` driver if you use a USART peripheral that does not belong to the default selected `SIOD1` driver. For instance, if you selected `STM32_SERIAL_USE_USART3` the matching driver would be `SIOD3`.
 
 ```c
  #define SERIAL_USART_DRIVER SIOD3
@@ -233,9 +239,9 @@ Where 'n' matches the peripheral number of your selected USART on the MCU.
  
 ### The `PIO` driver
 
-The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using the integrated PIO peripheral and is therefore only available on this MCU. Because of the flexible nature of the PIO peripherals, **any** GPIO pin can be used as a `TX` or `RX` pin. Half-duplex and Full-duplex operation is fully supported. The Half-duplex operation mode uses the built-in pull-ups and GPIO manipulation on the RP2040 to drive the line high by default. An external pull-up is therefore not necessary.
+The `PIO` subsystem is a Raspberry Pi RP2040 specific implementation, using an integrated PIO peripheral and is therefore only available on this MCU. Because of the flexible nature of PIO peripherals, **any** GPIO pin can be used as a `TX` or `RX` pin. Half-duplex and Full-duplex operation modes are fully supported with this driver. Half-duplex uses the built-in pull-ups and GPIO manipulation of the RP2040 to drive the line high by default, thus an external pull-up resistor **is not required**.
 
-You may optionally switch the PIO peripheral used with the following define in config.h:
+Optionally, the PIO peripheral utilized for split communication can be changed with the following define in config.h:
 ```c
 #define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral
 ```

drivers/gpio/mcp23018.c

@@ -74,20 +74,20 @@ bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB) {
     return true;
 }
 
-bool mcp23018_readPins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* out) {
+bool mcp23018_read_pins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_GPIOB : CMD_GPIOA;
 
     i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
-        dprintf("mcp23018_readPins::FAILED::%u\n", ret);
+        dprintf("mcp23018_read_pins::FAILED::%u\n", ret);
         return false;
     }
 
     return true;
 }
 
-bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* out) {
+bool mcp23018_read_pins_all(uint8_t slave_addr, uint16_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
 
     typedef union {
@@ -99,7 +99,7 @@ bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* out) {
 
     i2c_status_t ret = i2c_read_register(addr, CMD_GPIOA, &data.u8[0], sizeof(data), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
-        dprintf("mcp23018_readPins::FAILED::%u\n", ret);
+        dprintf("mcp23018_read_pins_all::FAILED::%u\n", ret);
         return false;
     }
 

drivers/gpio/mcp23018.h

@@ -55,11 +55,16 @@ bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB);
 /**
  * Read state of a given port
  */
-bool mcp23018_readPins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* ret);
+bool mcp23018_read_pins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* ret);
 
 /**
  * Read state of both ports sequentially
  *
  *  - slightly faster than multiple readPins
  */
-bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* ret);
+bool mcp23018_read_pins_all(uint8_t slave_addr, uint16_t* ret);
+
+// DEPRECATED - DO NOT USE
+
+#define mcp23018_readPins mcp23018_read_pins
+#define mcp23018_readPins_all mcp23018_read_pins_all

drivers/gpio/pca9505.c

@@ -133,7 +133,7 @@ bool pca9505_set_output(uint8_t slave_addr, pca9505_port_t port, uint8_t conf) {
     return true;
 }
 
-bool pca9505_readPins(uint8_t slave_addr, pca9505_port_t port, uint8_t* out) {
+bool pca9505_read_pins(uint8_t slave_addr, pca9505_port_t port, uint8_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = 0;
     switch (port) {
@@ -156,7 +156,7 @@ bool pca9505_readPins(uint8_t slave_addr, pca9505_port_t port, uint8_t* out) {
 
     i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
-        print("pca9505_readPins::FAILED\n");
+        print("pca9505_read_pins::FAILED\n");
         return false;
     }
 

drivers/gpio/pca9505.h

@@ -64,4 +64,8 @@ bool pca9505_set_output(uint8_t slave_addr, pca9505_port_t port, uint8_t conf);
 /**
  * Read state of a given port
  */
-bool pca9505_readPins(uint8_t slave_addr, pca9505_port_t port, uint8_t* ret);
+bool pca9505_read_pins(uint8_t slave_addr, pca9505_port_t port, uint8_t* ret);
+
+// DEPRECATED - DO NOT USE
+
+#define pca9505_readPins pca9505_read_pins

drivers/gpio/pca9555.c

@@ -70,20 +70,20 @@ bool pca9555_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB) {
     return true;
 }
 
-bool pca9555_readPins(uint8_t slave_addr, pca9555_port_t port, uint8_t* out) {
+bool pca9555_read_pins(uint8_t slave_addr, pca9555_port_t port, uint8_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_INPUT_1 : CMD_INPUT_0;
 
     i2c_status_t ret = i2c_read_register(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
-        print("pca9555_readPins::FAILED\n");
+        print("pca9555_read_pins::FAILED\n");
         return false;
     }
 
     return true;
 }
 
-bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* out) {
+bool pca9555_read_pins_all(uint8_t slave_addr, uint16_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
 
     typedef union {
@@ -95,7 +95,7 @@ bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* out) {
 
     i2c_status_t ret = i2c_read_register(addr, CMD_INPUT_0, &data.u8[0], sizeof(data), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
-        print("pca9555_readPins_all::FAILED\n");
+        print("pca9555_read_pins_all::FAILED\n");
         return false;
     }
 

drivers/gpio/pca9555.h

@@ -78,11 +78,16 @@ bool pca9555_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB);
 /**
  * Read state of a given port
  */
-bool pca9555_readPins(uint8_t slave_addr, pca9555_port_t port, uint8_t* ret);
+bool pca9555_read_pins(uint8_t slave_addr, pca9555_port_t port, uint8_t* ret);
 
 /**
  * Read state of both ports sequentially
  *
  *  - slightly faster than multiple readPins
  */
-bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* ret);
+bool pca9555_read_pins_all(uint8_t slave_addr, uint16_t* ret);
+
+// DEPRECATED - DO NOT USE
+
+#define pca9555_readPins pca9555_read_pins
+#define pca9555_readPins_all pca9555_read_pins_all

keyboards/0xc7/61key/info.json

@@ -1,92 +0,0 @@
-{
-    "keyboard_name": "61Key",
-    "manufacturer": "0xC7",
-    "url": "",
-    "maintainer": "RealEmanGaming",
-    "usb": {
-        "vid": "0xE117",
-        "pid": "0x6161",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"],
-        "rows": ["B0", "B1", "B2", "B3", "B7"]
-    },
-    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT": "LAYOUT_60_ansi"
-    },
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}

keyboards/0xc7/61key/keyboard.json

@@ -0,0 +1,104 @@
+{
+    "keyboard_name": "61Key",
+    "manufacturer": "0xC7",
+    "url": "",
+    "maintainer": "RealEmanGaming",
+    "usb": {
+        "vid": "0xE117",
+        "pid": "0x6161",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": false,
+        "key_lock": true,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "diode_direction": "COL2ROW",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_ansi"
+    },
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}

keyboards/0xc7/61key/rules.mk

@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LTO_ENABLE = yes
-KEY_LOCK_ENABLE = yes

keyboards/0xcb/1337/info.json

@@ -1,77 +0,0 @@
-{
-  "keyboard_name": "1337",
-  "manufacturer": "0xCB",
-  "url": "https://0xCB.dev",
-  "maintainer": "Conor-Burns",
-  "usb": {
-    "vid": "0xCB00",
-    "pid": "0x1337",
-    "device_version": "0.0.1"
-  },
-  "backlight": {
-    "pin": "B5",
-    "levels": 7,
-    "breathing": true
-  },
-  "encoder": {
-    "rotary": [
-      {"pin_a": "F6", "pin_b": "F5"}
-    ]
-  },
-  "qmk": {
-    "tap_keycode_delay": 10
-  },
-  "qmk_lufa_bootloader": {
-    "led": "B0"
-  },
-  "rgblight": {
-    "saturation_steps": 8,
-    "brightness_steps": 8,
-    "led_count": 4,
-    "sleep": true,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    },
-    "default": {
-      "hue": 152,
-      "sat": 232,
-      "speed": 2
-    }
-  },
-  "ws2812": {
-    "pin": "D3"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "qmk-dfu",
-  "matrix_pins": {
-    "direct": [
-      ["D2", "D4", "F4"],
-      ["D7", "B1", "B3"],
-      ["E6", "B4", "B2"]
-    ]
-  },
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x": 0, "y": 0, "matrix": [0, 0]},
-        {"x": 1, "y": 0, "matrix": [0, 1]},
-        {"x": 2, "y": 0, "matrix": [0, 2]},
-        {"x": 0, "y": 1, "matrix": [1, 0]},
-        {"x": 1, "y": 1, "matrix": [1, 1]},
-        {"x": 2, "y": 1, "matrix": [1, 2]},
-        {"x": 0, "y": 2, "matrix": [2, 0]},
-        {"x": 1, "y": 2, "matrix": [2, 1]},
-        {"x": 2, "y": 2, "matrix": [2, 2]}
-      ]
-    }
-  }
-}

keyboards/0xcb/1337/keyboard.json

@@ -0,0 +1,92 @@
+{
+  "keyboard_name": "1337",
+  "manufacturer": "0xCB",
+  "url": "https://0xCB.dev",
+  "maintainer": "Conor-Burns",
+  "usb": {
+    "vid": "0xCB00",
+    "pid": "0x1337",
+    "device_version": "0.0.1"
+  },
+  "backlight": {
+    "pin": "B5",
+    "levels": 7,
+    "breathing": true
+  },
+  "encoder": {
+    "rotary": [
+      {"pin_a": "F6", "pin_b": "F5"}
+    ]
+  },
+  "qmk": {
+    "tap_keycode_delay": 10
+  },
+  "qmk_lufa_bootloader": {
+    "led": "B0"
+  },
+  "rgblight": {
+    "saturation_steps": 8,
+    "brightness_steps": 8,
+    "led_count": 4,
+    "sleep": true,
+    "animations": {
+      "breathing": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "snake": true,
+      "knight": true,
+      "christmas": true,
+      "static_gradient": true,
+      "rgb_test": true,
+      "alternating": true,
+      "twinkle": true
+    },
+    "default": {
+      "hue": 152,
+      "sat": 232,
+      "speed": 2
+    }
+  },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "processor": "atmega32u4",
+  "bootloader": "qmk-dfu",
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "backlight": true,
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false,
+    "oled": true,
+    "rgblight": true
+  },
+  "matrix_pins": {
+    "direct": [
+      ["D2", "D4", "F4"],
+      ["D7", "B1", "B3"],
+      ["E6", "B4", "B2"]
+    ]
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
+      ]
+    }
+  }
+}

keyboards/0xcb/1337/rules.mk

@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes 	    # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no	        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-OLED_ENABLE = yes

keyboards/0xcb/static/info.json

@@ -1,132 +0,0 @@
-{
-  "keyboard_name": "Static",
-  "manufacturer": "0xCB",
-  "url": "https://0xCB.dev",
-  "maintainer": "Conor-Burns",
-  "usb": {
-    "vid": "0xCB00",
-    "pid": "0xA455",
-    "device_version": "0.0.1"
-  },
-  "matrix_pins": {
-    "cols": ["B5", "D4", "C0", "C1", "C2", "C3"],
-    "rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"]
-  },
-  "diode_direction": "COL2ROW",
-  "encoder": {
-    "rotary": [
-      {"pin_a": "D0", "pin_b": "D1"}
-    ]
-  },
-  "qmk": {
-    "tap_keycode_delay": 10
-  },
-  "processor": "atmega328p",
-  "bootloader": "usbasploader",
-  "layout_aliases": {
-    "LAYOUT": "LAYOUT_all"
-  },
-  "layouts": {
-    "LAYOUT_all": {
-      "layout": [
-        {"matrix": [1, 5], "x": 11, "y": 0},
-
-        {"matrix": [0, 0], "x": 0, "y": 1},
-        {"matrix": [1, 0], "x": 1, "y": 1},
-        {"matrix": [0, 1], "x": 2, "y": 1},
-        {"matrix": [1, 1], "x": 3, "y": 1},
-        {"matrix": [0, 2], "x": 4, "y": 1},
-        {"matrix": [1, 2], "x": 5, "y": 1},
-        {"matrix": [0, 3], "x": 6, "y": 1},
-        {"matrix": [1, 3], "x": 7, "y": 1},
-        {"matrix": [0, 4], "x": 8, "y": 1},
-        {"matrix": [1, 4], "x": 9, "y": 1},
-        {"matrix": [0, 5], "x": 10, "y": 1},
-        {"matrix": [3, 5], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
-        {"matrix": [3, 0], "x": 1.25, "y": 2},
-        {"matrix": [2, 1], "x": 2.25, "y": 2},
-        {"matrix": [3, 1], "x": 3.25, "y": 2},
-        {"matrix": [2, 2], "x": 4.25, "y": 2},
-        {"matrix": [3, 2], "x": 5.25, "y": 2},
-        {"matrix": [2, 3], "x": 6.25, "y": 2},
-        {"matrix": [3, 3], "x": 7.25, "y": 2},
-        {"matrix": [2, 4], "x": 8.25, "y": 2},
-        {"matrix": [3, 4], "x": 9.25, "y": 2},
-        {"matrix": [2, 5], "x": 10.25, "y": 2, "w": 1.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [4, 1], "x": 1.75, "y": 3},
-        {"matrix": [5, 1], "x": 2.75, "y": 3},
-        {"matrix": [4, 2], "x": 3.75, "y": 3},
-        {"matrix": [5, 2], "x": 4.75, "y": 3},
-        {"matrix": [4, 3], "x": 5.75, "y": 3},
-        {"matrix": [5, 3], "x": 6.75, "y": 3},
-        {"matrix": [4, 4], "x": 7.75, "y": 3},
-        {"matrix": [5, 4], "x": 8.75, "y": 3},
-        {"matrix": [4, 5], "x": 9.75, "y": 3},
-        {"matrix": [5, 5], "x": 10.75, "y": 3, "w": 1.25},
-
-        {"matrix": [6, 0], "x": 0, "y": 4},
-        {"matrix": [7, 0], "x": 1, "y": 4},
-        {"matrix": [6, 1], "x": 2, "y": 4},
-        {"matrix": [7, 1], "x": 3, "y": 4, "w": 2.75},
-        {"matrix": [7, 2], "x": 5.75, "y": 4},
-        {"matrix": [6, 4], "x": 6.75, "y": 4, "w": 2.25},
-        {"matrix": [7, 4], "x": 9, "y": 4},
-        {"matrix": [6, 5], "x": 10, "y": 4},
-        {"matrix": [7, 5], "x": 11, "y": 4}
-      ]
-    },
-    "LAYOUT_bigbar": {
-      "layout": [
-        {"matrix": [1, 5], "x": 11, "y": 0},
-
-        {"matrix": [0, 0], "x": 0, "y": 1},
-        {"matrix": [1, 0], "x": 1, "y": 1},
-        {"matrix": [0, 1], "x": 2, "y": 1},
-        {"matrix": [1, 1], "x": 3, "y": 1},
-        {"matrix": [0, 2], "x": 4, "y": 1},
-        {"matrix": [1, 2], "x": 5, "y": 1},
-        {"matrix": [0, 3], "x": 6, "y": 1},
-        {"matrix": [1, 3], "x": 7, "y": 1},
-        {"matrix": [0, 4], "x": 8, "y": 1},
-        {"matrix": [1, 4], "x": 9, "y": 1},
-        {"matrix": [0, 5], "x": 10, "y": 1},
-        {"matrix": [3, 5], "x": 11, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
-        {"matrix": [3, 0], "x": 1.25, "y": 2},
-        {"matrix": [2, 1], "x": 2.25, "y": 2},
-        {"matrix": [3, 1], "x": 3.25, "y": 2},
-        {"matrix": [2, 2], "x": 4.25, "y": 2},
-        {"matrix": [3, 2], "x": 5.25, "y": 2},
-        {"matrix": [2, 3], "x": 6.25, "y": 2},
-        {"matrix": [3, 3], "x": 7.25, "y": 2},
-        {"matrix": [2, 4], "x": 8.25, "y": 2},
-        {"matrix": [3, 4], "x": 9.25, "y": 2},
-        {"matrix": [2, 5], "x": 10.25, "y": 2, "w": 1.75},
-
-        {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [4, 1], "x": 1.75, "y": 3},
-        {"matrix": [5, 1], "x": 2.75, "y": 3},
-        {"matrix": [4, 2], "x": 3.75, "y": 3},
-        {"matrix": [5, 2], "x": 4.75, "y": 3},
-        {"matrix": [4, 3], "x": 5.75, "y": 3},
-        {"matrix": [5, 3], "x": 6.75, "y": 3},
-        {"matrix": [4, 4], "x": 7.75, "y": 3},
-        {"matrix": [5, 4], "x": 8.75, "y": 3},
-        {"matrix": [4, 5], "x": 9.75, "y": 3},
-        {"matrix": [5, 5], "x": 10.75, "y": 3, "w": 1.25},
-
-        {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [7, 0], "x": 1.25, "y": 4},
-        {"matrix": [6, 1], "x": 2.25, "y": 4},
-        {"matrix": [7, 2], "x": 3.25, "y": 4, "w": 6.25},
-        {"matrix": [6, 5], "x": 9.5, "y": 4, "w": 1.25},
-        {"matrix": [7, 5], "x": 10.75, "y": 4, "w": 1.25}
-      ]
-    }
-  }
-}

keyboards/0xcb/static/keyboard.json

@@ -0,0 +1,145 @@
+{
+  "keyboard_name": "Static",
+  "manufacturer": "0xCB",
+  "url": "https://0xCB.dev",
+  "maintainer": "Conor-Burns",
+  "usb": {
+    "vid": "0xCB00",
+    "pid": "0xA455",
+    "device_version": "0.0.1"
+  },
+  "build": {
+    "lto": true
+  },
+  "features": {
+    "bootmagic": true,
+    "command": false,
+    "console": false,
+    "encoder": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false,
+    "oled": true
+  },
+  "matrix_pins": {
+    "cols": ["B5", "D4", "C0", "C1", "C2", "C3"],
+    "rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"]
+  },
+  "diode_direction": "COL2ROW",
+  "encoder": {
+    "rotary": [
+      {"pin_a": "D0", "pin_b": "D1"}
+    ]
+  },
+  "qmk": {
+    "tap_keycode_delay": 10
+  },
+  "processor": "atmega328p",
+  "bootloader": "usbasploader",
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_all"
+  },
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [1, 5], "x": 11, "y": 0},
+
+        {"matrix": [0, 0], "x": 0, "y": 1},
+        {"matrix": [1, 0], "x": 1, "y": 1},
+        {"matrix": [0, 1], "x": 2, "y": 1},
+        {"matrix": [1, 1], "x": 3, "y": 1},
+        {"matrix": [0, 2], "x": 4, "y": 1},
+        {"matrix": [1, 2], "x": 5, "y": 1},
+        {"matrix": [0, 3], "x": 6, "y": 1},
+        {"matrix": [1, 3], "x": 7, "y": 1},
+        {"matrix": [0, 4], "x": 8, "y": 1},
+        {"matrix": [1, 4], "x": 9, "y": 1},
+        {"matrix": [0, 5], "x": 10, "y": 1},
+        {"matrix": [3, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+        {"matrix": [3, 0], "x": 1.25, "y": 2},
+        {"matrix": [2, 1], "x": 2.25, "y": 2},
+        {"matrix": [3, 1], "x": 3.25, "y": 2},
+        {"matrix": [2, 2], "x": 4.25, "y": 2},
+        {"matrix": [3, 2], "x": 5.25, "y": 2},
+        {"matrix": [2, 3], "x": 6.25, "y": 2},
+        {"matrix": [3, 3], "x": 7.25, "y": 2},
+        {"matrix": [2, 4], "x": 8.25, "y": 2},
+        {"matrix": [3, 4], "x": 9.25, "y": 2},
+        {"matrix": [2, 5], "x": 10.25, "y": 2, "w": 1.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [4, 1], "x": 1.75, "y": 3},
+        {"matrix": [5, 1], "x": 2.75, "y": 3},
+        {"matrix": [4, 2], "x": 3.75, "y": 3},
+        {"matrix": [5, 2], "x": 4.75, "y": 3},
+        {"matrix": [4, 3], "x": 5.75, "y": 3},
+        {"matrix": [5, 3], "x": 6.75, "y": 3},
+        {"matrix": [4, 4], "x": 7.75, "y": 3},
+        {"matrix": [5, 4], "x": 8.75, "y": 3},
+        {"matrix": [4, 5], "x": 9.75, "y": 3},
+        {"matrix": [5, 5], "x": 10.75, "y": 3, "w": 1.25},
+
+        {"matrix": [6, 0], "x": 0, "y": 4},
+        {"matrix": [7, 0], "x": 1, "y": 4},
+        {"matrix": [6, 1], "x": 2, "y": 4},
+        {"matrix": [7, 1], "x": 3, "y": 4, "w": 2.75},
+        {"matrix": [7, 2], "x": 5.75, "y": 4},
+        {"matrix": [6, 4], "x": 6.75, "y": 4, "w": 2.25},
+        {"matrix": [7, 4], "x": 9, "y": 4},
+        {"matrix": [6, 5], "x": 10, "y": 4},
+        {"matrix": [7, 5], "x": 11, "y": 4}
+      ]
+    },
+    "LAYOUT_bigbar": {
+      "layout": [
+        {"matrix": [1, 5], "x": 11, "y": 0},
+
+        {"matrix": [0, 0], "x": 0, "y": 1},
+        {"matrix": [1, 0], "x": 1, "y": 1},
+        {"matrix": [0, 1], "x": 2, "y": 1},
+        {"matrix": [1, 1], "x": 3, "y": 1},
+        {"matrix": [0, 2], "x": 4, "y": 1},
+        {"matrix": [1, 2], "x": 5, "y": 1},
+        {"matrix": [0, 3], "x": 6, "y": 1},
+        {"matrix": [1, 3], "x": 7, "y": 1},
+        {"matrix": [0, 4], "x": 8, "y": 1},
+        {"matrix": [1, 4], "x": 9, "y": 1},
+        {"matrix": [0, 5], "x": 10, "y": 1},
+        {"matrix": [3, 5], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+        {"matrix": [3, 0], "x": 1.25, "y": 2},
+        {"matrix": [2, 1], "x": 2.25, "y": 2},
+        {"matrix": [3, 1], "x": 3.25, "y": 2},
+        {"matrix": [2, 2], "x": 4.25, "y": 2},
+        {"matrix": [3, 2], "x": 5.25, "y": 2},
+        {"matrix": [2, 3], "x": 6.25, "y": 2},
+        {"matrix": [3, 3], "x": 7.25, "y": 2},
+        {"matrix": [2, 4], "x": 8.25, "y": 2},
+        {"matrix": [3, 4], "x": 9.25, "y": 2},
+        {"matrix": [2, 5], "x": 10.25, "y": 2, "w": 1.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [4, 1], "x": 1.75, "y": 3},
+        {"matrix": [5, 1], "x": 2.75, "y": 3},
+        {"matrix": [4, 2], "x": 3.75, "y": 3},
+        {"matrix": [5, 2], "x": 4.75, "y": 3},
+        {"matrix": [4, 3], "x": 5.75, "y": 3},
+        {"matrix": [5, 3], "x": 6.75, "y": 3},
+        {"matrix": [4, 4], "x": 7.75, "y": 3},
+        {"matrix": [5, 4], "x": 8.75, "y": 3},
+        {"matrix": [4, 5], "x": 9.75, "y": 3},
+        {"matrix": [5, 5], "x": 10.75, "y": 3, "w": 1.25},
+
+        {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [7, 0], "x": 1.25, "y": 4},
+        {"matrix": [6, 1], "x": 2.25, "y": 4},
+        {"matrix": [7, 2], "x": 3.25, "y": 4, "w": 6.25},
+        {"matrix": [6, 5], "x": 9.5, "y": 4, "w": 1.25},
+        {"matrix": [7, 5], "x": 10.75, "y": 4, "w": 1.25}
+      ]
+    }
+  }
+}

keyboards/0xcb/static/rules.mk

@@ -1,16 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no	        # Commands for debug and configuration
-NKRO_ENABLE = 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
-LTO_ENABLE = yes
-OLED_ENABLE = yes

keyboards/1upkeyboards/1up60hse/info.json

@@ -1,116 +0,0 @@
-{
-    "keyboard_name": "1up60hse",
-    "manufacturer": "1upkeyboards",
-    "url": "",
-    "maintainer": "qmk",
-    "usb": {
-        "vid": "0x6F75",
-        "pid": "0x6873",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"],
-        "rows": ["B3", "B2", "B1", "B0", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7",
-        "levels": 5,
-        "breathing": true
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 14,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi"],
-    "layouts": {
-        "LAYOUT_60_ansi": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-            ]
-        }
-    }
-}

keyboards/1upkeyboards/1up60hse/keyboard.json

@@ -0,0 +1,129 @@
+{
+    "keyboard_name": "1up60hse",
+    "manufacturer": "1upkeyboards",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6F75",
+        "pid": "0x6873",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "console": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"],
+        "rows": ["B3", "B2", "B1", "B0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7",
+        "levels": 5,
+        "breathing": true
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "community_layouts": ["60_ansi"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}

keyboards/1upkeyboards/1up60hse/rules.mk

@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes

keyboards/1upkeyboards/1up60hte/info.json

@@ -1,189 +0,0 @@
-{
-    "keyboard_name": "1up60hte",
-    "manufacturer": "1upkeyboards",
-    "url": "https://www.1upkeyboards.com/shop/controllers/1up-rgb-60-pcb-hte/",
-    "maintainer": "1upkeyboards",
-    "usb": {
-        "vid": "0x6F75",
-        "pid": "0x6874",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"],
-        "rows": ["B3", "B2", "B1", "B0", "D4"]
-    },
-    "diode_direction": "COL2ROW",
-    "backlight": {
-        "pin": "B7"
-    },
-    "indicators": {
-        "caps_lock": "B6",
-        "on_state": 0
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 14,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "F0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layout_aliases": {
-        "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
-    },
-    "community_layouts": ["60_hhkb", "60_tsangan_hhkb"],
-    "layouts": {
-        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [4, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 12.5, "y": 4},
-                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
-            ]
-        },
-        "LAYOUT_60_hhkb": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [4, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [3, 12], "x": 14, "y": 3},
-
-                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"matrix": [4, 11], "x": 12.5, "y": 4}
-            ]
-        }
-    }
-}

keyboards/1upkeyboards/1up60hte/keyboard.json

@@ -0,0 +1,202 @@
+{
+    "keyboard_name": "1up60hte",
+    "manufacturer": "1upkeyboards",
+    "url": "https://www.1upkeyboards.com/shop/controllers/1up-rgb-60-pcb-hte/",
+    "maintainer": "1upkeyboards",
+    "usb": {
+        "vid": "0x6F75",
+        "pid": "0x6874",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"],
+        "rows": ["B3", "B2", "B1", "B0", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "backlight": {
+        "pin": "B7"
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "on_state": 0
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 14,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "F0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
+    },
+    "community_layouts": ["60_hhkb", "60_tsangan_hhkb"],
+    "layouts": {
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [4, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [4, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4}
+            ]
+        }
+    }
+}

keyboards/1upkeyboards/1up60hte/rules.mk

@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LTO_ENABLE = yes

keyboards/1upkeyboards/1upocarina/info.json

@@ -1,137 +0,0 @@
-{
-    "manufacturer": "1upkeyboards",
-    "keyboard_name": "1upocarina",
-    "maintainer": "ziptyze",
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "board": "GENERIC_RP_RP2040",
-    "usb": {
-        "device_version": "1.0.0",
-        "pid": "0x5607",
-        "vid": "0x6F75"
-    },
-    "dynamic_keymap": {
-        "layer_count": 10
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": false,
-        "rgb_matrix": true
-    },
-    "encoder": {
-        "enabled": true,
-        "rotary": [
-            {
-                "pin_a": "GP25", "pin_b": "GP26"
-            }
-        ]
-    },
-    "matrix_pins": {
-        "direct": [
-            ["GP28", "GP29", "GP27", "GP1", "GP2"]
-        ]
-    },
-    "ws2812": {
-        "driver": "vendor",
-        "pin": "GP24"
-    },
-    "rgb_matrix": {
-        "animations": {
-            "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,
-            "typing_heatmap": 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": [
-        { "flags": 4, "matrix": [0, 0], "x": 23, "y": 26 },
-        { "flags": 4, "matrix": [0, 1], "x": 62, "y": 26 },
-        { "flags": 4, "matrix": [0, 2], "x": 112, "y": 34 },
-        { "flags": 4, "matrix": [0, 3], "x": 161, "y": 26 },
-        { "flags": 4, "matrix": [0, 4], "x": 200, "y": 26 },
-
-        { "flags": 2, "x": 133, "y": 3 },
-        { "flags": 2, "x": 154, "y": 3 },
-        { "flags": 2, "x": 174, "y": 3 },
-        { "flags": 2, "x": 194, "y": 3 },
-        { "flags": 2, "x": 218, "y": 5 },
-
-        { "flags": 2, "x": 221, "y": 19 },
-        { "flags": 2, "x": 221, "y": 31 },
-        { "flags": 2, "x": 221, "y": 44 },
-        { "flags": 2, "x": 217, "y": 58 },
-        { "flags": 2, "x": 195, "y": 61 },
-
-        { "flags": 2, "x": 174, "y": 61 },
-        { "flags": 2, "x": 154, "y": 61 },
-        { "flags": 2, "x": 133, "y": 61 },
-        { "flags": 2, "x": 112, "y": 61 },
-        { "flags": 2, "x": 91, "y": 61 },
-
-        { "flags": 2, "x": 70, "y": 61 },
-        { "flags": 2, "x": 49, "y": 61 },
-        { "flags": 2, "x": 28, "y": 61 },
-        { "flags": 2, "x": 5, "y": 58 },
-        { "flags": 2, "x": 2, "y": 44 },
-
-        { "flags": 2, "x": 2, "y": 31 },
-        { "flags": 2, "x": 2, "y": 19 },
-        { "flags": 2, "x": 5, "y": 5 },
-        { "flags": 2, "x": 28, "y": 3 },
-        { "flags": 2, "x": 49, "y": 3 },
-
-        { "flags": 2, "x": 70, "y": 3 },
-        { "flags": 2, "x": 91, "y": 3 }
-        ],
-        "sleep": true
-    },
-    "layouts": {
-        "LAYOUT_1x5": {
-            "layout": [
-                { "label": "z", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "x", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "esc", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "c", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "v", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }
-            ]
-        }
-    }
-}

keyboards/1upkeyboards/1upocarina/keyboard.json

@@ -0,0 +1,137 @@
+{
+    "manufacturer": "1upkeyboards",
+    "keyboard_name": "1upocarina",
+    "maintainer": "ziptyze",
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x5607",
+        "vid": "0x6F75"
+    },
+    "dynamic_keymap": {
+        "layer_count": 10
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false,
+        "rgb_matrix": true
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {
+                "pin_a": "GP25", "pin_b": "GP26"
+            }
+        ]
+    },
+    "matrix_pins": {
+        "direct": [
+            ["GP28", "GP29", "GP27", "GP1", "GP2"]
+        ]
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP24"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "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,
+            "typing_heatmap": 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": [
+        { "flags": 4, "matrix": [0, 0], "x": 23, "y": 26 },
+        { "flags": 4, "matrix": [0, 1], "x": 62, "y": 26 },
+        { "flags": 4, "matrix": [0, 2], "x": 112, "y": 34 },
+        { "flags": 4, "matrix": [0, 3], "x": 161, "y": 26 },
+        { "flags": 4, "matrix": [0, 4], "x": 200, "y": 26 },
+
+        { "flags": 2, "x": 133, "y": 3 },
+        { "flags": 2, "x": 154, "y": 3 },
+        { "flags": 2, "x": 174, "y": 3 },
+        { "flags": 2, "x": 194, "y": 3 },
+        { "flags": 2, "x": 218, "y": 5 },
+
+        { "flags": 2, "x": 221, "y": 19 },
+        { "flags": 2, "x": 221, "y": 31 },
+        { "flags": 2, "x": 221, "y": 44 },
+        { "flags": 2, "x": 217, "y": 58 },
+        { "flags": 2, "x": 195, "y": 61 },
+
+        { "flags": 2, "x": 174, "y": 61 },
+        { "flags": 2, "x": 154, "y": 61 },
+        { "flags": 2, "x": 133, "y": 61 },
+        { "flags": 2, "x": 112, "y": 61 },
+        { "flags": 2, "x": 91, "y": 61 },
+
+        { "flags": 2, "x": 70, "y": 61 },
+        { "flags": 2, "x": 49, "y": 61 },
+        { "flags": 2, "x": 28, "y": 61 },
+        { "flags": 2, "x": 5, "y": 58 },
+        { "flags": 2, "x": 2, "y": 44 },
+
+        { "flags": 2, "x": 2, "y": 31 },
+        { "flags": 2, "x": 2, "y": 19 },
+        { "flags": 2, "x": 5, "y": 5 },
+        { "flags": 2, "x": 28, "y": 3 },
+        { "flags": 2, "x": 49, "y": 3 },
+
+        { "flags": 2, "x": 70, "y": 3 },
+        { "flags": 2, "x": 91, "y": 3 }
+        ],
+        "sleep": true
+    },
+    "layouts": {
+        "LAYOUT_1x5": {
+            "layout": [
+                { "label": "z", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "x", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "esc", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "c", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "v", "matrix": [0, 4], "x": 4, "y": 0 }
+            ]
+        }
+    }
+}

keyboards/1upkeyboards/1upocarina/rules.mk

@@ -1 +0,0 @@
-# This file intentionally left blank

keyboards/1upkeyboards/sweet16/info.json

@@ -3,6 +3,14 @@
   "manufacturer": "1up Keyboards",
   "url": "",
   "maintainer": "skullydazed",
+  "features": {
+    "bootmagic": false,
+    "command": false,
+    "console": false,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
   "usb": {
     "vid": "0x6F75"
   },

keyboards/1upkeyboards/sweet16/rules.mk

@@ -1,11 +1 @@
-# Build Options
-#
 DEFAULT_FOLDER = 1upkeyboards/sweet16/v1
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes  # Mouse keys
-EXTRAKEY_ENABLE = yes  # Audio control and System control
-CONSOLE_ENABLE = no    # Console for debug
-COMMAND_ENABLE = no    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no

keyboards/40percentclub/i75/info.json

@@ -3,6 +3,14 @@
   "manufacturer": "di0ib",
   "url": "",
   "maintainer": "qmk",
+  "features": {
+    "bootmagic": true,
+    "command": true,
+    "console": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": false
+  },
   "usb": {
     "vid": "0x4025",
     "pid": "0x0A0C",

keyboards/40percentclub/i75/rules.mk

@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = 40percentclub/i75/promicro

keyboards/40percentclub/polyandry/info.json

@@ -3,6 +3,14 @@
     "manufacturer": "di0ib",
     "url": "",
     "maintainer": "QMK",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": false
+    },
     "usb": {
         "vid": "0x4025",
         "pid": "0x6060",

keyboards/40percentclub/polyandry/rules.mk

@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
 DEFAULT_FOLDER = 40percentclub/polyandry/promicro

keyboards/8pack/info.json

@@ -32,6 +32,16 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "features": {
+    "backlight": true,
+    "bootmagic": false,
+    "command": true,
+    "console": true,
+    "extrakey": false,
+    "mousekey": false,
+    "nkro": false,
+    "rgblight": true
+  },
   "matrix_pins": {
     "direct": [
       ["F4", "F5", "F6", "F7"],

keyboards/8pack/rules.mk

@@ -1,15 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE  = no  # Mouse keys
-EXTRAKEY_ENABLE  = no  # Audio control and System control
-CONSOLE_ENABLE   = yes # Console for debug
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE     = no
-RGBLIGHT_ENABLE  = yes
-OLED_ENABLE = no
-
 DEFAULT_FOLDER = 8pack/rev12

keyboards/a_dux/rules.mk

@@ -1 +0,0 @@
-# This file intentionally left blank

keyboards/abacus/info.json

@@ -1,97 +0,0 @@
-{
-    "keyboard_name": "Abacus",
-    "manufacturer": "nickolaij",
-    "url": "https://www.github.com/nickolaij",
-    "maintainer": "nickolaij",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"],
-        "rows": ["D3", "D2", "D4", "C6"]
-    },
-    "diode_direction": "COL2ROW",
-    "dip_switch": {
-        "pins": ["D0"]
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F1", "pin_b": "F0"}
-        ]
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 17,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "static_gradient": true
-        }
-    },
-    "ws2812": {
-        "pin": "D1"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 10], "x": 10.25, "y": 1},
-                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 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": [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, "w": 2.75},
-                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
-                {"matrix": [3, 8], "x": 8.75, "y": 3},
-                {"matrix": [3, 9], "x": 9.75, "y": 3},
-                {"matrix": [3, 10], "x": 10.75, "y": 3},
-                {"matrix": [3, 11], "x": 11.75, "y": 3}
-            ]
-        }
-    }
-}

keyboards/abacus/keyboard.json

@@ -0,0 +1,111 @@
+{
+    "keyboard_name": "Abacus",
+    "manufacturer": "nickolaij",
+    "url": "https://www.github.com/nickolaij",
+    "maintainer": "nickolaij",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "command": true,
+        "console": true,
+        "dip_switch": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"],
+        "rows": ["D3", "D2", "D4", "C6"]
+    },
+    "diode_direction": "COL2ROW",
+    "dip_switch": {
+        "pins": ["D0"]
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F1", "pin_b": "F0"}
+        ]
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 17,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "static_gradient": true
+        }
+    },
+    "ws2812": {
+        "pin": "D1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 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": [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, "w": 2.75},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
+        }
+    }
+}

keyboards/abacus/rules.mk

@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-DIP_SWITCH_ENABLE = yes
-LTO_ENABLE = yes

keyboards/abatskeyboardclub/nayeon/rules.mk

@@ -1 +0,0 @@
-# This file intentionally left blank

keyboards/abko/ak84bt/rules.mk

@@ -1 +0,0 @@
-# This file intentionally left blank

keyboards/acheron/athena/alpha/rules.mk

@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes          # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
-LTO_ENABLE = yes
-ENCODER_ENABLE = no
-

keyboards/acheron/athena/beta/rules.mk

@@ -1,15 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = yes      # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes          # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
-AUDIO_ENABLE = no          # Audio output
-LTO_ENABLE = yes
-ENCODER_ENABLE = no
-

keyboards/acheron/elongate/beta/info.json

@@ -1,112 +0,0 @@
-{
-    "keyboard_name": "Elongate",
-    "manufacturer": "Acheron Project",
-    "url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html",
-    "maintainer": "Gondolindrim",
-    "usb": {
-        "vid": "0x4150",
-        "pid": "0x454C",
-        "device_version": "0.0.1"
-    },
-    "rgblight": {
-        "saturation_steps": 8,
-        "brightness_steps": 8,
-        "led_count": 16,
-        "sleep": true,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "D7"
-    },
-    "matrix_pins": {
-        "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"],
-        "rows": ["D3", "B7", "D5", "B5", "D6"]
-    },
-    "diode_direction": "COL2ROW",
-    "indicators": {
-        "caps_lock": "D1",
-        "num_lock": "D2",
-        "scroll_lock": "D0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [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.5, "y": 0},
-                {"matrix": [4, 9], "x": 13.5, "y": 0},
-                {"matrix": [4, 1], "x": 14.5, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1},
-                {"matrix": [1, 2], "x": 2.25, "y": 1},
-                {"matrix": [1, 3], "x": 3.25, "y": 1},
-                {"matrix": [1, 4], "x": 4.25, "y": 1},
-                {"matrix": [1, 5], "x": 5.25, "y": 1},
-                {"matrix": [1, 6], "x": 6.25, "y": 1},
-                {"matrix": [1, 7], "x": 7.25, "y": 1},
-                {"matrix": [1, 8], "x": 8.25, "y": 1},
-                {"matrix": [1, 9], "x": 9.25, "y": 1},
-                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
-
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [4, 10], "x": 13.5, "y": 1},
-                {"matrix": [4, 2], "x": 14.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
-                {"matrix": [2, 11], "x": 11.25, "y": 2.25},
-
-                {"matrix": [2, 12], "x": 12.5, "y": 2},
-                {"matrix": [4, 11], "x": 13.5, "y": 2},
-                {"matrix": [4, 4], "x": 14.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, "w": 1.25},
-                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
-                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-
-                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 12], "x": 12.25, "y": 3.25},
-
-                {"matrix": [4, 12], "x": 13.5, "y": 3},
-                {"matrix": [4, 7], "x": 14.5, "y": 3}
-            ]
-        }
-    }
-}

keyboards/acheron/elongate/beta/keyboard.json

@@ -0,0 +1,124 @@
+{
+    "keyboard_name": "Elongate",
+    "manufacturer": "Acheron Project",
+    "url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html",
+    "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x4150",
+        "pid": "0x454C",
+        "device_version": "0.0.1"
+    },
+    "rgblight": {
+        "saturation_steps": 8,
+        "brightness_steps": 8,
+        "led_count": 16,
+        "sleep": true,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "D7"
+    },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": false,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"],
+        "rows": ["D3", "B7", "D5", "B5", "D6"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "D1",
+        "num_lock": "D2",
+        "scroll_lock": "D0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [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.5, "y": 0},
+                {"matrix": [4, 9], "x": 13.5, "y": 0},
+                {"matrix": [4, 1], "x": 14.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [4, 10], "x": 13.5, "y": 1},
+                {"matrix": [4, 2], "x": 14.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 11], "x": 11.25, "y": 2.25},
+
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [4, 11], "x": 13.5, "y": 2},
+                {"matrix": [4, 4], "x": 14.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, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.25},
+
+                {"matrix": [4, 12], "x": 13.5, "y": 3},
+                {"matrix": [4, 7], "x": 14.5, "y": 3}
+            ]
+        }
+    }
+}

keyboards/acheron/elongate/beta/rules.mk

@@ -1,13 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LTO_ENABLE = yes

keyboards/acheron/shark/beta/info.json

@@ -1,103 +0,0 @@
-{
-    "keyboard_name": "SharkPCB rev. Beta",
-    "usb": {
-        "pid": "0x5369",
-        "device_version": "0.0.2"
-    },
-    "matrix_pins": {
-        "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"],
-        "rows": ["A8", "B14", "A4", "A3"]
-    },
-    "diode_direction": "COL2ROW",
-    "eeprom": {
-        "driver": "i2c"
-    },
-    "encoder": {
-        "rotary": [
-            {"pin_a": "C15", "pin_b": "C14"}
-        ]
-    },
-    "rgblight": {
-        "led_count": 24,
-        "animations": {
-            "breathing": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "snake": true,
-            "knight": true,
-            "christmas": true,
-            "static_gradient": true,
-            "rgb_test": true,
-            "alternating": true,
-            "twinkle": true
-        }
-    },
-    "ws2812": {
-        "pin": "B15"
-    },
-    "backlight": {
-        "pin": "A6",
-        "levels": 20,
-        "breathing": true
-    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "community_layouts": ["ortho_4x12"],
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1},
-                {"matrix": [1, 1], "x": 1, "y": 1},
-                {"matrix": [1, 2], "x": 2, "y": 1},
-                {"matrix": [1, 3], "x": 3, "y": 1},
-                {"matrix": [1, 4], "x": 4, "y": 1},
-                {"matrix": [1, 5], "x": 5, "y": 1},
-                {"matrix": [1, 6], "x": 6, "y": 1},
-                {"matrix": [1, 7], "x": 7, "y": 1},
-                {"matrix": [1, 8], "x": 8, "y": 1},
-                {"matrix": [1, 9], "x": 9, "y": 1},
-                {"matrix": [1, 10], "x": 10, "y": 1},
-                {"matrix": [1, 11], "x": 11, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2},
-                {"matrix": [2, 1], "x": 1, "y": 2},
-                {"matrix": [2, 2], "x": 2, "y": 2},
-                {"matrix": [2, 3], "x": 3, "y": 2},
-                {"matrix": [2, 4], "x": 4, "y": 2},
-                {"matrix": [2, 5], "x": 5, "y": 2},
-                {"matrix": [2, 6], "x": 6, "y": 2},
-                {"matrix": [2, 7], "x": 7, "y": 2},
-                {"matrix": [2, 8], "x": 8, "y": 2},
-                {"matrix": [2, 9], "x": 9, "y": 2},
-                {"matrix": [2, 10], "x": 10, "y": 2},
-                {"matrix": [2, 11], "x": 11, "y": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3}
-            ]
-        }
-    }
-}

keyboards/acheron/shark/beta/keyboard.json

@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "SharkPCB rev. Beta",
+    "usb": {
+        "pid": "0x5369",
+        "device_version": "0.0.2"
+    },
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": true,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"],
+        "rows": ["A8", "B14", "A4", "A3"]
+    },
+    "diode_direction": "COL2ROW",
+    "eeprom": {
+        "driver": "i2c"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C15", "pin_b": "C14"}
+        ]
+    },
+    "rgblight": {
+        "led_count": 24,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "ws2812": {
+        "pin": "B15"
+    },
+    "backlight": {
+        "pin": "A6",
+        "levels": 20,
+        "breathing": true
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "community_layouts": ["ortho_4x12"],
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
+            ]
+        }
+    }
+}