diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index c0417b88396..b61ca040714 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -164,7 +164,6 @@ "RGBLIGHT_DEFAULT_SAT": {"info_key": "rgblight.default.sat", "value_type": "int"}, "RGBLIGHT_DEFAULT_VAL": {"info_key": "rgblight.default.val", "value_type": "int"}, "RGBLIGHT_DEFAULT_SPD": {"info_key": "rgblight.default.speed", "value_type": "int"}, - "RGBW": {"info_key": "rgblight.rgbw", "value_type": "flag"}, // Secure "SECURE_IDLE_TIMEOUT": {"info_key": "secure.idle_timeout", "value_type": "int"}, @@ -215,6 +214,7 @@ "WS2812_DI_PIN": {"info_key": "ws2812.pin"}, "WS2812_I2C_ADDRESS": {"info_key": "ws2812.i2c_address", "value_type": "hex"}, "WS2812_I2C_TIMEOUT": {"info_key": "ws2812.i2c_timeout", "value_type": "int"}, + "WS2812_RGBW": {"info_key": "ws2812.rgbw", "value_type": "flag"}, "LAYOUTS": {"info_key": "layout_aliases", "value_type": "mapping"}, @@ -229,6 +229,7 @@ "PREVENT_STUCK_MODIFIERS": {"info_key": "_invalid.prevent_stuck_mods", "invalid": true}, "QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true}, "RGB_DI_PIN": {"info_key": "rgblight.pin", "invalid": true, "replace_with": "WS2812_DI_PIN or APA102_DI_PIN"}, + "RGBW": {"info_key": "rgblight.rgbw", "invalid": true, "replace_with": "WS2812_RGBW"}, "RGB_DISABLE_WHEN_USB_SUSPENDED": {"info_key": "_invalid.rgb_matrix_sleep", "invalid": true, "replace_with": "RGB_MATRIX_SLEEP"}, "RGBLIGHT_ANIMATIONS": {"info_key": "_invalid.rgblight.animations.all", "value_type": "flag", "invalid": true}, "TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "flag", "deprecated": true}, diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson index 5d08be2fc1a..97611bcf587 100644 --- a/data/mappings/info_rules.hjson +++ b/data/mappings/info_rules.hjson @@ -11,6 +11,7 @@ // invalid: Default `false`. Set to `true` to generate errors when a value exists // replace_with: use with a key marked deprecated or invalid to designate a replacement + "AUDIO_DRIVER": {"info_key": "audio.driver"}, "BACKLIGHT_DRIVER": {"info_key": "backlight.driver"}, "BLUETOOTH_DRIVER": {"info_key": "bluetooth.driver"}, "BOARD": {"info_key": "board"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 24f7fec9ab3..de01809b43d 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -133,6 +133,10 @@ "clicky": {"type": "boolean"} } }, + "driver": { + "type": "string", + "enum": ["dac_additive", "dac_basic", "pwm_software", "pwm_hardware"] + }, "macro_beep": {"type": "boolean"}, "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}, "power_control": { @@ -657,7 +661,10 @@ "$ref": "qmk.definitions.v1#/mcu_pin", "$comment": "Deprecated: use ws2812.pin instead" }, - "rgbw": {"type": "boolean"}, + "rgbw": { + "type": "boolean", + "$comment": "Deprecated: use ws2812.rgbw instead" + }, "saturation_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "sleep": {"type": "boolean"}, "split": {"type": "boolean"}, @@ -933,6 +940,7 @@ "enum": ["bitbang", "custom", "i2c", "pwm", "spi", "vendor"] }, "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}, + "rgbw": {"type": "boolean"}, "i2c_address": {"$ref": "qmk.definitions.v1#/hex_number_2d"}, "i2c_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"} } diff --git a/docs/config_options.md b/docs/config_options.md index fca80e54fde..046429a5875 100644 --- a/docs/config_options.md +++ b/docs/config_options.md @@ -237,7 +237,7 @@ If you define these options you will enable the associated feature, which may in * units to step when in/decreasing saturation * `#define RGBLIGHT_VAL_STEP 12` * units to step when in/decreasing value (brightness) -* `#define RGBW` +* `#define WS2812_RGBW` * Enables RGBW LED support ## Mouse Key Options diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md index a6a89d1d00c..ae37ceca92f 100644 --- a/docs/feature_rgblight.md +++ b/docs/feature_rgblight.md @@ -6,7 +6,7 @@ QMK has the ability to control RGB LEDs attached to your keyboard. This is commo Some keyboards come with RGB LEDs preinstalled. Others must have them installed after the fact. See the [Hardware Modification](#hardware-modification) section for information on adding RGB lighting to your keyboard. -Currently QMK supports the following addressable LEDs (however, the white LED in RGBW variants is not supported): +Currently QMK supports the following addressable LEDs: * WS2811, WS2812, WS2812B, WS2812C, etc. * SK6812, SK6812MINI, SK6805 diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md index 6f0b84c414b..5b06e9a3268 100644 --- a/docs/reference_info_json.md +++ b/docs/reference_info_json.md @@ -118,6 +118,8 @@ Configures the [Audio](feature_audio.md) feature. * `clicky` * The default audio clicky enabled state. * Default: `true` + * `driver` + * The driver to use. Must be one of `dac_additive`, `dac_basic`, `pwm_software`, `pwm_hardware`. * `macro_beep` * Play a short beep for `\a` (ASCII `BEL`) characters in Send String macros. * Default: `false` @@ -586,9 +588,6 @@ Configures the [RGB Lighting](feature_rgblight.md) feature. * `max_brightness` * The maximum value which the HSV "V" component is scaled to, from 0 to 255. * Default: `255` - * `rgbw` - * Enable RGBW LEDs. - * Default: `false` * `saturation_steps` * The number of saturation adjustment steps. * Default: `17` @@ -853,3 +852,6 @@ Configures the [WS2812](ws2812_driver.md) driver. * `i2c_timeout` * The I²C timeout in milliseconds (`i2c` driver only). * Default: `100` (100 ms) + * `rgbw` + * Enable RGBW LEDs. + * Default: `false` diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md index 006529cc8ae..8851c042f04 100644 --- a/docs/ws2812_driver.md +++ b/docs/ws2812_driver.md @@ -33,6 +33,7 @@ Add the following to your `config.h`: |`WS2812_T0H` |`350` |The length of a "0" bit's high phase in nanoseconds | |`WS2812_TRST_US` |`280` |The length of the reset phase in microseconds | |`WS2812_BYTE_ORDER`|`WS2812_BYTE_ORDER_GRB`|The byte order of the RGB data | +|`WS2812_RGBW` |*Not defined* |Enables RGBW support (except `i2c` driver) | ### Timing Adjustment :id=timing-adjustment @@ -58,6 +59,27 @@ Where the byte order may be one of: |`RGB` |WS2812B-2020 | |`BGR` |TM1812 | +### RGBW Support :id=rgbw-support + +Rendering the color white with RGB LEDs is typically inconsistent due to inherent variations between each individual LED die. However, some WS2812 variants (such as SK6812RGBW) also possess a white LED along with the red, green, and blue channels, which allows for a more accurate white to be displayed. + +QMK can automatically convert the RGB data to be sent to the LEDs to mix in the white channel: + +``` +w = min(r, g, b) +r -= w +g -= w +b -= w +``` + +Thus, an RGB triplet of `255,255,255` will simply turn on the white LED fully (`0,0,0,255`). + +To enable RGBW conversion, add the following to your `config.h`: + +```c +#define WS2812_RGBW +``` + ## Driver Configuration :id=driver-configuration Driver selection can be configured in `rules.mk` as `WS2812_DRIVER`, or in `info.json` as `ws2812.driver`. Valid values are `bitbang` (default), `i2c`, `spi`, `pwm`, `vendor`, or `custom`. See below for information on individual drivers. diff --git a/keyboards/adafruit/macropad/keyboard.json b/keyboards/adafruit/macropad/keyboard.json index 86601c0167f..94f2673f98f 100644 --- a/keyboards/adafruit/macropad/keyboard.json +++ b/keyboards/adafruit/macropad/keyboard.json @@ -19,6 +19,7 @@ "oled": true }, "audio": { + "driver": "pwm_hardware", "power_control": { "pin": "GP14" } diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk index 1630b74ceae..d7ca5b3b90f 100644 --- a/keyboards/adafruit/macropad/rules.mk +++ b/keyboards/adafruit/macropad/rules.mk @@ -1,2 +1 @@ -AUDIO_DRIVER = pwm_hardware OLED_TRANSPORT = spi diff --git a/keyboards/arrowmechanics/wings/keyboard.json b/keyboards/arrowmechanics/wings/keyboard.json index fca38314c9b..0f1e6696f75 100644 --- a/keyboards/arrowmechanics/wings/keyboard.json +++ b/keyboards/arrowmechanics/wings/keyboard.json @@ -17,6 +17,9 @@ "mousekey": true, "rgb_matrix": true }, + "audio": { + "driver": "pwm_hardware" + }, "matrix_pins": { "cols": ["GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16"], "rows": ["GP22", "GP21", "GP20", "GP19", "GP18", "GP17"] diff --git a/keyboards/arrowmechanics/wings/rules.mk b/keyboards/arrowmechanics/wings/rules.mk index 22ce54190c8..161ec22b16e 100644 --- a/keyboards/arrowmechanics/wings/rules.mk +++ b/keyboards/arrowmechanics/wings/rules.mk @@ -1,2 +1 @@ SERIAL_DRIVER = vendor -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json b/keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json similarity index 67% rename from keyboards/bastardkb/charybdis/3x5/blackpill/info.json rename to keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json index 1af57cca9a4..bcc57981b51 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/keyboard.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis Nano (3x5) Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index d6eda5c2d10..c8d355efb78 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk @@ -1,22 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes - SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json similarity index 76% rename from keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json rename to keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json index 05be6acde22..4a94d023d46 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json @@ -3,6 +3,16 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk index 7f2338227af..17dae28bd1c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk @@ -1,23 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json similarity index 70% rename from keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json rename to keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json index 61d953ec8f6..bc95061ced9 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json @@ -3,6 +3,16 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk index 7f2338227af..17dae28bd1c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk @@ -1,23 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json similarity index 76% rename from keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json rename to keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json index f7dd9d2c7e2..cc990d3f210 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk @@ -1,20 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json similarity index 76% rename from keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json rename to keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json index 33fda9c2a47..6719b211968 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk @@ -1,20 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json similarity index 66% rename from keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json rename to keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json index cf9cf2eb62d..2de77b07f0c 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis Nano (3x5) STeMCell", "usb": { - "device_version": "2.0.0" + "device_version": "2.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "rgb_matrix": { "driver": "ws2812" diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index d6eda5c2d10..4373b9c33d2 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk @@ -1,22 +1,6 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json b/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json similarity index 67% rename from keyboards/bastardkb/charybdis/3x6/blackpill/info.json rename to keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json index 51f9c5dbea5..ecefbbeb999 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/keyboard.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis Mini (3x6) Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk index d6eda5c2d10..4373b9c33d2 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk @@ -1,22 +1,6 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json similarity index 76% rename from keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json rename to keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json index 8bc6a86eaf1..dcc454366c6 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json @@ -3,6 +3,16 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk index 7f2338227af..17dae28bd1c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk @@ -1,23 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json similarity index 70% rename from keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json rename to keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json index 13283d5b8fa..ce74b2dc6df 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json @@ -3,6 +3,16 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk index 7f2338227af..17dae28bd1c 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk @@ -1,23 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json similarity index 76% rename from keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json rename to keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json index 8dcc8187abb..825508475c9 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk @@ -1,20 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json similarity index 76% rename from keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json rename to keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json index 288e08b9ee9..4d9cfb616d8 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk @@ -1,20 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json similarity index 66% rename from keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json rename to keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json index c09c9c90ca0..05d82b2445b 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis Mini (3x6) STeMCell", "usb": { - "device_version": "2.0.0" + "device_version": "2.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "rgb_matrix": { "driver": "ws2812" diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index d6eda5c2d10..4373b9c33d2 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk @@ -1,22 +1,6 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json b/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json similarity index 67% rename from keyboards/bastardkb/charybdis/4x6/blackpill/info.json rename to keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json index 86df4839fc9..b55dc29445b 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/keyboard.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis (4x6) Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk index 9e797122a74..3caafdef92b 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk @@ -1,22 +1,6 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json similarity index 77% rename from keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json rename to keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json index 3419eaea8b7..b90b144c8b8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json @@ -3,6 +3,16 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk index 808675da02b..0e4d15d5bc8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk @@ -1,23 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json similarity index 70% rename from keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json rename to keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json index bb892c4e6ec..8ae66d083b4 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json @@ -3,6 +3,16 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk index 808675da02b..0e4d15d5bc8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk @@ -1,23 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint - -# Enable link-time optimization by default. The Charybdis packs a lot of -# features (RGB, Via, trackball) in a small atmega32u4 package. -LTO_ENABLE = yes diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json similarity index 76% rename from keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json rename to keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json index 48a2eb51584..b0c98389f7f 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk @@ -1,20 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json similarity index 76% rename from keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json rename to keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json index 72aa8b59c6e..1e072db85b0 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json @@ -3,6 +3,13 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk index 8753565dfbc..db29cb6789b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk @@ -1,20 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json similarity index 67% rename from keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json rename to keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json index d49755a861a..ab145e0f95c 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json @@ -1,7 +1,17 @@ { "keyboard_name": "Charybdis (4x6) STeMCell", "usb": { - "device_version": "2.0.0" + "device_version": "2.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "pointing_device": true }, "rgb_matrix": { "driver": "ws2812" diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index d6eda5c2d10..4373b9c33d2 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -1,22 +1,6 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -POINTING_DEVICE_ENABLE = yes # Enable trackball POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json similarity index 72% rename from keyboards/bastardkb/dilemma/3x5_2/assembled/info.json rename to keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json index 2190d542c2c..ac52a86eb51 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json @@ -1,5 +1,11 @@ { "keyboard_name": "Dilemma (3x5+2) Assembled", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "pointing_device": true + }, "matrix_pins": { "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"], "rows": ["GP4", "GP5", "GP28", "GP26"] diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk index b54403222b4..48216ee8b71 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk @@ -1,22 +1,7 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 - AUDIO_SUPPORTED = no # Audio is not supported RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI. diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json similarity index 71% rename from keyboards/bastardkb/dilemma/3x5_2/splinky/info.json rename to keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json index 9e07843788f..3c4c559cb6e 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json @@ -1,5 +1,11 @@ { "keyboard_name": "Dilemma (3x5+2) Splinky", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "pointing_device": true + }, "matrix_pins": { "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"], "rows": ["GP4", "GP5", "GP28", "GP26"] diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk index 0de2c9a8071..942028da2c0 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk @@ -1,22 +1,7 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 - AUDIO_SUPPORTED = no # Audio is not supported RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C. diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/keyboard.json similarity index 99% rename from keyboards/bastardkb/dilemma/3x5_3/info.json rename to keyboards/bastardkb/dilemma/3x5_3/keyboard.json index 2da4f1785e2..12e336f023b 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/keyboard.json @@ -38,6 +38,7 @@ "mousekey": true, "nkro": true, "rgb_matrix": true, + "pointing_device": true, "caps_word": true, "tri_layer": true }, diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk index 4923c2c84a5..60776009483 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk @@ -1,4 +1,3 @@ SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/keyboard.json similarity index 99% rename from keyboards/bastardkb/dilemma/4x6_4/info.json rename to keyboards/bastardkb/dilemma/4x6_4/keyboard.json index cc8c30b5105..7e40208a5db 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/info.json +++ b/keyboards/bastardkb/dilemma/4x6_4/keyboard.json @@ -38,6 +38,7 @@ "mousekey": true, "nkro": true, "rgb_matrix": true, + "pointing_device": true, "caps_word": true, "tri_layer": true }, diff --git a/keyboards/bastardkb/dilemma/4x6_4/rules.mk b/keyboards/bastardkb/dilemma/4x6_4/rules.mk index 4923c2c84a5..60776009483 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/rules.mk +++ b/keyboards/bastardkb/dilemma/4x6_4/rules.mk @@ -1,4 +1,3 @@ SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi diff --git a/keyboards/bastardkb/scylla/blackpill/info.json b/keyboards/bastardkb/scylla/blackpill/keyboard.json similarity index 70% rename from keyboards/bastardkb/scylla/blackpill/info.json rename to keyboards/bastardkb/scylla/blackpill/keyboard.json index 167c979f4b9..5294976fd34 100644 --- a/keyboards/bastardkb/scylla/blackpill/info.json +++ b/keyboards/bastardkb/scylla/blackpill/keyboard.json @@ -1,7 +1,16 @@ { "keyboard_name": "Scylla Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk index 0875a191c5d..48c904dd644 100644 --- a/keyboards/bastardkb/scylla/blackpill/rules.mk +++ b/keyboards/bastardkb/scylla/blackpill/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/scylla/v1/elitec/info.json b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json similarity index 79% rename from keyboards/bastardkb/scylla/v1/elitec/info.json rename to keyboards/bastardkb/scylla/v1/elitec/keyboard.json index 4b7e5092199..17b6b7fc367 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/info.json +++ b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/scylla/v2/elitec/info.json b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json similarity index 79% rename from keyboards/bastardkb/scylla/v2/elitec/info.json rename to keyboards/bastardkb/scylla/v2/elitec/keyboard.json index a7c68fb628a..7bfb7ff5a4e 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/info.json +++ b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/info.json b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json similarity index 80% rename from keyboards/bastardkb/scylla/v2/splinky_2/info.json rename to keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json index 83cfd06ca79..2b9022d24ef 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/info.json b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json similarity index 80% rename from keyboards/bastardkb/scylla/v2/splinky_3/info.json rename to keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json index 14386303dc5..cd4da3ac415 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/info.json +++ b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/stemcell/info.json b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json similarity index 81% rename from keyboards/bastardkb/scylla/v2/stemcell/info.json rename to keyboards/bastardkb/scylla/v2/stemcell/keyboard.json index d6bea6463ac..06bfeda7d28 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/info.json +++ b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk index 3834385af03..3fe3e4ffbea 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/skeletyl/blackpill/info.json b/keyboards/bastardkb/skeletyl/blackpill/keyboard.json similarity index 69% rename from keyboards/bastardkb/skeletyl/blackpill/info.json rename to keyboards/bastardkb/skeletyl/blackpill/keyboard.json index c0e5d4e2c85..16fa2b24121 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/info.json +++ b/keyboards/bastardkb/skeletyl/blackpill/keyboard.json @@ -1,7 +1,16 @@ { "keyboard_name": "Skeletyl Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk index 0875a191c5d..48c904dd644 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk +++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/info.json b/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json similarity index 78% rename from keyboards/bastardkb/skeletyl/v1/elitec/info.json rename to keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json index cc5d2adfadd..2910d80b2f5 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/info.json b/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json similarity index 78% rename from keyboards/bastardkb/skeletyl/v2/elitec/info.json rename to keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json index 4f245663bce..dec2537b65c 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/info.json +++ b/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json similarity index 79% rename from keyboards/bastardkb/skeletyl/v2/splinky_2/info.json rename to keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json index fa15c27148e..897f195a315 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json similarity index 79% rename from keyboards/bastardkb/skeletyl/v2/splinky_3/info.json rename to keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json index b34581757ba..06a93dfbeb7 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/info.json +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json b/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json similarity index 80% rename from keyboards/bastardkb/skeletyl/v2/stemcell/info.json rename to keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json index d7b1fc5cdb4..6dd86bcc126 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/info.json +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk index 3834385af03..3fe3e4ffbea 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/keyboard.json similarity index 70% rename from keyboards/bastardkb/tbkmini/blackpill/info.json rename to keyboards/bastardkb/tbkmini/blackpill/keyboard.json index 62301b1f2bc..61d0e741fef 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/keyboard.json @@ -1,7 +1,16 @@ { "keyboard_name": "TBK Mini Blackpill", "usb": { - "device_version": "1.0.0" + "device_version": "1.0.0", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true }, "eeprom": { "driver": "spi" diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk index 0875a191c5d..48c904dd644 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -1,20 +1,5 @@ -# 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 - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint -KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json similarity index 79% rename from keyboards/bastardkb/tbkmini/v1/elitec/info.json rename to keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json index 54433f39bf3..59988074baa 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D2" }, diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json similarity index 79% rename from keyboards/bastardkb/tbkmini/v2/elitec/info.json rename to keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json index 57c7399c01d..01679bcff9f 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk index a8a3e3d5873..1868c4bb027 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json similarity index 80% rename from keyboards/bastardkb/tbkmini/v2/splinky_2/info.json rename to keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json index 2f64d2b51bf..2048db62515 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json similarity index 80% rename from keyboards/bastardkb/tbkmini/v2/splinky_3/info.json rename to keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json index b67bc1d744c..8dd21b75910 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk index d5f1d335c89..077573eb763 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json similarity index 81% rename from keyboards/bastardkb/tbkmini/v2/stemcell/info.json rename to keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json index d08c89ec574..41abba96cb9 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index 3834385af03..3fe3e4ffbea 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/boardsource/equals/48/keyboard.json b/keyboards/boardsource/equals/48/keyboard.json index 5b633559313..13bc0d80ab7 100644 --- a/keyboards/boardsource/equals/48/keyboard.json +++ b/keyboards/boardsource/equals/48/keyboard.json @@ -10,6 +10,9 @@ "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], "rows": ["GP12", "GP13", "GP16", "GP17"] }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "vendor", "pin": "GP21" diff --git a/keyboards/boardsource/equals/48/rules.mk b/keyboards/boardsource/equals/48/rules.mk index 2f75fc139fc..ec94c118ee1 100644 --- a/keyboards/boardsource/equals/48/rules.mk +++ b/keyboards/boardsource/equals/48/rules.mk @@ -1,2 +1 @@ -AUDIO_DRIVER = pwm_hardware QUANTUM_PAINTER_DRIVERS += st7735_spi diff --git a/keyboards/boardsource/equals/60/keyboard.json b/keyboards/boardsource/equals/60/keyboard.json index 3bc1f49be38..63cb4717e57 100644 --- a/keyboards/boardsource/equals/60/keyboard.json +++ b/keyboards/boardsource/equals/60/keyboard.json @@ -10,6 +10,9 @@ "cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11"], "rows": ["GP12", "GP13", "GP16", "GP17", "GP18"] }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "vendor", "pin": "GP21" diff --git a/keyboards/boardsource/equals/60/rules.mk b/keyboards/boardsource/equals/60/rules.mk index 2f75fc139fc..ec94c118ee1 100644 --- a/keyboards/boardsource/equals/60/rules.mk +++ b/keyboards/boardsource/equals/60/rules.mk @@ -1,2 +1 @@ -AUDIO_DRIVER = pwm_hardware QUANTUM_PAINTER_DRIVERS += st7735_spi diff --git a/keyboards/boardsource/unicorne/keyboard.json b/keyboards/boardsource/unicorne/keyboard.json index 6afbcc044cb..4fb63de9e32 100644 --- a/keyboards/boardsource/unicorne/keyboard.json +++ b/keyboards/boardsource/unicorne/keyboard.json @@ -32,6 +32,9 @@ "pid": "0x7563", "vid": "0x4273" }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "vendor", "pin": "GP29" diff --git a/keyboards/boardsource/unicorne/rules.mk b/keyboards/boardsource/unicorne/rules.mk index d123b2a2fa8..48b30dcd51a 100644 --- a/keyboards/boardsource/unicorne/rules.mk +++ b/keyboards/boardsource/unicorne/rules.mk @@ -1,3 +1,2 @@ SERIAL_DRIVER = vendor -AUDIO_DRIVER = pwm_hardware POINTING_DEVICE_DRIVER = analog_joystick diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json index 63c02322a2e..747fd497828 100644 --- a/keyboards/converter/usb_usb/info.json +++ b/keyboards/converter/usb_usb/info.json @@ -8,6 +8,13 @@ "pid": "0x005B", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "usb_hid": true + }, "processor": "atmega32u4", "community_layouts": ["fullsize_ansi", "fullsize_iso", "fullsize_jis"], "layouts": { diff --git a/keyboards/converter/usb_usb/matrix.c b/keyboards/converter/usb_usb/matrix.c deleted file mode 100644 index b077febd74d..00000000000 --- a/keyboards/converter/usb_usb/matrix.c +++ /dev/null @@ -1 +0,0 @@ -// Intentionally left empty. This file must exist for this board to build. diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk index 97aebc9349b..1e278514f68 100644 --- a/keyboards/converter/usb_usb/rules.mk +++ b/keyboards/converter/usb_usb/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 -USB_HID_ENABLE = yes CUSTOM_MATRIX = yes SRC += custom_matrix.cpp diff --git a/keyboards/custommk/cmk11/keyboard.json b/keyboards/custommk/cmk11/keyboard.json index d831351aa78..9a853063ba3 100644 --- a/keyboards/custommk/cmk11/keyboard.json +++ b/keyboards/custommk/cmk11/keyboard.json @@ -18,6 +18,9 @@ "nkro": true, "rgb_matrix": true }, + "audio": { + "driver": "pwm_hardware" + }, "matrix_pins": { "cols": ["B0", "A1", "A2", "A3", "A6", "B10"], "rows": ["A5", "A4"] diff --git a/keyboards/custommk/cmk11/rules.mk b/keyboards/custommk/cmk11/rules.mk deleted file mode 100644 index 72f75f4367e..00000000000 --- a/keyboards/custommk/cmk11/rules.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/custommk/ergostrafer/keyboard.json b/keyboards/custommk/ergostrafer/keyboard.json index a1283114c8e..4f23417415d 100644 --- a/keyboards/custommk/ergostrafer/keyboard.json +++ b/keyboards/custommk/ergostrafer/keyboard.json @@ -17,6 +17,9 @@ "encoder": true, "audio": true }, + "audio": { + "driver": "pwm_hardware" + }, "matrix_pins": { "cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"], "rows": ["C13", "C14", "C15", "B1", "A7", "A5"] diff --git a/keyboards/custommk/ergostrafer/rules.mk b/keyboards/custommk/ergostrafer/rules.mk deleted file mode 100644 index 72f75f4367e..00000000000 --- a/keyboards/custommk/ergostrafer/rules.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/custommk/evo70_r2/keyboard.json b/keyboards/custommk/evo70_r2/keyboard.json index dea56ed2570..5f10d6705d9 100644 --- a/keyboards/custommk/evo70_r2/keyboard.json +++ b/keyboards/custommk/evo70_r2/keyboard.json @@ -51,6 +51,9 @@ "twinkle": true } }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "pwm", "pin": "A10" diff --git a/keyboards/custommk/evo70_r2/rules.mk b/keyboards/custommk/evo70_r2/rules.mk index 193fe4f1a43..3961343ce4b 100644 --- a/keyboards/custommk/evo70_r2/rules.mk +++ b/keyboards/custommk/evo70_r2/rules.mk @@ -1,5 +1,3 @@ -AUDIO_DRIVER = pwm_hardware - # project specific files SRC += matrix.c diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h index 8209c21dba5..3688e007854 100644 --- a/keyboards/ergodox_ez/config.h +++ b/keyboards/ergodox_ez/config.h @@ -73,8 +73,6 @@ along with this program. If not, see . /* fix space cadet rollover issue */ #define DISABLE_SPACE_CADET_ROLLOVER -#define RGBW - /* * The debounce filtering reports a key/switch change directly, * without any extra delay. After that the debounce logic will filter diff --git a/keyboards/ergodox_ez/info.json b/keyboards/ergodox_ez/info.json index f2495a409c3..a560e97a0b5 100644 --- a/keyboards/ergodox_ez/info.json +++ b/keyboards/ergodox_ez/info.json @@ -27,7 +27,8 @@ "debounce_type": "sym_eager_pr" }, "ws2812": { - "pin": "D7" + "pin": "D7", + "rgbw": true }, "rgb_matrix": { "animations": { diff --git a/keyboards/ergodox_ez/shine/rgblight_custom.c b/keyboards/ergodox_ez/shine/rgblight_custom.c index feac50cba08..29060e76fce 100644 --- a/keyboards/ergodox_ez/shine/rgblight_custom.c +++ b/keyboards/ergodox_ez/shine/rgblight_custom.c @@ -25,7 +25,7 @@ void setleds_custom(rgb_led_t *led, uint16_t led_num) { uint16_t length = 0; int i = 0; int j = 0; -# ifdef RGBW +# ifdef WS2812_RGBW int bytes_per_led = 4; # else int bytes_per_led = 3; @@ -52,7 +52,7 @@ void setleds_custom(rgb_led_t *led, uint16_t led_num) { data[j++] = data_byte[0]; data[j++] = data_byte[1]; data[j++] = data_byte[2]; -#ifdef RGBW +#ifdef WS2812_RGBW data[j++] = data_byte[3]; #endif } diff --git a/keyboards/handwired/macroboard/f411/keyboard.json b/keyboards/handwired/macroboard/f411/keyboard.json index 03a8aadc1b9..8b1155d7740 100644 --- a/keyboards/handwired/macroboard/f411/keyboard.json +++ b/keyboards/handwired/macroboard/f411/keyboard.json @@ -9,6 +9,9 @@ "rows": ["A15", "B3", "B4", "B5", "B7"] }, "diode_direction": "COL2ROW", + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "pwm" }, diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk deleted file mode 100644 index 72f75f4367e..00000000000 --- a/keyboards/handwired/macroboard/f411/rules.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h index 7c77f53a82d..dcbcfeaaa8c 100644 --- a/keyboards/handwired/tennie/config.h +++ b/keyboards/handwired/tennie/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/handwired/tennie/keyboard.json b/keyboards/handwired/tennie/keyboard.json index 34e6676c953..36c1266d50b 100644 --- a/keyboards/handwired/tennie/keyboard.json +++ b/keyboards/handwired/tennie/keyboard.json @@ -26,7 +26,8 @@ } }, "ws2812": { - "pin": "D1" + "pin": "D1", + "rgbw": true }, "features": { "bootmagic": true, diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json index 000d8f0dd77..499390c6107 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json @@ -12,6 +12,9 @@ "led_count": 20, "split_count": [10, 10] }, + "audio": { + "driver": "dac_additive" + }, "ws2812": { "pin": "A6", "driver": "pwm" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk index 23f790a1ad4..22915ec0001 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk @@ -1,4 +1,3 @@ # KEYBOARD_SHARED_EP = yes SERIAL_DRIVER = usart -AUDIO_DRIVER = dac_additive diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json index 73c13e8e318..7182ee17012 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json @@ -15,6 +15,9 @@ "build": { "debounce_type": "asym_eager_defer_pk" }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "pin": "A1", "driver": "pwm" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk index e75692030f7..f26cbbced12 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk @@ -2,4 +2,3 @@ KEYBOARD_SHARED_EP = yes MOUSE_SHARED_EP = yes SERIAL_DRIVER = usart -AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/hhkb/ansi/32u2/keyboard.json b/keyboards/hhkb/ansi/32u2/keyboard.json index dd190d18ee0..d210808d984 100644 --- a/keyboards/hhkb/ansi/32u2/keyboard.json +++ b/keyboards/hhkb/ansi/32u2/keyboard.json @@ -1,4 +1,10 @@ { "processor": "atmega32u2", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + } } diff --git a/keyboards/hhkb/ansi/32u2/rules.mk b/keyboards/hhkb/ansi/32u2/rules.mk deleted file mode 100644 index 95a1d66061d..00000000000 --- a/keyboards/hhkb/ansi/32u2/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/hhkb/ansi/32u4/keyboard.json b/keyboards/hhkb/ansi/32u4/keyboard.json index 042c41f34d6..1e47ddd20fe 100644 --- a/keyboards/hhkb/ansi/32u4/keyboard.json +++ b/keyboards/hhkb/ansi/32u4/keyboard.json @@ -1,4 +1,12 @@ { "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + } } diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk index f5a147ccb9a..841565b8465 100644 --- a/keyboards/hhkb/ansi/rules.mk +++ b/keyboards/hhkb/ansi/rules.mk @@ -1,23 +1,6 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -CUSTOM_MATRIX = yes # Custom matrix file for the HHKB -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +CUSTOM_MATRIX = yes # project specific files SRC = matrix.c -# debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION -# debug-on: all - -# debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT -# debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) -# debug-off: all - DEFAULT_FOLDER = hhkb/ansi/32u4 diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json new file mode 100644 index 00000000000..2c63c085104 --- /dev/null +++ b/keyboards/ibm/model_m/mschwingen/led_ffc/keyboard.json @@ -0,0 +1,2 @@ +{ +} diff --git a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk b/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json new file mode 100644 index 00000000000..2c63c085104 --- /dev/null +++ b/keyboards/ibm/model_m/mschwingen/led_wired/keyboard.json @@ -0,0 +1,2 @@ +{ +} diff --git a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk b/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json b/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json new file mode 100644 index 00000000000..2c63c085104 --- /dev/null +++ b/keyboards/ibm/model_m/mschwingen/led_ws2812/keyboard.json @@ -0,0 +1,2 @@ +{ +} diff --git a/keyboards/ibm/model_m/mschwingen/post_rules.mk b/keyboards/ibm/model_m/mschwingen/post_rules.mk index a1c2040f4c5..025068e057d 100644 --- a/keyboards/ibm/model_m/mschwingen/post_rules.mk +++ b/keyboards/ibm/model_m/mschwingen/post_rules.mk @@ -1,3 +1,5 @@ +UART_DEBUG ?= no + ifeq ($(strip $(UART_DEBUG)), yes) OPT_DEFS += -DUART_DEBUG endif diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk index c86801e4090..65761bcf9a2 100644 --- a/keyboards/ibm/model_m/mschwingen/rules.mk +++ b/keyboards/ibm/model_m/mschwingen/rules.mk @@ -1,7 +1,5 @@ CUSTOM_MATRIX = lite -UART_DEBUG = no - SRC += matrix.c UART_DRIVER_REQUIRED = yes SPI_DRIVER_REQUIRED = yes diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/keyboard.json similarity index 96% rename from keyboards/mechkeys/mechmini/v1/info.json rename to keyboards/mechkeys/mechmini/v1/keyboard.json index 7dda26af254..8d3a4a9b84a 100644 --- a/keyboards/mechkeys/mechmini/v1/info.json +++ b/keyboards/mechkeys/mechmini/v1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xCA40", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"], "rows": ["B0", "B1", "B2", "B3"] diff --git a/keyboards/mechkeys/mechmini/v1/rules.mk b/keyboards/mechkeys/mechmini/v1/rules.mk deleted file mode 100644 index e1dfc317217..00000000000 --- a/keyboards/mechkeys/mechmini/v1/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = no -COMMAND_ENABLE = yes -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/mechkeys/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/keyboard.json similarity index 98% rename from keyboards/mechkeys/mechmini/v2/info.json rename to keyboards/mechkeys/mechmini/v2/keyboard.json index 26d0b930001..da53e842038 100644 --- a/keyboards/mechkeys/mechmini/v2/info.json +++ b/keyboards/mechkeys/mechmini/v2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xCA40", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B1", "B0", "D5", "B7", "C7"], "rows": ["D0", "D1", "D2", "D3"] diff --git a/keyboards/mechkeys/mechmini/v2/rules.mk b/keyboards/mechkeys/mechmini/v2/rules.mk deleted file mode 100755 index 3a899c4650b..00000000000 --- a/keyboards/mechkeys/mechmini/v2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = 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 -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json index d8aae5a8da7..42b16d63984 100644 --- a/keyboards/mechlovin/adelais/info.json +++ b/keyboards/mechlovin/adelais/info.json @@ -2,14 +2,6 @@ "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", - "features": { - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": true - }, "usb": { "vid": "0x4D4C", "device_version": "0.0.1" diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/rgb_led/rev1/info.json rename to keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json index af68bb84574..01232b07e80 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json @@ -3,6 +3,15 @@ "usb": { "pid": "0xAEC1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk deleted file mode 100644 index aad92997d0f..00000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/rgb_led/rev2/info.json rename to keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json index fb88cb359db..a8633af5da2 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json @@ -3,6 +3,17 @@ "usb": { "pid": "0xAEC2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgblight": true, + "rgb_matrix": true, + "encoder": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk deleted file mode 100644 index e79b2862e60..00000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -RGB_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/rgb_led/rev3/info.json rename to keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json index 62acf349c05..628eb404a5b 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json @@ -3,6 +3,17 @@ "usb": { "pid": "0xAEC3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "rgb_matrix": true, + "encoder": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk deleted file mode 100644 index e144301381d..00000000000 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -# Build Options -# change yes to no to disable -# -RGB_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/mechlovin/adelais/rgb_led/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rules.mk index 8a9bdd433d6..18047f12c7e 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rules.mk +++ b/keyboards/mechlovin/adelais/rgb_led/rules.mk @@ -1,3 +1 @@ - - -DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1 \ No newline at end of file +DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json index 9a2a280c10b..53005dfa339 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json @@ -2,6 +2,16 @@ "usb": { "pid": "0xAD01" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "processor": "STM32F303", "board": "QMK_PROTON_C", "bootloader": "stm32-dfu", diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json rename to keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json index 46907dc7a9d..11295007902 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json @@ -2,6 +2,17 @@ "usb": { "pid": "0xAD02" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, "encoder": { "rotary": [ {"pin_a": "A6", "pin_b": "A5"}, diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk deleted file mode 100644 index 5af1ba85367..00000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json index cf993be2471..f6b79e35d0d 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json @@ -1,4 +1,15 @@ { "processor": "STM32F103", - "bootloader": "stm32duino" + "bootloader": "stm32duino", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + } } diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json index 17cf63fecf3..f0d10942adc 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json @@ -1,13 +1,4 @@ { - "features": { - "bootmagic": false, - "command": false, - "console": false, - "encoder": true, - "extrakey": false, - "mousekey": false, - "nkro": false - }, "usb": { "pid": "0xAD03" }, diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json index 774c3dcf317..9e9748fa93a 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json @@ -1,5 +1,16 @@ { "processor": "STM32F303", "board": "QMK_PROTON_C", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + } } diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json similarity index 98% rename from keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json rename to keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json index 95aac7b0d41..3758a8f085a 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json @@ -3,6 +3,16 @@ "usb": { "pid": "0xAD04" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": true, + "rgblight": true + }, "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"}, diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk index c807f2ad095..179d02c3c68 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk @@ -1,7 +1,3 @@ -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/mechlovin/adelais/standard_led/rules.mk b/keyboards/mechlovin/adelais/standard_led/rules.mk index 271c6a9179e..a1d2ba038de 100644 --- a/keyboards/mechlovin/adelais/standard_led/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/rules.mk @@ -1,5 +1 @@ - -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2 diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index e8f39b8d6d1..baeeab6f186 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -6,14 +6,6 @@ "usb": { "vid": "0x4D4C" }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, "matrix_pins": { "cols": ["F7", "D7", "D6", "D2"], "rows": ["F0", "F1", "F4", "F5", "F6", "D3"] diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/keyboard.json similarity index 78% rename from keyboards/mechlovin/delphine/mono_led/info.json rename to keyboards/mechlovin/delphine/mono_led/keyboard.json index e1b90d1191b..06fa071159e 100644 --- a/keyboards/mechlovin/delphine/mono_led/info.json +++ b/keyboards/mechlovin/delphine/mono_led/keyboard.json @@ -3,6 +3,14 @@ "pid": "0xDEF1", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mechlovin/delphine/mono_led/rules.mk b/keyboards/mechlovin/delphine/mono_led/rules.mk deleted file mode 100644 index ed572b0bbfc..00000000000 --- a/keyboards/mechlovin/delphine/mono_led/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow \ No newline at end of file diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/keyboard.json similarity index 93% rename from keyboards/mechlovin/delphine/rgb_led/info.json rename to keyboards/mechlovin/delphine/rgb_led/keyboard.json index 6a0b8df2cf0..35a163c05f8 100644 --- a/keyboards/mechlovin/delphine/rgb_led/info.json +++ b/keyboards/mechlovin/delphine/rgb_led/keyboard.json @@ -3,6 +3,13 @@ "pid": "0xDEF2", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mechlovin/delphine/rgb_led/rules.mk b/keyboards/mechlovin/delphine/rgb_led/rules.mk deleted file mode 100644 index 5c624bc68f6..00000000000 --- a/keyboards/mechlovin/delphine/rgb_led/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah60rgb/rev1/info.json rename to keyboards/mechlovin/hannah60rgb/rev1/keyboard.json index 6a3510c7dfc..4fb4dc2eef5 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "A15" }, diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk deleted file mode 100644 index aad92997d0f..00000000000 --- a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah60rgb/rev2/info.json rename to keyboards/mechlovin/hannah60rgb/rev2/keyboard.json index e6be250311c..06bb71a3482 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgblight": true, + "rgb_matrix": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk deleted file mode 100644 index e1f93c75251..00000000000 --- a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk index 65e5f070fb7..e876a56afb5 100644 --- a/keyboards/mechlovin/hannah60rgb/rules.mk +++ b/keyboards/mechlovin/hannah60rgb/rules.mk @@ -1,13 +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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = mechlovin/hannah60rgb/rev1 diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json index f9adc729660..88a3f397192 100644 --- a/keyboards/mechlovin/hannah65/info.json +++ b/keyboards/mechlovin/hannah65/info.json @@ -3,15 +3,6 @@ "pin": "B8", "breathing": true }, - "features": { - "backlight": true, - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": true - }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"], "rows": ["A4", "A5", "A3", "A2", "A1"] diff --git a/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json index ac97de5f180..7a935fc1a53 100644 --- a/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json +++ b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6500", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah910/rev1/info.json rename to keyboards/mechlovin/hannah910/rev1/keyboard.json index af20cffd4fb..8f01f6f39b1 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x9101", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/hannah910/rev1/rules.mk b/keyboards/mechlovin/hannah910/rev1/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/mechlovin/hannah910/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah910/rev2/info.json rename to keyboards/mechlovin/hannah910/rev2/keyboard.json index a9cfe5f66be..c6fe19c34d1 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x9102", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/hannah910/rev2/rules.mk b/keyboards/mechlovin/hannah910/rev2/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/mechlovin/hannah910/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/keyboard.json similarity index 98% rename from keyboards/mechlovin/hannah910/rev3/info.json rename to keyboards/mechlovin/hannah910/rev3/keyboard.json index abeaa1e1824..8a6ea4d1234 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x9103", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"], "rows": ["B5", "B6", "D3", "C6", "C7"] diff --git a/keyboards/mechlovin/hannah910/rev3/rules.mk b/keyboards/mechlovin/hannah910/rev3/rules.mk deleted file mode 100644 index 8a6e2c7b715..00000000000 --- a/keyboards/mechlovin/hannah910/rev3/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/keyboard.json similarity index 82% rename from keyboards/mechlovin/hex4b/rev1/info.json rename to keyboards/mechlovin/hex4b/rev1/keyboard.json index 1e9a7d57762..d3251f5808e 100644 --- a/keyboards/mechlovin/hex4b/rev1/info.json +++ b/keyboards/mechlovin/hex4b/rev1/keyboard.json @@ -3,6 +3,12 @@ "usb": { "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "matrix_pins": { "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"], "rows": ["B7", "A2", "A1", "A3", "A4", "A5"] diff --git a/keyboards/mechlovin/hex4b/rev1/rules.mk b/keyboards/mechlovin/hex4b/rev1/rules.mk index 15d473397d4..c2ee0bc86f9 100644 --- a/keyboards/mechlovin/hex4b/rev1/rules.mk +++ b/keyboards/mechlovin/hex4b/rev1/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/keyboard.json similarity index 75% rename from keyboards/mechlovin/hex4b/rev2/info.json rename to keyboards/mechlovin/hex4b/rev2/keyboard.json index 8609be01c31..1bdda81c5ab 100644 --- a/keyboards/mechlovin/hex4b/rev2/info.json +++ b/keyboards/mechlovin/hex4b/rev2/keyboard.json @@ -3,6 +3,15 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"], "rows": ["A4", "B12", "B13", "B14", "B15", "A1"] diff --git a/keyboards/mechlovin/hex4b/rev2/rules.mk b/keyboards/mechlovin/hex4b/rev2/rules.mk deleted file mode 100644 index a5089d51a5b..00000000000 --- a/keyboards/mechlovin/hex4b/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json index 249bbd5cb47..dbe7cb83f99 100644 --- a/keyboards/mechlovin/infinity87/rev1/info.json +++ b/keyboards/mechlovin/infinity87/rev1/info.json @@ -1,13 +1,4 @@ { - "features": { - "backlight": true, - "bootmagic": false, - "command": false, - "console": false, - "extrakey": false, - "mousekey": false, - "nkro": false - }, "matrix_pins": { "cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"], "rows": ["A10", "B13", "B12", "B11", "C14", "C15"] diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json index 6fdc9d6e5d3..2ac0510dbf3 100644 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json +++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x8704", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "backlight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json index 39a9f169258..6b947f0f1f1 100644 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json +++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x8703", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "backlight": true + }, "community_layouts": [ "tkl_ansi_tsangan", "tkl_iso_tsangan" diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json similarity index 99% rename from keyboards/mechlovin/infinity87/rev1/standard/info.json rename to keyboards/mechlovin/infinity87/rev1/standard/keyboard.json index 964a7a8cb9a..a0cb10fac22 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/info.json +++ b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x8701", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "rgblight": { "led_count": 26, "sleep": true, diff --git a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk b/keyboards/mechlovin/infinity87/rev1/standard/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/keyboard.json similarity index 99% rename from keyboards/mechlovin/infinity87/rev2/info.json rename to keyboards/mechlovin/infinity87/rev2/keyboard.json index 42db9894ca1..fdc66869889 100644 --- a/keyboards/mechlovin/infinity87/rev2/info.json +++ b/keyboards/mechlovin/infinity87/rev2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x8702", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk index ea7804f1585..179d02c3c68 100644 --- a/keyboards/mechlovin/infinity87/rev2/rules.mk +++ b/keyboards/mechlovin/infinity87/rev2/rules.mk @@ -1,11 +1,3 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json similarity index 99% rename from keyboards/mechlovin/infinity87/rgb_rev1/info.json rename to keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json index 27a7b441e32..2d177949dc1 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x8710", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk deleted file mode 100644 index e408bde91c4..00000000000 --- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/mechlovin/infinity87/rules.mk b/keyboards/mechlovin/infinity87/rules.mk index 251f8440aab..4aa072cae75 100644 --- a/keyboards/mechlovin/infinity87/rules.mk +++ b/keyboards/mechlovin/infinity87/rules.mk @@ -1,15 +1 @@ - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # 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 = mechlovin/infinity87/rgb_rev1 diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/keyboard.json similarity index 99% rename from keyboards/mechlovin/infinity875/info.json rename to keyboards/mechlovin/infinity875/keyboard.json index 47a0ffc5ad4..baadeb525d6 100644 --- a/keyboards/mechlovin/infinity875/info.json +++ b/keyboards/mechlovin/infinity875/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0875", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true + }, "rgb_matrix": { "driver": "ws2812", "max_brightness": 200, diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk index 33f549f3aef..179d02c3c68 100644 --- a/keyboards/mechlovin/infinity875/rules.mk +++ b/keyboards/mechlovin/infinity875/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite -RGB_MATRIX_ENABLE = yes SRC += matrix.c diff --git a/keyboards/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/keyboard.json similarity index 99% rename from keyboards/mechlovin/jay60/info.json rename to keyboards/mechlovin/jay60/keyboard.json index 1f8d68a5411..37f25f36fe8 100644 --- a/keyboards/mechlovin/jay60/info.json +++ b/keyboards/mechlovin/jay60/keyboard.json @@ -8,6 +8,11 @@ "pid": "0x0600", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "matrix_pins": { "cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"], "rows": ["C2", "C1", "C0", "D7", "A1"] diff --git a/keyboards/mechlovin/jay60/rules.mk b/keyboards/mechlovin/jay60/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/mechlovin/jay60/rules.mk +++ b/keyboards/mechlovin/jay60/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/mechlovin9/info.json b/keyboards/mechlovin/mechlovin9/info.json index a5439f56a9d..41133813ef7 100644 --- a/keyboards/mechlovin/mechlovin9/info.json +++ b/keyboards/mechlovin/mechlovin9/info.json @@ -2,14 +2,6 @@ "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Team Mechlovin", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false - }, "usb": { "vid": "0x4D4C" }, diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json similarity index 80% rename from keyboards/mechlovin/mechlovin9/rev1/info.json rename to keyboards/mechlovin/mechlovin9/rev1/keyboard.json index 1ece8fc52d2..2aebe566398 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/info.json +++ b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json @@ -4,14 +4,20 @@ "pid": "0x6509", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"], "rows": ["A4", "A5", "A3", "A2", "A1"] }, "diode_direction": "COL2ROW", - "features": { - "backlight": true - }, "backlight": { "pin": "B8", "breathing": true diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk deleted file mode 100644 index d6fa8455698..00000000000 --- a/keyboards/mechlovin/mechlovin9/rev1/rules.mk +++ /dev/null @@ -1,6 +0,0 @@ -# Build Options -# change yes to no to disable -# -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/keyboard.json similarity index 88% rename from keyboards/mechlovin/mechlovin9/rev2/info.json rename to keyboards/mechlovin/mechlovin9/rev2/keyboard.json index 01e8d59579b..a9b45df59dd 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/info.json +++ b/keyboards/mechlovin/mechlovin9/rev2/keyboard.json @@ -10,6 +10,9 @@ }, "diode_direction": "COL2ROW", "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, "backlight": true }, "backlight": { diff --git a/keyboards/mechlovin/mechlovin9/rev3/keyboard.json b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json index faa4cf0a877..aa2787c34c7 100644 --- a/keyboards/mechlovin/mechlovin9/rev3/keyboard.json +++ b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json @@ -6,6 +6,11 @@ "pid": "0x6509", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "bootmagic": { "matrix": [0, 13] }, diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/keyboard.json similarity index 99% rename from keyboards/mechlovin/olly/bb/info.json rename to keyboards/mechlovin/olly/bb/keyboard.json index fddb8931136..ac08e94c3ce 100644 --- a/keyboards/mechlovin/olly/bb/info.json +++ b/keyboards/mechlovin/olly/bb/keyboard.json @@ -8,6 +8,13 @@ "pid": "0xD181", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "backlight": { "pin": "D4", "breathing": true diff --git a/keyboards/mechlovin/olly/bb/rules.mk b/keyboards/mechlovin/olly/bb/rules.mk index 1d15495eef5..73681d1f1e0 100644 --- a/keyboards/mechlovin/olly/bb/rules.mk +++ b/keyboards/mechlovin/olly/bb/rules.mk @@ -1,18 +1,5 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json index b67551a111b..315191e8408 100644 --- a/keyboards/mechlovin/olly/jf/info.json +++ b/keyboards/mechlovin/olly/jf/info.json @@ -5,15 +5,6 @@ "usb": { "vid": "0x4D4C" }, - "features": { - "nkro": false, - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "rgblight": true - }, "diode_direction": "ROW2COL", "rgblight": { "led_count": 27, diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/keyboard.json similarity index 99% rename from keyboards/mechlovin/olly/jf/rev1/info.json rename to keyboards/mechlovin/olly/jf/rev1/keyboard.json index 0b6aec094f8..69f092af07e 100644 --- a/keyboards/mechlovin/olly/jf/rev1/info.json +++ b/keyboards/mechlovin/olly/jf/rev1/keyboard.json @@ -5,7 +5,11 @@ "device_version": "0.0.1" }, "features": { - "backlight": true + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true, + "rgblight": true }, "matrix_pins": { "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], diff --git a/keyboards/mechlovin/olly/jf/rev2/keyboard.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json index 600bf8a3af3..3771188638b 100644 --- a/keyboards/mechlovin/olly/jf/rev2/keyboard.json +++ b/keyboards/mechlovin/olly/jf/rev2/keyboard.json @@ -7,10 +7,14 @@ } }, "features": { - "command": true, + "bootmagic": true, + "mousekey": true, + "extrakey": true, "console": true, + "command": true, + "nkro": true, "led_matrix": true, - "nkro": true + "rgblight": true }, "led_matrix": { "animations": { @@ -704,4 +708,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/keyboard.json similarity index 99% rename from keyboards/mechlovin/serratus/info.json rename to keyboards/mechlovin/serratus/keyboard.json index 780a369cb81..c283c48a350 100644 --- a/keyboards/mechlovin/serratus/info.json +++ b/keyboards/mechlovin/serratus/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0870", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/mechlovin/serratus/rules.mk b/keyboards/mechlovin/serratus/rules.mk index 03ea2f1bda0..179d02c3c68 100644 --- a/keyboards/mechlovin/serratus/rules.mk +++ b/keyboards/mechlovin/serratus/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/keyboard.json similarity index 98% rename from keyboards/mechlovin/th1800/info.json rename to keyboards/mechlovin/th1800/keyboard.json index 001c73f6839..66b74875454 100644 --- a/keyboards/mechlovin/th1800/info.json +++ b/keyboards/mechlovin/th1800/keyboard.json @@ -8,6 +8,11 @@ "pid": "0x1800", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "matrix_pins": { "cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"], "rows": ["B6", "B7", "D0", "D1", "D5", "D6"] diff --git a/keyboards/mechlovin/th1800/rules.mk b/keyboards/mechlovin/th1800/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/mechlovin/th1800/rules.mk +++ b/keyboards/mechlovin/th1800/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json index 41179a6ef14..9de42c24424 100644 --- a/keyboards/mechlovin/zed1800/info.json +++ b/keyboards/mechlovin/zed1800/info.json @@ -17,15 +17,6 @@ "backing_size": 4096 } }, - "features": { - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true, - "rgblight": true, - "audio": false - }, "rgblight": { "sleep": true, "animations": { diff --git a/keyboards/mechlovin/zed1800/oreum/keyboard.json b/keyboards/mechlovin/zed1800/oreum/keyboard.json index 4a15f61ce49..c5652213d62 100644 --- a/keyboards/mechlovin/zed1800/oreum/keyboard.json +++ b/keyboards/mechlovin/zed1800/oreum/keyboard.json @@ -3,6 +3,14 @@ "usb": { "pid": "0x1802" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"], "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk index d007da3fa20..e0088c95c39 100644 --- a/keyboards/mechlovin/zed1800/rules.mk +++ b/keyboards/mechlovin/zed1800/rules.mk @@ -1 +1 @@ -DEFAULT_FOLDER = mechlovin/zed1800/saber \ No newline at end of file +DEFAULT_FOLDER = mechlovin/zed1800/saber diff --git a/keyboards/mechlovin/zed1800/saber/keyboard.json b/keyboards/mechlovin/zed1800/saber/keyboard.json index d921d95a950..a3d236e5112 100644 --- a/keyboards/mechlovin/zed1800/saber/keyboard.json +++ b/keyboards/mechlovin/zed1800/saber/keyboard.json @@ -3,6 +3,14 @@ "usb": { "pid": "0x1803" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"], "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/mechlovin/zed1800/zepsody/keyboard.json b/keyboards/mechlovin/zed1800/zepsody/keyboard.json index dab92b26d7e..8a973d181fa 100644 --- a/keyboards/mechlovin/zed1800/zepsody/keyboard.json +++ b/keyboards/mechlovin/zed1800/zepsody/keyboard.json @@ -3,6 +3,14 @@ "usb": { "pid": "0x1801" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] diff --git a/keyboards/mechlovin/zed65/910/keyboard.json b/keyboards/mechlovin/zed65/910/keyboard.json index 3b1472014d7..36f1a1ed3bc 100644 --- a/keyboards/mechlovin/zed65/910/keyboard.json +++ b/keyboards/mechlovin/zed65/910/keyboard.json @@ -9,6 +9,11 @@ "device_version": "0.0.1" }, "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, "nkro": true, "rgblight": true }, diff --git a/keyboards/mechlovin/zed65/info.json b/keyboards/mechlovin/zed65/info.json index c255dd23c6e..cf993be2471 100644 --- a/keyboards/mechlovin/zed65/info.json +++ b/keyboards/mechlovin/zed65/info.json @@ -1,11 +1,4 @@ { "processor": "STM32F103", - "bootloader": "stm32duino", - "features": { - "bootmagic": true, - "command": true, - "console": true, - "extrakey": true, - "mousekey": true - }, + "bootloader": "stm32duino" } diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/keyboard.json similarity index 98% rename from keyboards/mechlovin/zed65/mono_led/info.json rename to keyboards/mechlovin/zed65/mono_led/keyboard.json index aa46b1bd8bc..0cf13002d9a 100644 --- a/keyboards/mechlovin/zed65/mono_led/info.json +++ b/keyboards/mechlovin/zed65/mono_led/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x6503", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "led_matrix": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mechlovin/zed65/mono_led/rules.mk b/keyboards/mechlovin/zed65/mono_led/rules.mk deleted file mode 100644 index 55d38a7b91d..00000000000 --- a/keyboards/mechlovin/zed65/mono_led/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ - -NKRO_ENABLE = yes # Enable N-Key Rollover -LED_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json similarity index 97% rename from keyboards/mechlovin/zed65/no_backlight/retro66/info.json rename to keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json index 0709014f76b..49ed44f0a1f 100644 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6601", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "matrix_pins": { "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"], "rows": ["B13", "B14", "A8", "A1", "A0"] diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk deleted file mode 100644 index 5af1ba85367..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/zed65/no_backlight/rules.mk b/keyboards/mechlovin/zed65/no_backlight/rules.mk index b0b388db500..a699765498b 100644 --- a/keyboards/mechlovin/zed65/no_backlight/rules.mk +++ b/keyboards/mechlovin/zed65/no_backlight/rules.mk @@ -1,3 +1 @@ -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - DEFAULT_FOLDER = mechlovin/zed65/no_backlight/wearhaus66 diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json similarity index 98% rename from keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json rename to keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json index 5b0df671dfc..c9c9e0ddb1e 100644 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json +++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6602", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"], "rows": ["B13", "B14", "A8", "A1", "A0"] diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk deleted file mode 100644 index 84ef473c02e..00000000000 --- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/mechlovin/zed65/rev1/keyboard.json b/keyboards/mechlovin/zed65/rev1/keyboard.json index 20f04dbe655..99de5d53f2a 100644 --- a/keyboards/mechlovin/zed65/rev1/keyboard.json +++ b/keyboards/mechlovin/zed65/rev1/keyboard.json @@ -9,6 +9,11 @@ "device_version": "0.0.1" }, "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, "nkro": true, "rgblight": true }, diff --git a/keyboards/mechstudio/chapter1/info.json b/keyboards/mechstudio/chapter1/keyboard.json similarity index 100% rename from keyboards/mechstudio/chapter1/info.json rename to keyboards/mechstudio/chapter1/keyboard.json diff --git a/keyboards/mechstudio/ud_40_ortho/info.json b/keyboards/mechstudio/ud_40_ortho/keyboard.json similarity index 96% rename from keyboards/mechstudio/ud_40_ortho/info.json rename to keyboards/mechstudio/ud_40_ortho/keyboard.json index 6b301e69e40..31955239f5f 100644 --- a/keyboards/mechstudio/ud_40_ortho/info.json +++ b/keyboards/mechstudio/ud_40_ortho/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "matrix_pins": { "cols": ["C5", "D0", "B3", "B2", "B1", "B0", "D6", "D5", "D4", "D3", "D2", "D1"], "rows": ["C2", "B4", "B5", "B6"] diff --git a/keyboards/mechstudio/ud_40_ortho/rules.mk b/keyboards/mechstudio/ud_40_ortho/rules.mk index 585ce414dcd..4df55cd2206 100644 --- a/keyboards/mechstudio/ud_40_ortho/rules.mk +++ b/keyboards/mechstudio/ud_40_ortho/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/keyboard.json similarity index 100% rename from keyboards/mechwild/bbs/info.json rename to keyboards/mechwild/bbs/keyboard.json diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json index e2389455633..918c792aa70 100644 --- a/keyboards/mechwild/bde/info.json +++ b/keyboards/mechwild/bde/info.json @@ -8,16 +8,6 @@ "build": { "lto": true }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "debug": false, - "extrakey": true, - "mousekey": true, - "rgblight": true, - "nkro": true - }, "development_board": "promicro", "rgblight": { "sleep": true, diff --git a/keyboards/mechwild/bde/lefty/keyboard.json b/keyboards/mechwild/bde/lefty/keyboard.json index c9bcd051954..751a65b1a45 100644 --- a/keyboards/mechwild/bde/lefty/keyboard.json +++ b/keyboards/mechwild/bde/lefty/keyboard.json @@ -4,6 +4,13 @@ "pid": "0x1701", "device_version": "2.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "rows": ["D1", "D7", "D3"], "cols": ["F7", "B1", "B6", "B2", "B3", "F6", "F5", "F4", "D0", "D4", "C6", "E6", "B5", "B4"] diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/keyboard.json similarity index 94% rename from keyboards/mechwild/bde/rev2/info.json rename to keyboards/mechwild/bde/rev2/keyboard.json index b8b7fc39d06..beb2624f3e3 100644 --- a/keyboards/mechwild/bde/rev2/info.json +++ b/keyboards/mechwild/bde/rev2/keyboard.json @@ -4,6 +4,15 @@ "pid": "0x170A", "device_version": "1.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true, + "oled": true + }, "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} diff --git a/keyboards/mechwild/bde/rev2/rules.mk b/keyboards/mechwild/bde/rev2/rules.mk deleted file mode 100644 index bade0749fc9..00000000000 --- a/keyboards/mechwild/bde/rev2/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -ENCODER_ENABLE = yes # Enable encoder -OLED_ENABLE = yes # Enable OLED Screen diff --git a/keyboards/mechwild/bde/righty/keyboard.json b/keyboards/mechwild/bde/righty/keyboard.json index 3f254da2861..54a7a4459f0 100644 --- a/keyboards/mechwild/bde/righty/keyboard.json +++ b/keyboards/mechwild/bde/righty/keyboard.json @@ -4,6 +4,13 @@ "pid": "0x1702", "device_version": "2.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "rows": ["D1", "D7", "D3"], "cols": ["B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"] diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/keyboard.json similarity index 96% rename from keyboards/mechwild/mokulua/mirrored/info.json rename to keyboards/mechwild/mokulua/mirrored/keyboard.json index ccc2d02b637..be74fabbd32 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x170C", "device_version": "1.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true, + "oled": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] diff --git a/keyboards/mechwild/mokulua/mirrored/rules.mk b/keyboards/mechwild/mokulua/mirrored/rules.mk deleted file mode 100644 index 1a9045155ba..00000000000 --- a/keyboards/mechwild/mokulua/mirrored/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder -OLED_ENABLE = yes # Enable OLED Screen diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/keyboard.json similarity index 96% rename from keyboards/mechwild/mokulua/standard/info.json rename to keyboards/mechwild/mokulua/standard/keyboard.json index 5b22023cce3..044573d82c5 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x170B", "device_version": "1.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true, + "oled": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] @@ -22,7 +30,7 @@ "tap_keycode_delay": 10 }, "split": { - "enabled": true + "enabled": true, "soft_serial_pin": "D3", "transport": { "sync": { diff --git a/keyboards/mechwild/mokulua/standard/rules.mk b/keyboards/mechwild/mokulua/standard/rules.mk deleted file mode 100644 index 1a9045155ba..00000000000 --- a/keyboards/mechwild/mokulua/standard/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Enable encoder -OLED_ENABLE = yes # Enable OLED Screen diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/keyboard.json similarity index 88% rename from keyboards/mechwild/puckbuddy/info.json rename to keyboards/mechwild/puckbuddy/keyboard.json index b430c4af450..4e827d1ba87 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x170F", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true, + "oled": true, + "dip_switch": true, + "pointing_device": true, + "dynamic_tapping_term": true + }, "matrix_pins": { "cols": ["B10", "A8", "B4", "B5"], "rows": ["B12", "B13", "B14", "B15"] diff --git a/keyboards/mechwild/puckbuddy/rules.mk b/keyboards/mechwild/puckbuddy/rules.mk index 980fe281cff..fb5d6497359 100644 --- a/keyboards/mechwild/puckbuddy/rules.mk +++ b/keyboards/mechwild/puckbuddy/rules.mk @@ -1,20 +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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes # Encoder Enabled -OLED_ENABLE = yes # OLED Enabled -DIP_SWITCH_ENABLE = yes # Dip Switch Enabled - -POINTING_DEVICE_ENABLE = yes # Pointing Device Enabled -POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Pointing Device Driver - -DYNAMIC_TAPPING_TERM_ENABLE = yes # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily +POINTING_DEVICE_DRIVER = cirque_pinnacle_spi diff --git a/keyboards/mechwild/sugarglider/f401/keyboard.json b/keyboards/mechwild/sugarglider/f401/keyboard.json index 797e9900595..7bf58c1b45e 100644 --- a/keyboards/mechwild/sugarglider/f401/keyboard.json +++ b/keyboards/mechwild/sugarglider/f401/keyboard.json @@ -1,3 +1,18 @@ { - "development_board": "blackpill_f401" + "development_board": "blackpill_f401", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "encoder": true, + "dip_switch": true, + "steno": true, + "oled": true, + "pointing_device": true, + "dynamic_tapping_term": true + } } diff --git a/keyboards/mechwild/sugarglider/f411/keyboard.json b/keyboards/mechwild/sugarglider/f411/keyboard.json index a41c5f4dd14..dd76af1f10e 100644 --- a/keyboards/mechwild/sugarglider/f411/keyboard.json +++ b/keyboards/mechwild/sugarglider/f411/keyboard.json @@ -1,3 +1,18 @@ { - "development_board": "blackpill_f411" + "development_board": "blackpill_f411", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "encoder": true, + "dip_switch": true, + "steno": true, + "oled": true, + "pointing_device": true, + "dynamic_tapping_term": true + } } diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index 749b0952cbd..80004f35d14 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -3,23 +3,14 @@ "keyboard_name": "Sugar Glider", "maintainer": "kylemccreery", "url": "https://mechwild.com/product/sugar-glider/", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true, - "encoder": true, - "rgblight": true, - "dip_switch": true, - "steno": true - }, "usb": { "vid": "0x6D77", "pid": "0x1710", "device_version": "0.2.0", - "force_nkro": true + "force_nkro": true, + "shared_endpoint": { + "keyboard": true + } }, "diode_direction": "COL2ROW", "dynamic_keymap": { diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk index 6fd0836a733..a01a95a8685 100644 --- a/keyboards/mechwild/sugarglider/rules.mk +++ b/keyboards/mechwild/sugarglider/rules.mk @@ -1,12 +1,5 @@ -# Build Options -# change yes to no to disable -# -OLED_ENABLE = yes # OLED Enabled - # Cirque touchpad settings -POINTING_DEVICE_ENABLE = yes # Pointing Device Enabled POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Pointing Device Driver -DYNAMIC_TAPPING_TERM_ENABLE = yes # Enable Dynamic Tapping Term to control the Tap term for the Cirque Pad easily # Custom matrix setup CUSTOM_MATRIX = lite @@ -16,6 +9,3 @@ SRC += mcp23018.c matrix.c I2C_DRIVER_REQUIRED = yes DEFAULT_FOLDER = mechwild/sugarglider/wide_oled - -# Necessary for stenography functionality -KEYBOARD_SHARED_EP = yes # Needed to free up an endpoint in blackpill diff --git a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json index 797e9900595..7bf58c1b45e 100644 --- a/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json +++ b/keyboards/mechwild/sugarglider/wide_oled/f401/keyboard.json @@ -1,3 +1,18 @@ { - "development_board": "blackpill_f401" + "development_board": "blackpill_f401", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "encoder": true, + "dip_switch": true, + "steno": true, + "oled": true, + "pointing_device": true, + "dynamic_tapping_term": true + } } diff --git a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json index a41c5f4dd14..dd76af1f10e 100644 --- a/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json +++ b/keyboards/mechwild/sugarglider/wide_oled/f411/keyboard.json @@ -1,3 +1,18 @@ { - "development_board": "blackpill_f411" + "development_board": "blackpill_f411", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true, + "encoder": true, + "dip_switch": true, + "steno": true, + "oled": true, + "pointing_device": true, + "dynamic_tapping_term": true + } } diff --git a/keyboards/mechwild/sugarglider/wide_oled/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/rules.mk index 193169239b2..23e6cab873a 100644 --- a/keyboards/mechwild/sugarglider/wide_oled/rules.mk +++ b/keyboards/mechwild/sugarglider/wide_oled/rules.mk @@ -3,4 +3,4 @@ # WIDE_OLED_ENABLE = yes -DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401 \ No newline at end of file +DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401 diff --git a/keyboards/mecxlabs/mp1/info.json b/keyboards/mecxlabs/mp1/keyboard.json similarity index 100% rename from keyboards/mecxlabs/mp1/info.json rename to keyboards/mecxlabs/mp1/keyboard.json diff --git a/keyboards/meetlab/kafkasplit/info.json b/keyboards/meetlab/kafkasplit/keyboard.json similarity index 100% rename from keyboards/meetlab/kafkasplit/info.json rename to keyboards/meetlab/kafkasplit/keyboard.json diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/keyboard.json similarity index 99% rename from keyboards/merge/uma/info.json rename to keyboards/merge/uma/keyboard.json index 6413480391e..d5fea75fb49 100644 --- a/keyboards/merge/uma/info.json +++ b/keyboards/merge/uma/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x3232", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "encoder": true, + "oled": true + }, + "build": { + "lto": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk deleted file mode 100644 index e146f96ce6f..00000000000 --- a/keyboards/merge/uma/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # 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 diff --git a/keyboards/mexsistor/ludmila/info.json b/keyboards/mexsistor/ludmila/keyboard.json similarity index 88% rename from keyboards/mexsistor/ludmila/info.json rename to keyboards/mexsistor/ludmila/keyboard.json index 6e44d33913c..71202208c5f 100644 --- a/keyboards/mexsistor/ludmila/info.json +++ b/keyboards/mexsistor/ludmila/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x6BF6", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, "encoder": { "rotary": [ {"pin_a": "F6", "pin_b": "F5"} diff --git a/keyboards/mexsistor/ludmila/rules.mk b/keyboards/mexsistor/ludmila/rules.mk index 547c4ad49c9..73766740561 100644 --- a/keyboards/mexsistor/ludmila/rules.mk +++ b/keyboards/mexsistor/ludmila/rules.mk @@ -1,15 +1,2 @@ -# Build Options -# change yes to no to disable -# CUSTOM_MATRIX = lite SRC = matrix.c -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/minimon/bartlesplit/info.json b/keyboards/minimon/bartlesplit/keyboard.json similarity index 100% rename from keyboards/minimon/bartlesplit/info.json rename to keyboards/minimon/bartlesplit/keyboard.json diff --git a/keyboards/mitosis/info.json b/keyboards/mitosis/keyboard.json similarity index 93% rename from keyboards/mitosis/info.json rename to keyboards/mitosis/keyboard.json index feab60b7fb8..c69d1d30cd4 100644 --- a/keyboards/mitosis/info.json +++ b/keyboards/mitosis/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "unicode": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk index 539a2d1004b..18d234d62a0 100644 --- a/keyboards/mitosis/rules.mk +++ b/keyboards/mitosis/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/mkh_studio/bully/info.json b/keyboards/mkh_studio/bully/keyboard.json similarity index 100% rename from keyboards/mkh_studio/bully/info.json rename to keyboards/mkh_studio/bully/keyboard.json diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/keyboard.json similarity index 90% rename from keyboards/mlego/m60_split/rev1/info.json rename to keyboards/mlego/m60_split/rev1/keyboard.json index 83e66ce2ccf..9be9708081e 100644 --- a/keyboards/mlego/m60_split/rev1/info.json +++ b/keyboards/mlego/m60_split/rev1/keyboard.json @@ -3,6 +3,14 @@ "pid": "0x6361", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], "rows": ["B0", "A6", "A7", "B1", "A5"] diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk index c38e4335e89..c6e29883213 100644 --- a/keyboards/mlego/m60_split/rev1/rules.mk +++ b/keyboards/mlego/m60_split/rev1/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output SERIAL_DRIVER = usart -ENCODER_ENABLE = yes # Enable encoder - diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/keyboard.json similarity index 88% rename from keyboards/mlego/m60_split/rev2/info.json rename to keyboards/mlego/m60_split/rev2/keyboard.json index b4b18a91d69..5185a2e6456 100644 --- a/keyboards/mlego/m60_split/rev2/info.json +++ b/keyboards/mlego/m60_split/rev2/keyboard.json @@ -3,6 +3,14 @@ "pid": "0x6362", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], "rows": ["B0", "A6", "A7", "B1", "A5"] diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk index f3ecf1b52cb..c6e29883213 100644 --- a/keyboards/mlego/m60_split/rev2/rules.mk +++ b/keyboards/mlego/m60_split/rev2/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output SERIAL_DRIVER = usart -ENCODER_ENABLE = yes # Enable encoder diff --git a/keyboards/molecule/info.json b/keyboards/molecule/keyboard.json similarity index 95% rename from keyboards/molecule/info.json rename to keyboards/molecule/keyboard.json index 51ca67c2820..f3bd818122c 100755 --- a/keyboards/molecule/info.json +++ b/keyboards/molecule/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "pointing_device": true + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "B6"] diff --git a/keyboards/molecule/rules.mk b/keyboards/molecule/rules.mk index 06a8f490ee7..3272be5a9b3 100755 --- a/keyboards/molecule/rules.mk +++ b/keyboards/molecule/rules.mk @@ -1,18 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Add trackball support -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = custom SRC += adns.c SPI_DRIVER_REQUIRED = yes diff --git a/keyboards/monokei/mnk1800s/info.json b/keyboards/monokei/mnk1800s/keyboard.json similarity index 99% rename from keyboards/monokei/mnk1800s/info.json rename to keyboards/monokei/mnk1800s/keyboard.json index 9cf4f0f122c..b11038fcd3e 100755 --- a/keyboards/monokei/mnk1800s/info.json +++ b/keyboards/monokei/mnk1800s/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x3138", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B10", "B2", "B1", "B0", "B14", "B15", "A8", "A9", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["B13", "B12", "A7", "A6", "A5"] diff --git a/keyboards/monokei/mnk1800s/rules.mk b/keyboards/monokei/mnk1800s/rules.mk index 7c0709f41e6..0ab54aaaf71 100644 --- a/keyboards/monokei/mnk1800s/rules.mk +++ b/keyboards/monokei/mnk1800s/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/monokei/mnk50/info.json b/keyboards/monokei/mnk50/keyboard.json similarity index 98% rename from keyboards/monokei/mnk50/info.json rename to keyboards/monokei/mnk50/keyboard.json index 3d4c98edc7f..e5d72096dca 100755 --- a/keyboards/monokei/mnk50/info.json +++ b/keyboards/monokei/mnk50/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4D35", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B14", "B15", "A8", "A9", "A13", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9"], "rows": ["B12", "B13", "A10", "A6"] diff --git a/keyboards/monokei/mnk50/rules.mk b/keyboards/monokei/mnk50/rules.mk index 7c0709f41e6..0ab54aaaf71 100644 --- a/keyboards/monokei/mnk50/rules.mk +++ b/keyboards/monokei/mnk50/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/monokei/mnk75/info.json b/keyboards/monokei/mnk75/keyboard.json similarity index 99% rename from keyboards/monokei/mnk75/info.json rename to keyboards/monokei/mnk75/keyboard.json index 421e830a1bd..d9d7d6a8c8b 100755 --- a/keyboards/monokei/mnk75/info.json +++ b/keyboards/monokei/mnk75/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4D37", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"], "rows": ["A2", "A14", "A15", "B3", "B4", "B5"] diff --git a/keyboards/monokei/mnk75/rules.mk b/keyboards/monokei/mnk75/rules.mk index 50f3a3d1511..0ab54aaaf71 100644 --- a/keyboards/monokei/mnk75/rules.mk +++ b/keyboards/monokei/mnk75/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/montsinger/rebound/rev1/info.json b/keyboards/montsinger/rebound/rev1/keyboard.json similarity index 95% rename from keyboards/montsinger/rebound/rev1/info.json rename to keyboards/montsinger/rebound/rev1/keyboard.json index be323b6f65c..66ed41a6740 100644 --- a/keyboards/montsinger/rebound/rev1/info.json +++ b/keyboards/montsinger/rebound/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "B5", "B2", "B6"] diff --git a/keyboards/montsinger/rebound/rev1/rules.mk b/keyboards/montsinger/rebound/rev1/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/montsinger/rebound/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/montsinger/rebound/rev2/info.json b/keyboards/montsinger/rebound/rev2/keyboard.json similarity index 97% rename from keyboards/montsinger/rebound/rev2/info.json rename to keyboards/montsinger/rebound/rev2/keyboard.json index f09cb7f75f0..a3a99247ab3 100644 --- a/keyboards/montsinger/rebound/rev2/info.json +++ b/keyboards/montsinger/rebound/rev2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "B5", "B2", "B6", "B0"] diff --git a/keyboards/montsinger/rebound/rev2/rules.mk b/keyboards/montsinger/rebound/rev2/rules.mk deleted file mode 100644 index f957b56f253..00000000000 --- a/keyboards/montsinger/rebound/rev2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = 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 -ENCODER_ENABLE = yes diff --git a/keyboards/montsinger/rebound/rev3/info.json b/keyboards/montsinger/rebound/rev3/keyboard.json similarity index 97% rename from keyboards/montsinger/rebound/rev3/info.json rename to keyboards/montsinger/rebound/rev3/keyboard.json index b898407f828..630761b4013 100644 --- a/keyboards/montsinger/rebound/rev3/info.json +++ b/keyboards/montsinger/rebound/rev3/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x552F", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["F4", "F5", "D1", "D0", "B0"] diff --git a/keyboards/montsinger/rebound/rev3/rules.mk b/keyboards/montsinger/rebound/rev3/rules.mk deleted file mode 100644 index f957b56f253..00000000000 --- a/keyboards/montsinger/rebound/rev3/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/keyboard.json similarity index 97% rename from keyboards/montsinger/rebound/rev4/info.json rename to keyboards/montsinger/rebound/rev4/keyboard.json index 565e56701f9..ad17ca423ea 100644 --- a/keyboards/montsinger/rebound/rev4/info.json +++ b/keyboards/montsinger/rebound/rev4/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "B2", "B3", "B1"], "rows": ["D1", "D0", "D4", "C6", "F7", "F6", "F5", "F4"] diff --git a/keyboards/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk index 643c971d472..4df55cd2206 100644 --- a/keyboards/montsinger/rebound/rev4/rules.mk +++ b/keyboards/montsinger/rebound/rev4/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/moon/info.json b/keyboards/moon/keyboard.json similarity index 99% rename from keyboards/moon/info.json rename to keyboards/moon/keyboard.json index a89caf86d2d..4c66cb51a9b 100644 --- a/keyboards/moon/info.json +++ b/keyboards/moon/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xFCB8", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "backlight": { "pin": "C6" }, diff --git a/keyboards/moon/rules.mk b/keyboards/moon/rules.mk index 676f0971a2e..aee52dfee13 100644 --- a/keyboards/moon/rules.mk +++ b/keyboards/moon/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # custom matrix setup CUSTOM_MATRIX = yes diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/keyboard.json similarity index 97% rename from keyboards/mt/ncr80/hotswap/info.json rename to keyboards/mt/ncr80/hotswap/keyboard.json index b79a30709f3..6f82bb0e786 100644 --- a/keyboards/mt/ncr80/hotswap/info.json +++ b/keyboards/mt/ncr80/hotswap/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x2002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/mt/ncr80/hotswap/rules.mk b/keyboards/mt/ncr80/hotswap/rules.mk deleted file mode 100644 index e82e95f7843..00000000000 --- a/keyboards/mt/ncr80/hotswap/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/keyboard.json similarity index 99% rename from keyboards/mt/ncr80/solder/info.json rename to keyboards/mt/ncr80/solder/keyboard.json index ead9ed409d1..fac59abadd0 100644 --- a/keyboards/mt/ncr80/solder/info.json +++ b/keyboards/mt/ncr80/solder/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x2001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "backlight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/mt/ncr80/solder/rules.mk b/keyboards/mt/ncr80/solder/rules.mk deleted file mode 100644 index 9032f3e4b8f..00000000000 --- a/keyboards/mt/ncr80/solder/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/keyboard.json similarity index 98% rename from keyboards/mt/split75/info.json rename to keyboards/mt/split75/keyboard.json index e03d528a2a4..c13fa28b800 100644 --- a/keyboards/mt/split75/info.json +++ b/keyboards/mt/split75/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "backlight": true, + "rgblight": true + }, "backlight": { "pin": "D4" }, diff --git a/keyboards/mt/split75/rules.mk b/keyboards/mt/split75/rules.mk index b0c02543b19..bbfc7cbbf72 100644 --- a/keyboards/mt/split75/rules.mk +++ b/keyboards/mt/split75/rules.mk @@ -1,14 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow - # custom matrix setup CUSTOM_MATRIX = lite SRC = matrix.c diff --git a/keyboards/nack/keyboard.json b/keyboards/nack/keyboard.json index 6a3b6db3ade..cd08aac0af4 100644 --- a/keyboards/nack/keyboard.json +++ b/keyboards/nack/keyboard.json @@ -17,6 +17,9 @@ "rgb_matrix": true, "unicode": true }, + "audio": { + "driver": "dac_basic" + }, "ws2812": { "pin": "B5", "driver": "spi" diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk deleted file mode 100644 index 72354402a6b..00000000000 --- a/keyboards/nack/rules.mk +++ /dev/null @@ -1 +0,0 @@ -AUDIO_DRIVER = dac_basic diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h index d4f07051e5c..b2c161d40ac 100644 --- a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h +++ b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h @@ -28,8 +28,11 @@ // Selectively undefine to save space // VIA support won't fit otherwise #ifdef RGBLIGHT_ENABLE -#undef RGBLIGHT_EFFECT_TWINKLE +#undef RGBLIGHT_EFFECT_ALTERNATING +#undef RGBLIGHT_EFFECT_CHRISTMAS #undef RGBLIGHT_EFFECT_RGB_TEST +#undef RGBLIGHT_EFFECT_SNAKE +#undef RGBLIGHT_EFFECT_TWINKLE #endif //RGB LIGHT_ENABLE // Split Options diff --git a/keyboards/oddforge/vea/ws2812_custom.c b/keyboards/oddforge/vea/ws2812_custom.c index a037b88b3e6..317f98130b1 100644 --- a/keyboards/oddforge/vea/ws2812_custom.c +++ b/keyboards/oddforge/vea/ws2812_custom.c @@ -1,7 +1,7 @@ #include "ws2812.h" #include "i2c_master.h" -#ifdef RGBW +#ifdef WS2812_RGBW # error "RGBW not supported" #endif diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index 4244b4d83d8..f7b2a8f8a1f 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -75,6 +75,9 @@ "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"] }, "diode_direction": "COL2ROW", + "audio": { + "driver": "dac_additive" + }, "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index 6cdb6ed4c29..ef20f95b652 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -1,5 +1,3 @@ -AUDIO_DRIVER = dac_additive - RGBLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no diff --git a/keyboards/quokka/keyboard.json b/keyboards/quokka/keyboard.json index 0c34b0ee65f..094e3e496eb 100644 --- a/keyboards/quokka/keyboard.json +++ b/keyboards/quokka/keyboard.json @@ -13,6 +13,9 @@ "oled": true, "rgb_matrix": true }, + "audio": { + "driver": "pwm_hardware" + }, "matrix_pins": { "cols": ["GP8", "GP7", "GP6", "GP5", "GP4"], "rows": ["GP10", "GP19", "GP20", "GP18"] diff --git a/keyboards/quokka/rules.mk b/keyboards/quokka/rules.mk index c53818be735..161ec22b16e 100644 --- a/keyboards/quokka/rules.mk +++ b/keyboards/quokka/rules.mk @@ -1,2 +1 @@ -AUDIO_DRIVER = pwm_hardware SERIAL_DRIVER = vendor diff --git a/keyboards/rgbkb/pan/pan.c b/keyboards/rgbkb/pan/pan.c index 191ff1ac1fb..401831e0e20 100644 --- a/keyboards/rgbkb/pan/pan.c +++ b/keyboards/rgbkb/pan/pan.c @@ -42,7 +42,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) { rgb_matrix_ws2812_array[i].g = g; rgb_matrix_ws2812_array[i].b = b; } -# ifdef RGBW +# ifdef WS2812_RGBW convert_rgb_to_rgbw(&rgb_matrix_ws2812_array[i]); # endif } diff --git a/keyboards/rgbkb/sol3/rev1/keyboard.json b/keyboards/rgbkb/sol3/rev1/keyboard.json index 3b8b7d060c8..83e0a7a9275 100644 --- a/keyboards/rgbkb/sol3/rev1/keyboard.json +++ b/keyboards/rgbkb/sol3/rev1/keyboard.json @@ -24,6 +24,9 @@ "twinkle": true } }, + "audio": { + "driver": "dac_additive" + }, "ws2812": { "pin": "B5", "driver": "pwm" diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index bf22130a55a..0c48b5d30e4 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -14,7 +14,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover AUDIO_ENABLE = yes # Audio output -AUDIO_DRIVER = dac_additive DYNAMIC_MACRO_ENABLE = yes DIP_SWITCH_ENABLE = yes diff --git a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json index 3ea79da589d..5b5e63b7ca2 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/7skb/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEB5F", "device_version": "0.0.7" }, + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk index 09cad7556c4..15364c29a51 100644 --- a/keyboards/salicylic_acid3/7skb/rules.mk +++ b/keyboards/salicylic_acid3/7skb/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = salicylic_acid3/7skb/rev1 diff --git a/keyboards/salicylic_acid3/getta25/rev1/keyboard.json b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json index e2148f9302a..3399f9e081b 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/getta25/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.1.3" }, + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "rgblight": { "hue_steps": 10, "led_count": 9, diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk index dae9b6ae3bd..069fe74b142 100644 --- a/keyboards/salicylic_acid3/getta25/rules.mk +++ b/keyboards/salicylic_acid3/getta25/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -OLED_ENABLE = no - DEFAULT_FOLDER = salicylic_acid3/getta25/rev1 diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json index ccfe99ad18f..7c72c9b17aa 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEB4F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk index f90f3d9c07c..d54d2ccef4d 100644 --- a/keyboards/salicylic_acid3/jisplit89/rules.mk +++ b/keyboards/salicylic_acid3/jisplit89/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 - DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1 diff --git a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json index da82c1a16c1..f390db51f14 100644 --- a/keyboards/salicylic_acid3/naked48/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked48/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0xE8BA", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "rgb_matrix": { "driver": "ws2812" }, diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk index fd9a93f5030..dadfa7a2579 100644 --- a/keyboards/salicylic_acid3/naked48/rules.mk +++ b/keyboards/salicylic_acid3/naked48/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no - DEFAULT_FOLDER = salicylic_acid3/naked48/rev1 diff --git a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json index f5d53c001d4..1916b01eb21 100644 --- a/keyboards/salicylic_acid3/naked60/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked60/rev1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0xEB5C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D7", "E6", "B4", "B5", "D3"], "rows": ["B6", "D1", "D0", "D4", "C6"] diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk index 2210ae765c9..904309ea356 100644 --- a/keyboards/salicylic_acid3/naked60/rules.mk +++ b/keyboards/salicylic_acid3/naked60/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 = salicylic_acid3/naked60/rev1 diff --git a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json index 2034b7d9ab4..8dc9a49c7a6 100644 --- a/keyboards/salicylic_acid3/naked64/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/naked64/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.3" }, + "features": { + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "D3"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk index 03a0fe22c08..0ac8d83bfcc 100644 --- a/keyboards/salicylic_acid3/naked64/rules.mk +++ b/keyboards/salicylic_acid3/naked64/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -OLED_ENABLE = no -USE_I2C = no - DEFAULT_FOLDER = salicylic_acid3/naked64/rev1 diff --git a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json index d510c2c3b2a..0d20c99f269 100644 --- a/keyboards/salicylic_acid3/setta21/rev1/keyboard.json +++ b/keyboards/salicylic_acid3/setta21/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x3060", "device_version": "0.1.1" }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "rgblight": { "hue_steps": 10, "led_count": 21, diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk index d4aab3ee3f0..02e68b57487 100644 --- a/keyboards/salicylic_acid3/setta21/rules.mk +++ b/keyboards/salicylic_acid3/setta21/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -OLED_ENABLE = no -USE_I2C = no -RGB_MATRIX_ENABLE = no - DEFAULT_FOLDER = salicylic_acid3/setta21/rev1 diff --git a/keyboards/stront/keyboard.json b/keyboards/stront/keyboard.json index d2726c85f0e..5055a4fb30e 100644 --- a/keyboards/stront/keyboard.json +++ b/keyboards/stront/keyboard.json @@ -80,13 +80,15 @@ ] }, "features": { + "backlight": true, "bootmagic": true, "console": false, "encoder": true, - "backlight": true, "extrakey": true, - "rgb_matrix": true, - "nkro": false + "nkro": false, + "pointing_device": true, + "quantum_painter": true, + "rgb_matrix": true }, "backlight": { "pin": "GP14" diff --git a/keyboards/stront/rules.mk b/keyboards/stront/rules.mk index c6cdeb5bfca..61d59017cb7 100644 --- a/keyboards/stront/rules.mk +++ b/keyboards/stront/rules.mk @@ -1,9 +1,7 @@ SERIAL_DRIVER = vendor -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi -QUANTUM_PAINTER_ENABLE = yes QUANTUM_PAINTER_DRIVERS += st7789_spi QUANTUM_PAINTER_LVGL_INTEGRATION = yes diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json index 3cd857a55dc..756764ff6f0 100644 --- a/keyboards/teleport/native/info.json +++ b/keyboards/teleport/native/info.json @@ -38,7 +38,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "diode_direction": "ROW2COL", "matrix_pins": { diff --git a/keyboards/teleport/native/rules.mk b/keyboards/teleport/native/rules.mk index 2a3743fa755..53dc2b17475 100644 --- a/keyboards/teleport/native/rules.mk +++ b/keyboards/teleport/native/rules.mk @@ -1,4 +1,3 @@ -RGB_MATRIX_ENABLE = yes RGB_MATRIX_CUSTOM_KB = yes DEFAULT_FOLDER = teleport/native/iso diff --git a/keyboards/tkw/grandiceps/rev2/config.h b/keyboards/tkw/grandiceps/rev2/config.h index 5810fe75bc9..83f1b561574 100644 --- a/keyboards/tkw/grandiceps/rev2/config.h +++ b/keyboards/tkw/grandiceps/rev2/config.h @@ -15,5 +15,4 @@ */ #pragma once -#define SPLIT_HAND_PIN B3 #define EEPROM_I2C_24LC64 diff --git a/keyboards/tkw/grandiceps/rev2/keyboard.json b/keyboards/tkw/grandiceps/rev2/keyboard.json index cd809481965..b0f9970bcdc 100644 --- a/keyboards/tkw/grandiceps/rev2/keyboard.json +++ b/keyboards/tkw/grandiceps/rev2/keyboard.json @@ -5,5 +5,13 @@ }, "eeprom": { "driver": "i2c" + }, + "features": { + "pointing_device": true + }, + "split": { + "handedness": { + "pin": "B3" + } } } diff --git a/keyboards/tkw/grandiceps/rev2/rules.mk b/keyboards/tkw/grandiceps/rev2/rules.mk index 20f28719241..0cac88f7f7d 100644 --- a/keyboards/tkw/grandiceps/rev2/rules.mk +++ b/keyboards/tkw/grandiceps/rev2/rules.mk @@ -1,2 +1 @@ -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pimoroni_trackball diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json index fddee1c21fd..be0710ebef4 100644 --- a/keyboards/tzarc/djinn/info.json +++ b/keyboards/tzarc/djinn/info.json @@ -31,6 +31,9 @@ "rows": ["B13", "B14", "B15", "C6", "C7", "C8"], "cols": ["C0", "C1", "C2", "C3", "A0", "A1", "A2"] }, + "audio": { + "driver": "pwm_software" + }, "backlight": { "pin": "A7", "levels": 4 diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk index 5a4589a86fe..78912d16d05 100644 --- a/keyboards/tzarc/djinn/rules.mk +++ b/keyboards/tzarc/djinn/rules.mk @@ -4,8 +4,6 @@ SERIAL_DRIVER = usart CIE1931_CURVE = yes -AUDIO_DRIVER = pwm_software - QUANTUM_PAINTER_DRIVERS = ili9341_spi SRC += \ diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h index c024f9d8d91..cd1f84bc1fc 100644 --- a/keyboards/westfoxtrot/aanzee/config.h +++ b/keyboards/westfoxtrot/aanzee/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/westfoxtrot/aanzee/keyboard.json b/keyboards/westfoxtrot/aanzee/keyboard.json index 7a12a3e52e3..898fe9e62b3 100644 --- a/keyboards/westfoxtrot/aanzee/keyboard.json +++ b/keyboards/westfoxtrot/aanzee/keyboard.json @@ -52,7 +52,8 @@ } }, "ws2812": { - "pin": "E6" + "pin": "E6", + "rgbw": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json index c71d47a41d8..85dd61bf86b 100644 --- a/keyboards/westm/westm68/info.json +++ b/keyboards/westm/westm68/info.json @@ -7,6 +7,15 @@ "vid": "0x574D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], "rows": ["A13", "B9", "F1", "A10", "A9"] diff --git a/keyboards/westm/westm68/rules.mk b/keyboards/westm/westm68/rules.mk index 6174653422b..2a716f41c4a 100644 --- a/keyboards/westm/westm68/rules.mk +++ b/keyboards/westm/westm68/rules.mk @@ -1,17 +1,4 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = westm/westm68/rev2 diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json index 1a132137911..43f12b17add 100644 --- a/keyboards/westm/westm9/info.json +++ b/keyboards/westm/westm9/info.json @@ -7,6 +7,14 @@ "vid": "0x574D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B8", "B5", "B4"], "rows": ["A14", "A15", "B3"] diff --git a/keyboards/westm/westm9/rules.mk b/keyboards/westm/westm9/rules.mk index e522c525602..3ff78857b35 100644 --- a/keyboards/westm/westm9/rules.mk +++ b/keyboards/westm/westm9/rules.mk @@ -1,19 +1,4 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enable the OLED feature - DEFAULT_FOLDER = westm/westm9/rev2 diff --git a/keyboards/woodkeys/meira/featherble/keyboard.json b/keyboards/woodkeys/meira/featherble/keyboard.json index 8dc946dd571..416b788c904 100644 --- a/keyboards/woodkeys/meira/featherble/keyboard.json +++ b/keyboards/woodkeys/meira/featherble/keyboard.json @@ -3,5 +3,8 @@ "bootloader": "caterina", "bluetooth": { "driver": "bluefruit_le" + }, + "features": { + "bluetooth": true } } diff --git a/keyboards/woodkeys/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk index 174947ff399..3437a35bdf1 100644 --- a/keyboards/woodkeys/meira/featherble/rules.mk +++ b/keyboards/woodkeys/meira/featherble/rules.mk @@ -1,4 +1,2 @@ # Processor frequency F_CPU = 8000000 - -BLUETOOTH_ENABLE = yes diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json index 3c395e057a1..771a31d105c 100644 --- a/keyboards/work_louder/loop/info.json +++ b/keyboards/work_louder/loop/info.json @@ -8,6 +8,18 @@ "pid": "0x1DF9", "max_power": 100 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "rgblight": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/work_louder/loop/rules.mk b/keyboards/work_louder/loop/rules.mk index b68ae20d145..53c3227972d 100644 --- a/keyboards/work_louder/loop/rules.mk +++ b/keyboards/work_louder/loop/rules.mk @@ -1,21 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes - -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes - SRC += rgb_functions.c DEFAULT_FOLDER = work_louder/loop/rev3 diff --git a/keyboards/yanghu/unicorne/info.json b/keyboards/yanghu/unicorne/info.json index 26d54c2c827..1b890dcabaf 100644 --- a/keyboards/yanghu/unicorne/info.json +++ b/keyboards/yanghu/unicorne/info.json @@ -8,6 +8,19 @@ "pid": "0x0204", "device_version": "0.0.1" }, + "features": { + "audio": true, + "bootmagic": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, + "audio": { + "driver": "pwm_hardware" + }, "rgblight": { "led_count": 8, "animations": { diff --git a/keyboards/yanghu/unicorne/rules.mk b/keyboards/yanghu/unicorne/rules.mk index 014f5d4d422..96852c8abfe 100644 --- a/keyboards/yanghu/unicorne/rules.mk +++ b/keyboards/yanghu/unicorne/rules.mk @@ -1,20 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes - -AUDIO_DRIVER = pwm_hardware - -RGB_MATRIX_ENABLE = no # Do not enable with RGBLIGHT - DEFAULT_FOLDER = yanghu/unicorne/f411 diff --git a/keyboards/zsa/moonlander/keyboard.json b/keyboards/zsa/moonlander/keyboard.json index 233cb46bba7..08864fe2d77 100644 --- a/keyboards/zsa/moonlander/keyboard.json +++ b/keyboards/zsa/moonlander/keyboard.json @@ -22,6 +22,9 @@ "rgb_matrix": true, "swap_hands": true }, + "audio": { + "driver": "dac_additive" + }, "dynamic_keymap": { "layer_count": 8 }, diff --git a/keyboards/zsa/moonlander/rules.mk b/keyboards/zsa/moonlander/rules.mk index 46375584890..10928ea0611 100644 --- a/keyboards/zsa/moonlander/rules.mk +++ b/keyboards/zsa/moonlander/rules.mk @@ -1,4 +1,3 @@ -AUDIO_DRIVER = dac_additive CUSTOM_MATRIX = lite # project specific files diff --git a/platforms/avr/drivers/ws2812_i2c.c b/platforms/avr/drivers/ws2812_i2c.c index 60b466c32a9..86a5ac8394e 100644 --- a/platforms/avr/drivers/ws2812_i2c.c +++ b/platforms/avr/drivers/ws2812_i2c.c @@ -1,7 +1,7 @@ #include "ws2812.h" #include "i2c_master.h" -#ifdef RGBW +#ifdef WS2812_RGBW # error "RGBW not supported" #endif diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c index 95a827e4b8a..41a5311719f 100644 --- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c +++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c @@ -161,7 +161,7 @@ static void ws2812_dma_callback(void* p, uint32_t ct) { // FIFO is already empty. rtcnt_t time_to_completion = (pio_sm_get_tx_fifo_level(pio, STATE_MACHINE) + 1) * MAX(WS2812_T1H + WS2812_T1L, WS2812_T0H + WS2812_T0L); -#if defined(RGBW) +#if defined(WS2812_RGBW) time_to_completion *= 32; #else time_to_completion *= 24; @@ -222,7 +222,7 @@ void ws2812_init(void) { sm_config_set_sideset(&config, 1, false, false); #endif -#if defined(RGBW) +#if defined(WS2812_RGBW) sm_config_set_out_shift(&config, false, true, 32); #else sm_config_set_out_shift(&config, false, true, 24); @@ -270,7 +270,7 @@ void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) { sync_ws2812_transfer(); for (int i = 0; i < leds; i++) { -#if defined(RGBW) +#if defined(WS2812_RGBW) WS2812_BUFFER[i] = rgbw8888_to_u32(ledarray[i].r, ledarray[i].g, ledarray[i].b, ledarray[i].w); #else WS2812_BUFFER[i] = rgbw8888_to_u32(ledarray[i].r, ledarray[i].g, ledarray[i].b, 0); diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c index 9ed6bacd5ad..96378ec0ac5 100644 --- a/platforms/chibios/drivers/ws2812_bitbang.c +++ b/platforms/chibios/drivers/ws2812_bitbang.c @@ -101,7 +101,7 @@ void ws2812_setleds(rgb_led_t *ledarray, uint16_t leds) { sendByte(ledarray[i].r); #endif -#ifdef RGBW +#ifdef WS2812_RGBW sendByte(ledarray[i].w); #endif } diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c index 7dc3414eade..1e9d2ebb410 100644 --- a/platforms/chibios/drivers/ws2812_pwm.c +++ b/platforms/chibios/drivers/ws2812_pwm.c @@ -16,7 +16,7 @@ /* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */ -#ifdef RGBW +#ifdef WS2812_RGBW # define WS2812_CHANNELS 4 #else # define WS2812_CHANNELS 3 @@ -262,7 +262,7 @@ # define WS2812_BLUE_BIT(led, bit) WS2812_BIT((led), 0, (bit)) #endif -#ifdef RGBW +#ifdef WS2812_RGBW /** * @brief Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given white bit * @@ -381,7 +381,7 @@ void ws2812_write_led_rgbw(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b, ws2812_frame_buffer[WS2812_RED_BIT(led_number, bit)] = ((r >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; ws2812_frame_buffer[WS2812_GREEN_BIT(led_number, bit)] = ((g >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; ws2812_frame_buffer[WS2812_BLUE_BIT(led_number, bit)] = ((b >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; -#ifdef RGBW +#ifdef WS2812_RGBW ws2812_frame_buffer[WS2812_WHITE_BIT(led_number, bit)] = ((w >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; #endif } @@ -390,7 +390,7 @@ void ws2812_write_led_rgbw(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b, // Setleds for standard RGB void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) { for (uint16_t i = 0; i < leds; i++) { -#ifdef RGBW +#ifdef WS2812_RGBW ws2812_write_led_rgbw(i, ledarray[i].r, ledarray[i].g, ledarray[i].b, ledarray[i].w); #else ws2812_write_led(i, ledarray[i].r, ledarray[i].g, ledarray[i].b); diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c index 5b990ccaa06..ad2e87781c4 100644 --- a/platforms/chibios/drivers/ws2812_spi.c +++ b/platforms/chibios/drivers/ws2812_spi.c @@ -76,7 +76,7 @@ #endif #define BYTES_FOR_LED_BYTE 4 -#ifdef RGBW +#ifdef WS2812_RGBW # define WS2812_CHANNELS 4 #else # define WS2812_CHANNELS 3 @@ -131,7 +131,7 @@ static void set_led_color_rgb(rgb_led_t color, int pos) { for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.r, j); #endif -#ifdef RGBW +#ifdef WS2812_RGBW for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 4 + j] = get_protocol_eq(color.w, j); #endif diff --git a/quantum/color.c b/quantum/color.c index 395383f428e..96d548a33cc 100644 --- a/quantum/color.c +++ b/quantum/color.c @@ -109,7 +109,7 @@ RGB hsv_to_rgb_nocie(HSV hsv) { return hsv_to_rgb_impl(hsv, false); } -#ifdef RGBW +#ifdef WS2812_RGBW void convert_rgb_to_rgbw(rgb_led_t *led) { // Determine lowest value in all three colors, put that into // the white channel and then shift all colors by that amount diff --git a/quantum/color.h b/quantum/color.h index 00a3bfb3f84..b6a9dd0641c 100644 --- a/quantum/color.h +++ b/quantum/color.h @@ -96,7 +96,7 @@ typedef struct PACKED rgb_led_t { uint8_t g; uint8_t r; #endif -#ifdef RGBW +#ifdef WS2812_RGBW uint8_t w; #endif } rgb_led_t; @@ -111,6 +111,6 @@ typedef struct PACKED HSV { RGB hsv_to_rgb(HSV hsv); RGB hsv_to_rgb_nocie(HSV hsv); -#ifdef RGBW +#ifdef WS2812_RGBW void convert_rgb_to_rgbw(rgb_led_t *led); #endif diff --git a/quantum/encoder.c b/quantum/encoder.c index 0a48ac9a07b..2ddbf3ee1e0 100644 --- a/quantum/encoder.c +++ b/quantum/encoder.c @@ -83,7 +83,7 @@ bool encoder_task(void) { } bool encoder_queue_full_advanced(encoder_events_t *events) { - return events->head == (events->tail - 1) % MAX_QUEUED_ENCODER_EVENTS; + return events->tail == (events->head + 1) % MAX_QUEUED_ENCODER_EVENTS; } bool encoder_queue_full(void) { diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c index 4370996d0e1..db3a2ef9e02 100644 --- a/quantum/rgb_matrix/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix/rgb_matrix_drivers.c @@ -185,7 +185,7 @@ static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) { rgb_matrix_ws2812_array[i].r = r; rgb_matrix_ws2812_array[i].g = g; rgb_matrix_ws2812_array[i].b = b; -# ifdef RGBW +# ifdef WS2812_RGBW convert_rgb_to_rgbw(&rgb_matrix_ws2812_array[i]); # endif } diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c index 62137c020bd..b0f2dfdc1d8 100644 --- a/quantum/rgblight/rgblight.c +++ b/quantum/rgblight/rgblight.c @@ -149,7 +149,7 @@ void setrgb(uint8_t r, uint8_t g, uint8_t b, rgb_led_t *led1) { led1->r = r; led1->g = g; led1->b = b; -#ifdef RGBW +#ifdef WS2812_RGBW led1->w = 0; #endif } @@ -652,7 +652,7 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) { led[i].r = r; led[i].g = g; led[i].b = b; -#ifdef RGBW +#ifdef WS2812_RGBW led[i].w = 0; #endif } @@ -667,7 +667,7 @@ void rgblight_setrgb_at(uint8_t r, uint8_t g, uint8_t b, uint8_t index) { led[index].r = r; led[index].g = g; led[index].b = b; -#ifdef RGBW +#ifdef WS2812_RGBW led[index].w = 0; #endif rgblight_set(); @@ -704,7 +704,7 @@ void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8 led[i].r = r; led[i].g = g; led[i].b = b; -#ifdef RGBW +#ifdef WS2812_RGBW led[i].w = 0; #endif } @@ -905,7 +905,7 @@ void rgblight_set(void) { led[i].r = 0; led[i].g = 0; led[i].b = 0; -#ifdef RGBW +#ifdef WS2812_RGBW led[i].w = 0; #endif } @@ -933,7 +933,7 @@ void rgblight_set(void) { start_led = led + rgblight_ranges.clipping_start_pos; #endif -#ifdef RGBW +#ifdef WS2812_RGBW for (uint8_t i = 0; i < num_leds; i++) { convert_rgb_to_rgbw(&start_led[i]); } @@ -1263,7 +1263,7 @@ void rgblight_effect_snake(animation_status_t *anim) { ledp->r = 0; ledp->g = 0; ledp->b = 0; -# ifdef RGBW +# ifdef WS2812_RGBW ledp->w = 0; # endif for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) { @@ -1323,7 +1323,7 @@ void rgblight_effect_knight(animation_status_t *anim) { led[i].r = 0; led[i].g = 0; led[i].b = 0; -# ifdef RGBW +# ifdef WS2812_RGBW led[i].w = 0; # endif } @@ -1337,7 +1337,7 @@ void rgblight_effect_knight(animation_status_t *anim) { led[cur].r = 0; led[cur].g = 0; led[cur].b = 0; -# ifdef RGBW +# ifdef WS2812_RGBW led[cur].w = 0; # endif }