From 2e01b67ecc4e36668098cb1bc4a5b63976d4c94d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:19:08 -0700 Subject: [PATCH 1/5] Data-Driven Keyboard Conversions: H, Part 1 (#23524) --- .../hadron/ver2/{info.json => keyboard.json} | 10 +++++++++- keyboards/hadron/ver2/rules.mk | 13 ------------ keyboards/hadron/ver3/info.json | 12 +++++++++++ keyboards/hadron/ver3/rules.mk | 16 --------------- keyboards/halfcliff/info.json | 5 +++++ keyboards/halfcliff/rules.mk | 16 --------------- .../hardwareabstraction/handwire/info.json | 8 +++++++- .../hardwareabstraction/handwire/rules.mk | 6 ------ keyboards/hazel/bad_wings/info.json | 5 ++++- keyboards/hazel/bad_wings/rules.mk | 4 ---- keyboards/hhkb/jp/info.json | 7 +++++++ keyboards/hhkb/jp/rules.mk | 7 ------- keyboards/hhkb/yang/info.json | 6 ++++++ keyboards/hhkb/yang/rules.mk | 10 ---------- keyboards/hillside/46/0_1/info.json | 3 +++ keyboards/hillside/46/0_1/rules.mk | 2 -- keyboards/hillside/48/0_1/info.json | 3 +++ keyboards/hillside/48/0_1/rules.mk | 2 -- keyboards/hillside/52/0_1/info.json | 3 +++ keyboards/hillside/52/0_1/rules.mk | 2 -- keyboards/hineybush/hbcp/info.json | 10 ++++++++++ keyboards/hineybush/hbcp/rules.mk | 12 ----------- .../horrortroll/handwired_k552/info.json | 9 +++++++++ keyboards/horrortroll/handwired_k552/rules.mk | 20 ------------------- keyboards/horrortroll/lemon40/info.json | 12 +++++++++++ keyboards/horrortroll/lemon40/rules.mk | 20 ------------------- keyboards/hotdox/info.json | 9 +++++++++ keyboards/hotdox/rules.mk | 13 ------------ keyboards/hs60/v1/info.json | 8 ++++++++ keyboards/hs60/v1/rules.mk | 14 ------------- keyboards/hs60/v2/ansi/info.json | 6 ++++++ keyboards/hs60/v2/ansi/rules.mk | 12 ----------- keyboards/hs60/v2/hhkb/info.json | 6 ++++++ keyboards/hs60/v2/hhkb/rules.mk | 12 ----------- keyboards/hs60/v2/iso/info.json | 6 ++++++ keyboards/hs60/v2/iso/rules.mk | 12 ----------- 36 files changed, 125 insertions(+), 196 deletions(-) rename keyboards/hadron/ver2/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/hadron/ver2/rules.mk diff --git a/keyboards/hadron/ver2/info.json b/keyboards/hadron/ver2/keyboard.json similarity index 79% rename from keyboards/hadron/ver2/info.json rename to keyboards/hadron/ver2/keyboard.json index fb1dc102b7e..fbb97f1c186 100644 --- a/keyboards/hadron/ver2/info.json +++ b/keyboards/hadron/ver2/keyboard.json @@ -27,5 +27,13 @@ "pin": "D4" }, "processor": "atmega32u4", - "bootloader": "halfkay" + "bootloader": "halfkay", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "oled": true + } } diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk deleted file mode 100644 index 188b4696f18..00000000000 --- a/keyboards/hadron/ver2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight -OLED_ENABLE = yes diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/info.json index 381a5dc5501..02a75d59eb8 100644 --- a/keyboards/hadron/ver3/info.json +++ b/keyboards/hadron/ver3/info.json @@ -35,5 +35,17 @@ }, "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "audio": true, + "rgblight": true, + "haptic": true, + "oled": true, + "encoder": true + }, "board": "QMK_PROTON_C" } diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk index edc5fa7d5bf..dea510c2ab3 100644 --- a/keyboards/hadron/ver3/rules.mk +++ b/keyboards/hadron/ver3/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -AUDIO_ENABLE = yes -RGBLIGHT_ENABLE = yes -RGB_MATRIX_ENABLE = no # once arm_rgb is implemented -HAPTIC_ENABLE = yes HAPTIC_DRIVER = drv2605l -OLED_ENABLE = yes -ENCODER_ENABLER = yes diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json index 225c5dcb37a..1f60537b249 100644 --- a/keyboards/halfcliff/info.json +++ b/keyboards/halfcliff/info.json @@ -29,6 +29,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/halfcliff/rules.mk b/keyboards/halfcliff/rules.mk index 425015c04d8..8784813b335 100644 --- a/keyboards/halfcliff/rules.mk +++ b/keyboards/halfcliff/rules.mk @@ -1,18 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -POINTING_DEVICE_ENABLE = no CUSTOM_MATRIX = yes -OLED_ENABLE = no - SRC += matrix.c diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/info.json index 6fa33228df8..5e0ec6f11e2 100644 --- a/keyboards/hardwareabstraction/handwire/info.json +++ b/keyboards/hardwareabstraction/handwire/info.json @@ -10,7 +10,13 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "haptic": true, + "oled": true, + "wpm": true + }, + "build": { + "lto": true }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], diff --git a/keyboards/hardwareabstraction/handwire/rules.mk b/keyboards/hardwareabstraction/handwire/rules.mk index 8a33a553313..a521203b326 100644 --- a/keyboards/hardwareabstraction/handwire/rules.mk +++ b/keyboards/hardwareabstraction/handwire/rules.mk @@ -1,7 +1 @@ -LTO_ENABLE = yes -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid - -OLED_ENABLE = yes - -WPM_ENABLE = yes diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/info.json index 070a69f6917..fef514c539f 100644 --- a/keyboards/hazel/bad_wings/info.json +++ b/keyboards/hazel/bad_wings/info.json @@ -18,7 +18,10 @@ "features": { "bootmagic": true, "deferred_exec": true, - "nkro": false + "nkro": false, + "pointing_device": true, + "tri_layer": true, + "caps_word": true }, "community_layouts": ["split_3x5_3"], "layouts": { diff --git a/keyboards/hazel/bad_wings/rules.mk b/keyboards/hazel/bad_wings/rules.mk index 47a188155fe..a49017527d7 100644 --- a/keyboards/hazel/bad_wings/rules.mk +++ b/keyboards/hazel/bad_wings/rules.mk @@ -1,10 +1,6 @@ -TRI_LAYER_ENABLE = yes -CAPS_WORD_ENABLE = yes - SRC += matrix.c SPI_DRIVER_REQUIRED = yes CUSTOM_MATRIX = lite POINTING_DEVICE_DRIVER = cirque_pinnacle_spi -POINTING_DEVICE_ENABLE = yes diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json index 589cf98dde4..d745f21d20b 100644 --- a/keyboards/hhkb/jp/info.json +++ b/keyboards/hhkb/jp/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "layouts": { "LAYOUT_jp": { "layout": [ diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk index 5c659643418..9e74e1cfb9a 100644 --- a/keyboards/hhkb/jp/rules.mk +++ b/keyboards/hhkb/jp/rules.mk @@ -1,14 +1,7 @@ # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration CUSTOM_MATRIX = yes # Custom matrix file for the HHKB -NKRO_ENABLE = no # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # project specific files SRC = matrix.c diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json index 24cd750e09c..a5725d6afaa 100644 --- a/keyboards/hhkb/yang/info.json +++ b/keyboards/hhkb/yang/info.json @@ -16,6 +16,12 @@ }, "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true + }, "debounce": 0, "community_layouts": ["60_hhkb"], "layouts": { diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk index 99f77d0c162..d8acce0a36b 100644 --- a/keyboards/hhkb/yang/rules.mk +++ b/keyboards/hhkb/yang/rules.mk @@ -1,16 +1,6 @@ # MCU frequency F_CPU = 8000000 -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # USB Nkey Rollover - # Custom matrix file for the HHKB CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json index 6dd45b06f08..7cb7150f3f2 100644 --- a/keyboards/hillside/46/0_1/info.json +++ b/keyboards/hillside/46/0_1/info.json @@ -16,6 +16,9 @@ {"pin_a": "F5", "pin_b": "F4"} ] }, + "build": { + "lto": true + }, "features": { "encoder": true, "extrakey": true, diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk index 093b81abfe0..89c84d8be9d 100644 --- a/keyboards/hillside/46/0_1/rules.mk +++ b/keyboards/hillside/46/0_1/rules.mk @@ -1,5 +1,3 @@ -LTO_ENABLE = yes # Use link time optimization for smaller firmware - # If you add a haptic board, # enable it and set its driver here or in your keymap folder # The Pimoroni board's driver is DRV2605L diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json index 4f565f5cdc6..b640bc0cbf2 100644 --- a/keyboards/hillside/48/0_1/info.json +++ b/keyboards/hillside/48/0_1/info.json @@ -16,6 +16,9 @@ {"pin_a": "F5", "pin_b": "F4"} ] }, + "build": { + "lto": true + }, "features": { "encoder": true, "extrakey": true, diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk index 093b81abfe0..89c84d8be9d 100644 --- a/keyboards/hillside/48/0_1/rules.mk +++ b/keyboards/hillside/48/0_1/rules.mk @@ -1,5 +1,3 @@ -LTO_ENABLE = yes # Use link time optimization for smaller firmware - # If you add a haptic board, # enable it and set its driver here or in your keymap folder # The Pimoroni board's driver is DRV2605L diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json index 2064ba617cc..0949fa9bb8e 100644 --- a/keyboards/hillside/52/0_1/info.json +++ b/keyboards/hillside/52/0_1/info.json @@ -16,6 +16,9 @@ {"pin_a": "F5", "pin_b": "F4"} ] }, + "build": { + "lto": true + }, "features": { "encoder": true, "extrakey": true, diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk index 093b81abfe0..89c84d8be9d 100644 --- a/keyboards/hillside/52/0_1/rules.mk +++ b/keyboards/hillside/52/0_1/rules.mk @@ -1,5 +1,3 @@ -LTO_ENABLE = yes # Use link time optimization for smaller firmware - # If you add a haptic board, # enable it and set its driver here or in your keymap folder # The Pimoroni board's driver is DRV2605L diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/info.json index ca92b3f4a52..ab36bfaea09 100644 --- a/keyboards/hineybush/hbcp/info.json +++ b/keyboards/hineybush/hbcp/info.json @@ -36,6 +36,16 @@ }, "processor": "at90usb1286", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/hineybush/hbcp/rules.mk b/keyboards/hineybush/hbcp/rules.mk index f60d6afa1e2..30ce5d293b7 100644 --- a/keyboards/hineybush/hbcp/rules.mk +++ b/keyboards/hineybush/hbcp/rules.mk @@ -1,14 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json index 6eb5cbd80ec..6bbfa86e124 100644 --- a/keyboards/horrortroll/handwired_k552/info.json +++ b/keyboards/horrortroll/handwired_k552/info.json @@ -48,6 +48,15 @@ "backing_size": 2048 } }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "oled": true, + "wpm": true + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/horrortroll/handwired_k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk index 6d6ec253db3..b2ab6eed6df 100644 --- a/keyboards/horrortroll/handwired_k552/rules.mk +++ b/keyboards/horrortroll/handwired_k552/rules.mk @@ -12,23 +12,3 @@ BOARD = STM32_F103_STM32DUINO BOOTLOADER_TYPE = stm32duino DFU_ARGS = -d 1EAF:0003 -a 2 -R DFU_SUFFIX_ARGS = -v 1EAF -p 0003 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# RGB Matrix enabled -RGB_MATRIX_ENABLE = yes - -# OLED enabled -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json index 7b0b1c394b3..6303fb70bba 100644 --- a/keyboards/horrortroll/lemon40/info.json +++ b/keyboards/horrortroll/lemon40/info.json @@ -32,6 +32,18 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgblight": true, + "oled": true, + "wpm": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/horrortroll/lemon40/rules.mk b/keyboards/horrortroll/lemon40/rules.mk index 9ac59719d8e..89d3a12a0b6 100644 --- a/keyboards/horrortroll/lemon40/rules.mk +++ b/keyboards/horrortroll/lemon40/rules.mk @@ -1,21 +1 @@ SRC += lib/bongocat.c - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# OLED enabled -OLED_ENABLE = yes -WPM_ENABLE = yes - -# Additional thing to reduce compiled size -LTO_ENABLE = yes diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/info.json index 8184588e5d7..5d2c3ec5acd 100644 --- a/keyboards/hotdox/info.json +++ b/keyboards/hotdox/info.json @@ -12,6 +12,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true, + "backlight": true, + "unicode": true + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/hotdox/rules.mk b/keyboards/hotdox/rules.mk index 8e11eeabe08..f5dfc77dd19 100644 --- a/keyboards/hotdox/rules.mk +++ b/keyboards/hotdox/rules.mk @@ -1,17 +1,4 @@ -# Build Options -# change yes to no to disable -# CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDone -UNICODE_ENABLE = yes # Unicode -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -SWAP_HANDS_ENABLE = no # Disable Onehand -RGBLIGHT_ENABLE = no # project specific files SRC = matrix.c \ diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json index f9d77c3513a..63fef233840 100644 --- a/keyboards/hs60/v1/info.json +++ b/keyboards/hs60/v1/info.json @@ -68,6 +68,14 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "raw": true + }, "community_layouts": ["60_ansi", "60_iso"], "layouts": { "LAYOUT_60_iso": { diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk index 7aa0a5ae51d..4af34f6e5bf 100644 --- a/keyboards/hs60/v1/rules.mk +++ b/keyboards/hs60/v1/rules.mk @@ -3,20 +3,6 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -RAW_ENABLE = yes - # Experimental features for zealcmd please do no enable #RAW_ENABLE = yes #USE_KEYMAPS_IN_EEPROM = yes diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/info.json index 0debcea8d1f..e0781ef54b5 100644 --- a/keyboards/hs60/v2/ansi/info.json +++ b/keyboards/hs60/v2/ansi/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "QMK_PROTON_C", "community_layouts": ["60_ansi"], "layouts": { diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk index 96e559f742e..611bb888bac 100644 --- a/keyboards/hs60/v2/ansi/rules.mk +++ b/keyboards/hs60/v2/ansi/rules.mk @@ -3,18 +3,6 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -AUDIO_ENABLE = no # Audio output - CIE1931_CURVE = yes # project specific files diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/info.json index 5323fe20f01..d9bc040e23c 100644 --- a/keyboards/hs60/v2/hhkb/info.json +++ b/keyboards/hs60/v2/hhkb/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "QMK_PROTON_C", "layouts": { "LAYOUT_60_hhkb": { diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk index 96e559f742e..611bb888bac 100644 --- a/keyboards/hs60/v2/hhkb/rules.mk +++ b/keyboards/hs60/v2/hhkb/rules.mk @@ -3,18 +3,6 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -AUDIO_ENABLE = no # Audio output - CIE1931_CURVE = yes # project specific files diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/info.json index c422ae2d727..a51dac05fa2 100644 --- a/keyboards/hs60/v2/iso/info.json +++ b/keyboards/hs60/v2/iso/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "QMK_PROTON_C", "community_layouts": ["60_iso"], "layouts": { diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk index 96e559f742e..611bb888bac 100644 --- a/keyboards/hs60/v2/iso/rules.mk +++ b/keyboards/hs60/v2/iso/rules.mk @@ -3,18 +3,6 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -AUDIO_ENABLE = no # Audio output - CIE1931_CURVE = yes # project specific files From 9c1662f8f9f28d185ccf0ce1dee084934c896367 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 15 Apr 2024 19:19:23 +0100 Subject: [PATCH 2/5] Migrate build target markers to keyboard.json - TUV (#23514) --- keyboards/tada68/config.h | 39 --------------- keyboards/tada68/{info.json => keyboard.json} | 14 ++++++ keyboards/tada68/keymaps/rgb/config.h | 2 +- keyboards/tada68/keymaps/rgb/rules.mk | 17 ------- keyboards/tada68/rules.mk | 13 ----- keyboards/takashicompany/compacx/config.h | 39 --------------- .../compacx/{info.json => keyboard.json} | 17 +++++++ keyboards/takashicompany/compacx/rules.mk | 14 ------ .../spreadwriter/{info.json => keyboard.json} | 6 +-- .../takashicompany/spreadwriter/rules.mk | 2 - keyboards/takashiski/hecomi/alpha/config.h | 47 ------------------- .../hecomi/alpha/{info.json => keyboard.json} | 15 ++++++ keyboards/takashiski/hecomi/alpha/rules.mk | 12 ----- .../telophase/{info.json => keyboard.json} | 8 ++++ keyboards/telophase/rules.mk | 14 ------ .../tkc/portico/{info.json => keyboard.json} | 7 +++ keyboards/tkc/portico/rules.mk | 16 +------ .../portico75/{info.json => keyboard.json} | 9 ++++ keyboards/tkc/portico75/keymaps/via/rules.mk | 1 + keyboards/tkc/portico75/rules.mk | 15 ------ keyboards/tkw/grandiceps/info.json | 14 +++++- .../rev2/{info.json => keyboard.json} | 0 keyboards/tkw/grandiceps/rules.mk | 17 ------- .../stoutgat/v1/{info.json => keyboard.json} | 7 +++ keyboards/tkw/stoutgat/v1/rules.mk | 14 ------ keyboards/tkw/stoutgat/v2/info.json | 8 ++++ keyboards/tkw/stoutgat/v2/rules.mk | 17 ------- .../alix40/{info.json => keyboard.json} | 8 ++++ keyboards/tokyokeyboard/alix40/rules.mk | 14 ------ .../rev1/{info.json => keyboard.json} | 6 +++ .../tominabox1/littlefoot_lx/rev1/rules.mk | 12 ----- .../rev2/{info.json => keyboard.json} | 6 +++ .../tominabox1/littlefoot_lx/rev2/rules.mk | 12 ----- .../tominabox1/underscore33/rev1/config.h | 21 --------- .../rev1/{info.json => keyboard.json} | 12 +++++ .../tominabox1/underscore33/rev1/rules.mk | 12 ----- .../tominabox1/underscore33/rev2/config.h | 21 --------- .../rev2/{info.json => keyboard.json} | 12 +++++ .../tominabox1/underscore33/rev2/rules.mk | 13 ----- keyboards/torn/{info.json => keyboard.json} | 8 ++++ keyboards/torn/rules.mk | 13 ----- keyboards/touchpad/config.h | 22 --------- .../touchpad/{info.json => keyboard.json} | 13 +++++ keyboards/touchpad/rules.mk | 12 ----- .../nanoboot/{info.json => keyboard.json} | 0 .../rp2040_ce/{info.json => keyboard.json} | 0 .../launch_pad/{info.json => keyboard.json} | 16 +++++++ keyboards/ungodly/launch_pad/rules.mk | 21 --------- .../classic_ultracl_post_2013/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../overnumpad_1xb/rules.mk | 16 ------- .../classic_ultracl_pre_2013/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../overnumpad_1xb/rules.mk | 16 ------- keyboards/unicomp/pc122/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../unicomp/pc122/overnumpad_1xb/rules.mk | 16 ------- .../unicomp/spacesaver_m_post_2013/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../overnumpad_1xb/rules.mk | 16 ------- .../unicomp/spacesaver_m_pre_2013/info.json | 5 +- .../{info.json => keyboard.json} | 7 +++ .../overnumpad_1xb/rules.mk | 16 ------- .../unison/v04/{info.json => keyboard.json} | 11 +++++ keyboards/unison/v04/rules.mk | 15 ------ .../uzu42/rev1/{info.json => keyboard.json} | 7 +++ keyboards/uzu42/{uzu42.c => rev1/rev1.c} | 0 keyboards/uzu42/rev1/rules.mk | 1 - keyboards/uzu42/rules.mk | 14 ------ .../v2/{info.json => keyboard.json} | 7 +++ keyboards/v4n4g0rth0n/v2/rules.mk | 13 ----- .../angle65/{info.json => keyboard.json} | 10 ++++ keyboards/vertex/angle65/rules.mk | 14 ------ .../minne_topre/{info.json => keyboard.json} | 3 -- .../{info.json => keyboard.json} | 0 .../osav2_topre/{info.json => keyboard.json} | 0 .../viktus/sp111/{info.json => keyboard.json} | 9 ++++ keyboards/viktus/sp111/rules.mk | 15 ------ .../styrka_topre/{info.json => keyboard.json} | 0 .../uncertainty/{info.json => keyboard.json} | 0 .../rev1/{info.json => keyboard.json} | 0 keyboards/vitamins_included/rev1/rules.mk | 1 - .../rev2/{info.json => keyboard.json} | 0 83 files changed, 284 insertions(+), 614 deletions(-) delete mode 100755 keyboards/tada68/config.h rename keyboards/tada68/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/takashicompany/compacx/config.h rename keyboards/takashicompany/compacx/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/takashicompany/compacx/rules.mk rename keyboards/takashicompany/spreadwriter/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/takashicompany/spreadwriter/rules.mk delete mode 100644 keyboards/takashiski/hecomi/alpha/config.h rename keyboards/takashiski/hecomi/alpha/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/takashiski/hecomi/alpha/rules.mk rename keyboards/telophase/{info.json => keyboard.json} (94%) rename keyboards/tkc/portico/{info.json => keyboard.json} (97%) rename keyboards/tkc/portico75/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/tkc/portico75/rules.mk rename keyboards/tkw/grandiceps/rev2/{info.json => keyboard.json} (100%) rename keyboards/tkw/stoutgat/v1/{info.json => keyboard.json} (99%) rename keyboards/tokyokeyboard/alix40/{info.json => keyboard.json} (95%) rename keyboards/tominabox1/littlefoot_lx/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/tominabox1/littlefoot_lx/rev1/rules.mk rename keyboards/tominabox1/littlefoot_lx/rev2/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/tominabox1/littlefoot_lx/rev2/rules.mk delete mode 100644 keyboards/tominabox1/underscore33/rev1/config.h rename keyboards/tominabox1/underscore33/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/tominabox1/underscore33/rev1/rules.mk delete mode 100644 keyboards/tominabox1/underscore33/rev2/config.h rename keyboards/tominabox1/underscore33/rev2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/tominabox1/underscore33/rev2/rules.mk rename keyboards/torn/{info.json => keyboard.json} (94%) rename keyboards/touchpad/{info.json => keyboard.json} (89%) rename keyboards/tweetydabird/lotus58/nanoboot/{info.json => keyboard.json} (100%) rename keyboards/tweetydabird/lotus58/rp2040_ce/{info.json => keyboard.json} (100%) rename keyboards/ungodly/launch_pad/{info.json => keyboard.json} (86%) rename keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/{info.json => keyboard.json} (85%) rename keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/{info.json => keyboard.json} (85%) rename keyboards/unicomp/pc122/overnumpad_1xb/{info.json => keyboard.json} (84%) rename keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/{info.json => keyboard.json} (84%) rename keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/{info.json => keyboard.json} (84%) rename keyboards/unison/v04/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/unison/v04/rules.mk rename keyboards/uzu42/rev1/{info.json => keyboard.json} (95%) rename keyboards/uzu42/{uzu42.c => rev1/rev1.c} (100%) delete mode 100644 keyboards/uzu42/rev1/rules.mk rename keyboards/v4n4g0rth0n/v2/{info.json => keyboard.json} (67%) rename keyboards/vertex/angle65/{info.json => keyboard.json} (96%) rename keyboards/viktus/minne_topre/{info.json => keyboard.json} (99%) rename keyboards/viktus/osav2_numpad_topre/{info.json => keyboard.json} (100%) rename keyboards/viktus/osav2_topre/{info.json => keyboard.json} (100%) rename keyboards/viktus/sp111/{info.json => keyboard.json} (99%) rename keyboards/viktus/styrka_topre/{info.json => keyboard.json} (100%) rename keyboards/vinhcatba/uncertainty/{info.json => keyboard.json} (100%) rename keyboards/vitamins_included/rev1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/vitamins_included/rev1/rules.mk rename keyboards/vitamins_included/rev2/{info.json => keyboard.json} (100%) diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h deleted file mode 100755 index b9449c4714b..00000000000 --- a/keyboards/tada68/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/tada68/info.json b/keyboards/tada68/keyboard.json similarity index 97% rename from keyboards/tada68/info.json rename to keyboards/tada68/keyboard.json index 1311017d361..641def01a31 100644 --- a/keyboards/tada68/info.json +++ b/keyboards/tada68/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0001", "device_version": "0.0.3" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "F6", "F7", "D5"] diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h index 21ddfa1850e..363a41accd6 100755 --- a/keyboards/tada68/keymaps/rgb/config.h +++ b/keyboards/tada68/keymaps/rgb/config.h @@ -1,4 +1,4 @@ -#include "../../config.h" +#pragma once /* WS2812B RGB Underglow LED */ #define WS2812_DI_PIN F5 // See readme.md for wiring your led's diff --git a/keyboards/tada68/keymaps/rgb/rules.mk b/keyboards/tada68/keymaps/rgb/rules.mk index 7cffca44fad..c777cb1b9ff 100644 --- a/keyboards/tada68/keymaps/rgb/rules.mk +++ b/keyboards/tada68/keymaps/rgb/rules.mk @@ -1,18 +1 @@ -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk index 01310bd4ea0..e22d5248895 100755 --- a/keyboards/tada68/rules.mk +++ b/keyboards/tada68/rules.mk @@ -1,15 +1,2 @@ # This board uses the older unsafe 6k version of lufa-ms BOOTLOADER_SIZE = 6144 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h deleted file mode 100644 index 7b4e38bd964..00000000000 --- a/keyboards/takashicompany/compacx/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 takashicompany - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/keyboard.json similarity index 94% rename from keyboards/takashicompany/compacx/info.json rename to keyboards/takashicompany/compacx/keyboard.json index 08dcbfee54b..b4460cce770 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/takashicompany/compacx/rules.mk b/keyboards/takashicompany/compacx/rules.mk deleted file mode 100644 index 25fcdc1a34c..00000000000 --- a/keyboards/takashicompany/compacx/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 -LTO_ENABLE = yes diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/keyboard.json similarity index 98% rename from keyboards/takashicompany/spreadwriter/info.json rename to keyboards/takashicompany/spreadwriter/keyboard.json index da5a95b8957..2c9fcd1619a 100644 --- a/keyboards/takashicompany/spreadwriter/info.json +++ b/keyboards/takashicompany/spreadwriter/keyboard.json @@ -6,11 +6,11 @@ "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "command": false, - "console": false, + "encoder": true, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"], diff --git a/keyboards/takashicompany/spreadwriter/rules.mk b/keyboards/takashicompany/spreadwriter/rules.mk deleted file mode 100644 index 248f19320f0..00000000000 --- a/keyboards/takashicompany/spreadwriter/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h deleted file mode 100644 index 1c14611b2b9..00000000000 --- a/keyboards/takashiski/hecomi/alpha/config.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright 2018 takashiski - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -//#define USE_I2C - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - -/* -#define USE_I2C -#define MASTER_LEFT -#define EEHANDS -*/ diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/keyboard.json similarity index 94% rename from keyboards/takashiski/hecomi/alpha/info.json rename to keyboards/takashiski/hecomi/alpha/keyboard.json index 767f787e5e3..0a6bf513f0c 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashiski/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk deleted file mode 100644 index 98c2f6b6a7f..00000000000 --- a/keyboards/takashiski/hecomi/alpha/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/telophase/info.json b/keyboards/telophase/keyboard.json similarity index 94% rename from keyboards/telophase/info.json rename to keyboards/telophase/keyboard.json index 2dd6c5dc783..8efbae55195 100644 --- a/keyboards/telophase/info.json +++ b/keyboards/telophase/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"], diff --git a/keyboards/telophase/rules.mk b/keyboards/telophase/rules.mk index 706d6106538..ae63f87e079 100644 --- a/keyboards/telophase/rules.mk +++ b/keyboards/telophase/rules.mk @@ -1,18 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite - -# project specific files SRC += matrix.c UART_DRIVER_REQUIRED = yes diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/keyboard.json similarity index 97% rename from keyboards/tkc/portico/info.json rename to keyboards/tkc/portico/keyboard.json index 4f908c83e62..29b7d8246b2 100644 --- a/keyboards/tkc/portico/info.json +++ b/keyboards/tkc/portico/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk index 6bc05372aff..4263ceb1684 100644 --- a/keyboards/tkc/portico/rules.mk +++ b/keyboards/tkc/portico/rules.mk @@ -1,22 +1,8 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC += keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c - -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/keyboard.json similarity index 96% rename from keyboards/tkc/portico75/info.json rename to keyboards/tkc/portico75/keyboard.json index fa2a24951fa..79ead697648 100644 --- a/keyboards/tkc/portico75/info.json +++ b/keyboards/tkc/portico75/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/tkc/portico75/keymaps/via/rules.mk b/keyboards/tkc/portico75/keymaps/via/rules.mk index 1706771222e..81628aba6ba 100644 --- a/keyboards/tkc/portico75/keymaps/via/rules.mk +++ b/keyboards/tkc/portico75/keymaps/via/rules.mk @@ -10,3 +10,4 @@ SRC += keyboards/wilba_tech/wt_main.c \ drivers/led/issi/is31fl3741.c I2C_DRIVER_REQUIRED = yes +CIE1931_CURVE = yes diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk deleted file mode 100644 index 36e22b992da..00000000000 --- a/keyboards/tkc/portico75/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -CIE1931_CURVE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index 7700780b2e8..507f4c47926 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -4,7 +4,19 @@ "maintainer": "vattern", "usb": { "vid": "0xFEED", - "pid": "0x7812" + "pid": "0x7812", + "shared_endpoint": { + "keyboard": true + } + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true }, "ws2812": { "pin": "B1", diff --git a/keyboards/tkw/grandiceps/rev2/info.json b/keyboards/tkw/grandiceps/rev2/keyboard.json similarity index 100% rename from keyboards/tkw/grandiceps/rev2/info.json rename to keyboards/tkw/grandiceps/rev2/keyboard.json diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 5b78d6fe55c..01fa5217635 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -1,20 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - SERIAL_DRIVER = usart -OLED_ENABLE = yes -OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE DEFAULT_FOLDER = tkw/grandiceps/rev1 diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/keyboard.json similarity index 99% rename from keyboards/tkw/stoutgat/v1/info.json rename to keyboards/tkw/stoutgat/v1/keyboard.json index 9d7a60a4b97..2dd46af4947 100644 --- a/keyboards/tkw/stoutgat/v1/info.json +++ b/keyboards/tkw/stoutgat/v1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x7811", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"], "rows": ["D1", "D0", "A0", "A1", "A2"] diff --git a/keyboards/tkw/stoutgat/v1/rules.mk b/keyboards/tkw/stoutgat/v1/rules.mk index 8dca0665f77..c2ee0bc86f9 100644 --- a/keyboards/tkw/stoutgat/v1/rules.mk +++ b/keyboards/tkw/stoutgat/v1/rules.mk @@ -1,16 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json index b1232f6816e..dbb227b0fdc 100644 --- a/keyboards/tkw/stoutgat/v2/info.json +++ b/keyboards/tkw/stoutgat/v2/info.json @@ -8,6 +8,14 @@ "pid": "0x7811", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "ws2812": { "pin": "B1", "driver": "pwm" diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk index 477d680add8..1a660af26c9 100644 --- a/keyboards/tkw/stoutgat/v2/rules.mk +++ b/keyboards/tkw/stoutgat/v2/rules.mk @@ -1,18 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output - -OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE - DEFAULT_FOLDER = tkw/stoutgat/v2/f411 diff --git a/keyboards/tokyokeyboard/alix40/info.json b/keyboards/tokyokeyboard/alix40/keyboard.json similarity index 95% rename from keyboards/tokyokeyboard/alix40/info.json rename to keyboards/tokyokeyboard/alix40/keyboard.json index 7b2f198e596..e4c27aaec21 100644 --- a/keyboards/tokyokeyboard/alix40/info.json +++ b/keyboards/tokyokeyboard/alix40/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4134", "device_version": "0.0.1" }, + "features": { + "bluetooth": true, + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D0", "D1", "D2", "D3", "D5", "D6"], "rows": ["D7", "C6", "C7", "B5"] diff --git a/keyboards/tokyokeyboard/alix40/rules.mk b/keyboards/tokyokeyboard/alix40/rules.mk index 5d6d78ae10a..3437a35bdf1 100644 --- a/keyboards/tokyokeyboard/alix40/rules.mk +++ b/keyboards/tokyokeyboard/alix40/rules.mk @@ -1,16 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = yes diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/info.json b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json similarity index 97% rename from keyboards/tominabox1/littlefoot_lx/rev1/info.json rename to keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json index be22362de21..b021ba9c8d4 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev1/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6C78", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "E2", "F5", "F6", "F7", "B6", "B5", "B4"], "rows": ["D5", "F4", "D3", "F1", "F0"] diff --git a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk deleted file mode 100644 index 964fd155399..00000000000 --- a/keyboards/tominabox1/littlefoot_lx/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/info.json b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json similarity index 97% rename from keyboards/tominabox1/littlefoot_lx/rev2/info.json rename to keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json index 6a48b5076b4..fe1cf6e5960 100644 --- a/keyboards/tominabox1/littlefoot_lx/rev2/info.json +++ b/keyboards/tominabox1/littlefoot_lx/rev2/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6C78", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "C7", "F5", "F6", "F7", "B6", "B5", "B4"], "rows": ["D5", "F4", "D3", "F1", "F0"] diff --git a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk b/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk deleted file mode 100644 index 964fd155399..00000000000 --- a/keyboards/tominabox1/littlefoot_lx/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/tominabox1/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h deleted file mode 100644 index 333d0a100eb..00000000000 --- a/keyboards/tominabox1/underscore33/rev1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/tominabox1/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/keyboard.json similarity index 95% rename from keyboards/tominabox1/underscore33/rev1/info.json rename to keyboards/tominabox1/underscore33/rev1/keyboard.json index c52c1b13730..221ecccb041 100644 --- a/keyboards/tominabox1/underscore33/rev1/info.json +++ b/keyboards/tominabox1/underscore33/rev1/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x3301", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "B5", "D5", "F7", "B1", "F4", "B3", "D7", "B0", "B2"], "rows": ["F5", "F6", "C6", "D0"] diff --git a/keyboards/tominabox1/underscore33/rev1/rules.mk b/keyboards/tominabox1/underscore33/rev1/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/tominabox1/underscore33/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/tominabox1/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h deleted file mode 100644 index 333d0a100eb..00000000000 --- a/keyboards/tominabox1/underscore33/rev2/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/tominabox1/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/keyboard.json similarity index 95% rename from keyboards/tominabox1/underscore33/rev2/info.json rename to keyboards/tominabox1/underscore33/rev2/keyboard.json index b9c8b87b502..4375116963f 100644 --- a/keyboards/tominabox1/underscore33/rev2/info.json +++ b/keyboards/tominabox1/underscore33/rev2/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x3302", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 12, "animations": { diff --git a/keyboards/tominabox1/underscore33/rev2/rules.mk b/keyboards/tominabox1/underscore33/rev2/rules.mk deleted file mode 100644 index dd8f1a5ae7d..00000000000 --- a/keyboards/tominabox1/underscore33/rev2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/torn/info.json b/keyboards/torn/keyboard.json similarity index 94% rename from keyboards/torn/info.json rename to keyboards/torn/keyboard.json index c1b83188f06..162e7d08c0e 100644 --- a/keyboards/torn/info.json +++ b/keyboards/torn/keyboard.json @@ -9,6 +9,14 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": false, + "encoder": true, + "extrakey": false, + "mousekey": false, + "oled": true, + "wpm": true + }, "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1"} diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk index f855a651a55..213b5db8ab8 100644 --- a/keyboards/torn/rules.mk +++ b/keyboards/torn/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder -OLED_ENABLE = yes -WPM_ENABLE = yes CUSTOM_MATRIX = lite SRC += matrix.c \ diff --git a/keyboards/touchpad/config.h b/keyboards/touchpad/config.h index d499fb795c3..f6f58cc5a12 100644 --- a/keyboards/touchpad/config.h +++ b/keyboards/touchpad/config.h @@ -17,28 +17,6 @@ along with this program. If not, see . #pragma once - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 6 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/touchpad/info.json b/keyboards/touchpad/keyboard.json similarity index 89% rename from keyboards/touchpad/info.json rename to keyboards/touchpad/keyboard.json index 7b3cc0950d9..5429b5844db 100644 --- a/keyboards/touchpad/info.json +++ b/keyboards/touchpad/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0DB8", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/touchpad/rules.mk b/keyboards/touchpad/rules.mk index b9fb83c48c7..42be966784a 100644 --- a/keyboards/touchpad/rules.mk +++ b/keyboards/touchpad/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lotus58/nanoboot/info.json rename to keyboards/tweetydabird/lotus58/nanoboot/keyboard.json diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json similarity index 100% rename from keyboards/tweetydabird/lotus58/rp2040_ce/info.json rename to keyboards/tweetydabird/lotus58/rp2040_ce/keyboard.json diff --git a/keyboards/ungodly/launch_pad/info.json b/keyboards/ungodly/launch_pad/keyboard.json similarity index 86% rename from keyboards/ungodly/launch_pad/info.json rename to keyboards/ungodly/launch_pad/keyboard.json index d9d0ea30edd..50b6c2bcbf6 100644 --- a/keyboards/ungodly/launch_pad/info.json +++ b/keyboards/ungodly/launch_pad/keyboard.json @@ -8,6 +8,22 @@ "pid": "0x4C50", "device_version": "99.9.9" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": true, + "oled": true, + "rgb_matrix": true, + "magic": false, + "grave_esc": false, + "space_cadet": false + }, "rgb_matrix": { "animations": { "gradient_left_right": true, diff --git a/keyboards/ungodly/launch_pad/rules.mk b/keyboards/ungodly/launch_pad/rules.mk index 31fabc928ca..cc588202788 100644 --- a/keyboards/ungodly/launch_pad/rules.mk +++ b/keyboards/ungodly/launch_pad/rules.mk @@ -1,22 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -MIDI_ENABLE = yes -OLED_ENABLE = yes -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes -SPACE_CADET_ENABLE = no -MAGIC_ENABLE = no -GRAVE_ESC_ENABLE = no -LTO_ENABLE = yes - ANALOG_DRIVER_REQUIRED = yes diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json index f92299e9fa4..98138b87dd7 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json similarity index 85% rename from keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json index 13615db22d4..0ef2cc4d5ed 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "maintainer": "purdeaandrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json index a8dcd9418fb..3072222ea6e 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "community_layouts": ["fullsize_ansi", "fullsize_iso"], "layouts": { diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json similarity index 85% rename from keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json index 1c2f5b300bd..30264dd537d 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json index 162495c25b8..0847f665043 100644 --- a/keyboards/unicomp/pc122/info.json +++ b/keyboards/unicomp/pc122/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/info.json b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json similarity index 84% rename from keyboards/unicomp/pc122/overnumpad_1xb/info.json rename to keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json index 16e39168231..936e286af1d 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/info.json +++ b/keyboards/unicomp/pc122/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C11", "num_lock": "C12", diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/pc122/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json index 52eb4d80368..f5d783b1265 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json similarity index 84% rename from keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json index cf25addc9e2..9fd91ce48fc 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json index 166baaca416..6ac69a66aab 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json @@ -5,7 +5,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json similarity index 84% rename from keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json rename to keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json index 31fc97a527f..db772e46e24 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/info.json +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/keyboard.json @@ -3,6 +3,13 @@ "manufacturer": "Unicomp/Purdea Andrei", "url": "https://github.com/purdeaandrei/overnumpad_controller_1xb", "maintainer": "purdeaandrei", + "features": { + "bootmagic": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": false + }, "indicators": { "caps_lock": "C12" }, diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk +++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/rules.mk @@ -1,17 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/keyboard.json similarity index 97% rename from keyboards/unison/v04/info.json rename to keyboards/unison/v04/keyboard.json index 7b182df2515..14f495aa2ca 100644 --- a/keyboards/unison/v04/info.json +++ b/keyboards/unison/v04/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x176A", "device_version": "0.4.0" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "encoder": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"], "rows": ["B3", "E6", "F1", "F5", "F7", "B2", "F0", "F4", "F6", "C7"] diff --git a/keyboards/unison/v04/rules.mk b/keyboards/unison/v04/rules.mk deleted file mode 100644 index b4fc6e0d29e..00000000000 --- a/keyboards/unison/v04/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no # Rotary Encoder - -LTO_ENABLE = yes diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/keyboard.json similarity index 95% rename from keyboards/uzu42/rev1/info.json rename to keyboards/uzu42/rev1/keyboard.json index c7d6f7159bb..71d9f424cc8 100644 --- a/keyboards/uzu42/rev1/info.json +++ b/keyboards/uzu42/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/rev1/rev1.c similarity index 100% rename from keyboards/uzu42/uzu42.c rename to keyboards/uzu42/rev1/rev1.c diff --git a/keyboards/uzu42/rev1/rules.mk b/keyboards/uzu42/rev1/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/uzu42/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/uzu42/rules.mk b/keyboards/uzu42/rules.mk index 49b64b12745..277e74b7153 100644 --- a/keyboards/uzu42/rules.mk +++ b/keyboards/uzu42/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -OLED_ENABLE = no # OLED display - DEFAULT_FOLDER = uzu42/rev1 diff --git a/keyboards/v4n4g0rth0n/v2/info.json b/keyboards/v4n4g0rth0n/v2/keyboard.json similarity index 67% rename from keyboards/v4n4g0rth0n/v2/info.json rename to keyboards/v4n4g0rth0n/v2/keyboard.json index 6959188be9a..c43848178f2 100644 --- a/keyboards/v4n4g0rth0n/v2/info.json +++ b/keyboards/v4n4g0rth0n/v2/keyboard.json @@ -2,6 +2,13 @@ "usb": { "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D5", "F7", "F6", "E6", "F5", "F4", "F1", "B0"], "rows": ["C7", "C6", "B6", "B5", "B7"] diff --git a/keyboards/v4n4g0rth0n/v2/rules.mk b/keyboards/v4n4g0rth0n/v2/rules.mk index 01145044866..cc588202788 100644 --- a/keyboards/v4n4g0rth0n/v2/rules.mk +++ b/keyboards/v4n4g0rth0n/v2/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - ANALOG_DRIVER_REQUIRED = yes diff --git a/keyboards/vertex/angle65/info.json b/keyboards/vertex/angle65/keyboard.json similarity index 96% rename from keyboards/vertex/angle65/info.json rename to keyboards/vertex/angle65/keyboard.json index 096e89555aa..962b3fd4f11 100644 --- a/keyboards/vertex/angle65/info.json +++ b/keyboards/vertex/angle65/keyboard.json @@ -9,6 +9,16 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "haptic": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "matrix_pins": { diff --git a/keyboards/vertex/angle65/rules.mk b/keyboards/vertex/angle65/rules.mk index 330f6ff76b8..a521203b326 100644 --- a/keyboards/vertex/angle65/rules.mk +++ b/keyboards/vertex/angle65/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/keyboard.json similarity index 99% rename from keyboards/viktus/minne_topre/info.json rename to keyboards/viktus/minne_topre/keyboard.json index 7928430015d..6919e7f9ccd 100644 --- a/keyboards/viktus/minne_topre/info.json +++ b/keyboards/viktus/minne_topre/keyboard.json @@ -18,9 +18,6 @@ "mousekey": true, "nkro": true }, - "bootmagic": { - "matrix": [0, 0] - }, "build": { "lto": true }, diff --git a/keyboards/viktus/osav2_numpad_topre/info.json b/keyboards/viktus/osav2_numpad_topre/keyboard.json similarity index 100% rename from keyboards/viktus/osav2_numpad_topre/info.json rename to keyboards/viktus/osav2_numpad_topre/keyboard.json diff --git a/keyboards/viktus/osav2_topre/info.json b/keyboards/viktus/osav2_topre/keyboard.json similarity index 100% rename from keyboards/viktus/osav2_topre/info.json rename to keyboards/viktus/osav2_topre/keyboard.json diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/keyboard.json similarity index 99% rename from keyboards/viktus/sp111/info.json rename to keyboards/viktus/sp111/keyboard.json index 67f5b63bcaf..a309c14afe3 100644 --- a/keyboards/viktus/sp111/info.json +++ b/keyboards/viktus/sp111/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x5111", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk index 1be8c7ad68a..d9b01484992 100644 --- a/keyboards/viktus/sp111/rules.mk +++ b/keyboards/viktus/sp111/rules.mk @@ -1,18 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Smaller (and slightly faster) firmware - - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/viktus/styrka_topre/info.json b/keyboards/viktus/styrka_topre/keyboard.json similarity index 100% rename from keyboards/viktus/styrka_topre/info.json rename to keyboards/viktus/styrka_topre/keyboard.json diff --git a/keyboards/vinhcatba/uncertainty/info.json b/keyboards/vinhcatba/uncertainty/keyboard.json similarity index 100% rename from keyboards/vinhcatba/uncertainty/info.json rename to keyboards/vinhcatba/uncertainty/keyboard.json diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/keyboard.json similarity index 100% rename from keyboards/vitamins_included/rev1/info.json rename to keyboards/vitamins_included/rev1/keyboard.json diff --git a/keyboards/vitamins_included/rev1/rules.mk b/keyboards/vitamins_included/rev1/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/vitamins_included/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/keyboard.json similarity index 100% rename from keyboards/vitamins_included/rev2/info.json rename to keyboards/vitamins_included/rev2/keyboard.json From 3c9dd3680991479a70de9f68c1cf2f8af788dad6 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:22:31 -0700 Subject: [PATCH 3/5] Data-Driven Keyboard Conversions: H, Part 2 (#23525) --- keyboards/handwired/108key_trackpoint/info.json | 10 ++++++++++ keyboards/handwired/108key_trackpoint/rules.mk | 14 -------------- .../handwired/10k/{info.json => keyboard.json} | 3 +++ keyboards/handwired/10k/rules.mk | 1 - keyboards/handwired/42/info.json | 7 +++++++ keyboards/handwired/42/rules.mk | 15 --------------- keyboards/handwired/aball/info.json | 6 ++++++ keyboards/handwired/aball/rules.mk | 15 --------------- .../handwired/battleship_gamepad/info.json | 7 +++++++ keyboards/handwired/battleship_gamepad/rules.mk | 13 ------------- keyboards/handwired/bdn9_ble/info.json | 9 +++++++++ keyboards/handwired/bdn9_ble/rules.mk | 15 --------------- .../bento/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/bento/rev1/rules.mk | 13 ------------- keyboards/handwired/cyberstar/info.json | 7 +++++++ keyboards/handwired/cyberstar/rules.mk | 13 ------------- keyboards/handwired/d48/info.json | 12 ++++++++++++ keyboards/handwired/d48/rules.mk | 17 ----------------- keyboards/handwired/dactyl/info.json | 8 ++++++++ keyboards/handwired/dactyl/rules.mk | 15 +-------------- .../6x6/blackpill_f411/info.json | 7 +++++++ .../dactyl_manuform/6x6/blackpill_f411/rules.mk | 13 ------------- .../dactyl_manuform/6x6/promicro/keyboard.json | 8 +++++++- .../handwired/dactyl_manuform/6x6/rules.mk | 13 ------------- keyboards/handwired/datahand/info.json | 8 ++++++++ keyboards/handwired/datahand/rules.mk | 13 +------------ keyboards/handwired/dqz11n1g/info.json | 7 +++++++ keyboards/handwired/dqz11n1g/rules.mk | 14 -------------- keyboards/handwired/dygma/raise/info.json | 6 ++++++ keyboards/handwired/dygma/raise/rules.mk | 13 ------------- keyboards/handwired/frenchdev/info.json | 8 ++++++++ keyboards/handwired/frenchdev/rules.mk | 14 +------------- keyboards/handwired/fruity60/info.json | 7 +++++++ keyboards/handwired/fruity60/rules.mk | 14 -------------- .../{info.json => keyboard.json} | 12 +++++++++++- keyboards/handwired/hacked_motospeed/rules.mk | 14 -------------- keyboards/handwired/lagrange/info.json | 10 ++++++++++ keyboards/handwired/lagrange/rules.mk | 15 --------------- keyboards/handwired/m40/5x5_macropad/info.json | 6 ++++++ keyboards/handwired/m40/5x5_macropad/rules.mk | 15 +-------------- .../f401/{info.json => keyboard.json} | 12 ++++++++++++ keyboards/handwired/macroboard/f401/rules.mk | 13 ------------- keyboards/handwired/macroboard/f411/info.json | 13 +++++++++++++ keyboards/handwired/macroboard/f411/rules.mk | 13 ------------- keyboards/handwired/meck_tkl/info.json | 7 +++++++ keyboards/handwired/meck_tkl/rules.mk | 12 ------------ .../myskeeb/{info.json => keyboard.json} | 10 +++++++++- keyboards/handwired/myskeeb/rules.mk | 14 -------------- 48 files changed, 200 insertions(+), 320 deletions(-) rename keyboards/handwired/10k/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/10k/rules.mk rename keyboards/handwired/bento/rev1/{info.json => keyboard.json} (87%) delete mode 100644 keyboards/handwired/bento/rev1/rules.mk rename keyboards/handwired/hacked_motospeed/{info.json => keyboard.json} (91%) delete mode 100644 keyboards/handwired/hacked_motospeed/rules.mk rename keyboards/handwired/macroboard/f401/{info.json => keyboard.json} (56%) delete mode 100644 keyboards/handwired/macroboard/f401/rules.mk rename keyboards/handwired/myskeeb/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/myskeeb/rules.mk diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json index 605c77875d2..396b4c33cb5 100644 --- a/keyboards/handwired/108key_trackpoint/info.json +++ b/keyboards/handwired/108key_trackpoint/info.json @@ -15,6 +15,16 @@ "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "ps2_mouse": true, + "ps2": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/108key_trackpoint/rules.mk b/keyboards/handwired/108key_trackpoint/rules.mk index acdf7bf3932..74035c9903b 100644 --- a/keyboards/handwired/108key_trackpoint/rules.mk +++ b/keyboards/handwired/108key_trackpoint/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -PS2_MOUSE_ENABLE = yes -PS2_ENABLE = yes PS2_DRIVER = usart diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/keyboard.json similarity index 97% rename from keyboards/handwired/10k/info.json rename to keyboards/handwired/10k/keyboard.json index 9b0164ed85e..a3293601e3a 100644 --- a/keyboards/handwired/10k/info.json +++ b/keyboards/handwired/10k/keyboard.json @@ -7,6 +7,9 @@ "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["B6"] }, + "build": { + "lto": true + }, "features": { "bootmagic": false, "command": false, diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/handwired/10k/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json index e2cc8dbf716..d68dcd1ec2f 100644 --- a/keyboards/handwired/42/info.json +++ b/keyboards/handwired/42/info.json @@ -21,6 +21,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "bluetooth": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk index 0c5b506f63f..3437a35bdf1 100644 --- a/keyboards/handwired/42/rules.mk +++ b/keyboards/handwired/42/rules.mk @@ -1,17 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json index 173abdfb60a..6ab686c5186 100644 --- a/keyboards/handwired/aball/info.json +++ b/keyboards/handwired/aball/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": false, + "pointing_device": true + }, "matrix_pins": { "direct": [ [null] diff --git a/keyboards/handwired/aball/rules.mk b/keyboards/handwired/aball/rules.mk index d5e8e6ab985..84de35aeb14 100644 --- a/keyboards/handwired/aball/rules.mk +++ b/keyboards/handwired/aball/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Add trackball support -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = adns9800 diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json index 06ef96ba21e..3b4010ce40c 100644 --- a/keyboards/handwired/battleship_gamepad/info.json +++ b/keyboards/handwired/battleship_gamepad/info.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "joystick": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/battleship_gamepad/rules.mk b/keyboards/handwired/battleship_gamepad/rules.mk index a41273f8900..c5ab560bca9 100644 --- a/keyboards/handwired/battleship_gamepad/rules.mk +++ b/keyboards/handwired/battleship_gamepad/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -JOYSTICK_ENABLE = yes JOYSTICK_DRIVER = analog diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json index e5c94794537..76d9e42f83c 100644 --- a/keyboards/handwired/bdn9_ble/info.json +++ b/keyboards/handwired/bdn9_ble/info.json @@ -18,6 +18,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true, + "bluetooth": true + }, "matrix_pins": { "direct": [ ["D1", "D0", "C6"], diff --git a/keyboards/handwired/bdn9_ble/rules.mk b/keyboards/handwired/bdn9_ble/rules.mk index 0dafe2f289e..3437a35bdf1 100644 --- a/keyboards/handwired/bdn9_ble/rules.mk +++ b/keyboards/handwired/bdn9_ble/rules.mk @@ -1,17 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/keyboard.json similarity index 87% rename from keyboards/handwired/bento/rev1/info.json rename to keyboards/handwired/bento/rev1/keyboard.json index 6730c14a361..3baa7d77ce4 100644 --- a/keyboards/handwired/bento/rev1/info.json +++ b/keyboards/handwired/bento/rev1/keyboard.json @@ -36,6 +36,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "direct": [ ["D7", "B1", "D2"], diff --git a/keyboards/handwired/bento/rev1/rules.mk b/keyboards/handwired/bento/rev1/rules.mk deleted file mode 100644 index 6a4a0677378..00000000000 --- a/keyboards/handwired/bento/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json index 6b2db46b1f0..344c576462d 100644 --- a/keyboards/handwired/cyberstar/info.json +++ b/keyboards/handwired/cyberstar/info.json @@ -36,6 +36,13 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space_split_bs" }, diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk index cc9d7bb3f53..0ab54aaaf71 100644 --- a/keyboards/handwired/cyberstar/rules.mk +++ b/keyboards/handwired/cyberstar/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json index 295fead5879..e5ee61093e9 100644 --- a/keyboards/handwired/d48/info.json +++ b/keyboards/handwired/d48/info.json @@ -44,6 +44,18 @@ }, "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "nkro": true, + "audio": true, + "rgblight": true, + "encoder": true, + "oled": true, + "unicode": true + }, "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk index 7fa8dfdd340..62866f887a6 100644 --- a/keyboards/handwired/d48/rules.mk +++ b/keyboards/handwired/d48/rules.mk @@ -1,18 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes -USE_I2C = no -RGBLIGHT_ENABLE = yes -ENCODER_ENABLE = yes -OLED_ENABLE = yes -UNICODE_ENABLE = yes - SRC += ds1307.c taphold.c diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json index e95c380d9c0..339119e6fd4 100644 --- a/keyboards/handwired/dactyl/info.json +++ b/keyboards/handwired/dactyl/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "unicode": true, + "swap_hands": true + }, "debounce": 15, "tapping": { "toggle": 1 diff --git a/keyboards/handwired/dactyl/rules.mk b/keyboards/handwired/dactyl/rules.mk index bffd901b04d..35b5df19738 100644 --- a/keyboards/handwired/dactyl/rules.mk +++ b/keyboards/handwired/dactyl/rules.mk @@ -1,17 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -POINTING_DEVICE_ENABLE = no -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -CUSTOM_MATRIX = yes # Custom matrix file for the Dactyl -NKRO_ENABLE = yes # Enable N-Key Rollover -UNICODE_ENABLE = yes # Unicode -SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard -RGBLIGHT_ENABLE = no +CUSTOM_MATRIX = yes # project specific files I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json index 905ed5cc3fe..9ab62df2373 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json @@ -12,5 +12,12 @@ }, "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk index c6228f59ed7..c018471cadc 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # split settings # https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver SERIAL_DRIVER = usart diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json index e9b1152d664..0ec00196ba5 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json @@ -15,5 +15,11 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + } } diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk index 389d7509f00..29194b429ef 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = handwired/dactyl_manuform/6x6/promicro diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json index 372619565da..96e49388dc8 100644 --- a/keyboards/handwired/datahand/info.json +++ b/keyboards/handwired/datahand/info.json @@ -11,6 +11,14 @@ }, "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/datahand/rules.mk b/keyboards/handwired/datahand/rules.mk index 447e7fdc02c..a0a4f497e13 100644 --- a/keyboards/handwired/datahand/rules.mk +++ b/keyboards/handwired/datahand/rules.mk @@ -1,15 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -CUSTOM_MATRIX = yes # We definitely have a nonstandard matrix +CUSTOM_MATRIX = yes # Project specific files SRC = matrix.c diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json index 4df41850109..4e45a5a920c 100644 --- a/keyboards/handwired/dqz11n1g/info.json +++ b/keyboards/handwired/dqz11n1g/info.json @@ -15,6 +15,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "audio": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/dqz11n1g/rules.mk b/keyboards/handwired/dqz11n1g/rules.mk index 220e353ab77..d998c6a8843 100644 --- a/keyboards/handwired/dqz11n1g/rules.mk +++ b/keyboards/handwired/dqz11n1g/rules.mk @@ -2,17 +2,3 @@ CUSTOM_MATRIX = lite SRC += matrix.c SPI_DRIVER_REQUIRED = yes - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output - diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json index b9bcd2e639c..112a8a6abe2 100644 --- a/keyboards/handwired/dygma/raise/info.json +++ b/keyboards/handwired/dygma/raise/info.json @@ -26,6 +26,12 @@ }, "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "board": "BLACKPILL_STM32_F411", "debounce": 0 } diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk index ecf156629aa..7a078c9757b 100644 --- a/keyboards/handwired/dygma/raise/rules.mk +++ b/keyboards/handwired/dygma/raise/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes CUSTOM_MATRIX = lite # TODO(ibash) we don't actually need to enable raw, but there's some side effect diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json index 8d031b3c42f..ab811888a9a 100644 --- a/keyboards/handwired/frenchdev/info.json +++ b/keyboards/handwired/frenchdev/info.json @@ -9,6 +9,14 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk index e226d0b5172..9b396b76686 100644 --- a/keyboards/handwired/frenchdev/rules.mk +++ b/keyboards/handwired/frenchdev/rules.mk @@ -1,16 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -CUSTOM_MATRIX = yes # Custom matrix file (taken and adapted from the ErgoDox EZ to handle custom number of columns) -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no +CUSTOM_MATRIX = yes # project specific files SRC = matrix.c diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json index 34b1edc8207..4984f3fc03c 100644 --- a/keyboards/handwired/fruity60/info.json +++ b/keyboards/handwired/fruity60/info.json @@ -18,6 +18,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "bluetooth": true + }, "community_layouts": ["60_tsangan_hhkb"], "layouts": { "LAYOUT_60_tsangan_hhkb": { diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk index 79e2ef4eff9..3437a35bdf1 100644 --- a/keyboards/handwired/fruity60/rules.mk +++ b/keyboards/handwired/fruity60/rules.mk @@ -1,16 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/keyboard.json similarity index 91% rename from keyboards/handwired/hacked_motospeed/info.json rename to keyboards/handwired/hacked_motospeed/keyboard.json index 899bd58bcbf..af76a4dd769 100644 --- a/keyboards/handwired/hacked_motospeed/info.json +++ b/keyboards/handwired/hacked_motospeed/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x0690", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "bluetooth": { "driver": "rn42" @@ -21,6 +22,15 @@ }, "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "backlight": true, + "bluetooth": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/hacked_motospeed/rules.mk b/keyboards/handwired/hacked_motospeed/rules.mk deleted file mode 100644 index 362a7fadbed..00000000000 --- a/keyboards/handwired/hacked_motospeed/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json index 0c968c419d8..d7ad47355ab 100644 --- a/keyboards/handwired/lagrange/info.json +++ b/keyboards/handwired/lagrange/info.json @@ -20,6 +20,9 @@ "cols": ["C7", "F7", "F6", "F5", "F4", "F1"], "rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"] } + }, + "transport": { + "protocol": "custom" } }, "indicators": { @@ -28,6 +31,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "unicode": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/lagrange/rules.mk b/keyboards/handwired/lagrange/rules.mk index 256826f7fcc..1f2175e9cbf 100644 --- a/keyboards/handwired/lagrange/rules.mk +++ b/keyboards/handwired/lagrange/rules.mk @@ -1,17 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes -SPLIT_TRANSPORT = custom - SRC += transport.c SPI_DRIVER_REQUIRED = yes diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json index 41342fc2ec6..b4bc53afc54 100644 --- a/keyboards/handwired/m40/5x5_macropad/info.json +++ b/keyboards/handwired/m40/5x5_macropad/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "layouts": { "LAYOUT_ortho_5x5": { "layout": [ diff --git a/keyboards/handwired/m40/5x5_macropad/rules.mk b/keyboards/handwired/m40/5x5_macropad/rules.mk index fe66abc8493..4df55cd2206 100644 --- a/keyboards/handwired/m40/5x5_macropad/rules.mk +++ b/keyboards/handwired/m40/5x5_macropad/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware AUDIO_SUPPORTED = no -BACKLIGHT_SUPPORTED = no \ No newline at end of file +BACKLIGHT_SUPPORTED = no diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/keyboard.json similarity index 56% rename from keyboards/handwired/macroboard/f401/info.json rename to keyboards/handwired/macroboard/f401/keyboard.json index 5108d8ce50b..43aa322a2a8 100644 --- a/keyboards/handwired/macroboard/f401/info.json +++ b/keyboards/handwired/macroboard/f401/keyboard.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["A5", "A6", "A7", "B0", "B1", "B10"], "rows": ["A4", "A3", "A2", "A1", "A0"] @@ -9,5 +14,12 @@ }, "processor": "STM32F401", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk deleted file mode 100644 index bc0cd6b97f6..00000000000 --- a/keyboards/handwired/macroboard/f401/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json index d7ff61f52b6..0f6d7077a3c 100644 --- a/keyboards/handwired/macroboard/f411/info.json +++ b/keyboards/handwired/macroboard/f411/info.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "B15", "A8", "A10"], "rows": ["A15", "B3", "B4", "B5", "B7"] @@ -9,5 +14,13 @@ }, "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "audio": true + }, "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk index cdf33bfea5b..72f75f4367e 100644 --- a/keyboards/handwired/macroboard/f411/rules.mk +++ b/keyboards/handwired/macroboard/f411/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output AUDIO_DRIVER = pwm_hardware -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/info.json index 8266e704bc6..5147d96ee02 100644 --- a/keyboards/handwired/meck_tkl/info.json +++ b/keyboards/handwired/meck_tkl/info.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk index 6213285117b..cdf3900ff0d 100644 --- a/keyboards/handwired/meck_tkl/rules.mk +++ b/keyboards/handwired/meck_tkl/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/keyboard.json similarity index 95% rename from keyboards/handwired/myskeeb/info.json rename to keyboards/handwired/myskeeb/keyboard.json index cd5de808f4d..f2da286f194 100644 --- a/keyboards/handwired/myskeeb/info.json +++ b/keyboards/handwired/myskeeb/keyboard.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "1.0.0" + "device_version": "1.0.0", + "no_startup_check": true }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"], @@ -24,6 +25,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "oled": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk deleted file mode 100644 index 21c4a23eb3b..00000000000 --- a/keyboards/handwired/myskeeb/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -NO_USB_STARTUP_CHECK = yes From abe4d9cdcac51b49da494ec9077ffe79bbfd5ef7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 16 Apr 2024 02:16:08 +0100 Subject: [PATCH 4/5] Migrate build target markers to keyboard.json - E (#23529) --- .../cablecardesigns/phoenix/{info.json => keyboard.json} | 0 keyboards/cannonkeys/aella/{info.json => keyboard.json} | 0 keyboards/cannonkeys/an_c/{info.json => keyboard.json} | 0 .../bakeneko60_iso_hs/{info.json => keyboard.json} | 0 .../bakeneko65_iso_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/balance/{info.json => keyboard.json} | 0 .../cannonkeys/brutalv2_65/{info.json => keyboard.json} | 0 .../cannonkeys/chimera65_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/cloudline/{info.json => keyboard.json} | 0 keyboards/cannonkeys/crin/{info.json => keyboard.json} | 0 .../cannonkeys/devastatingtkl/{info.json => keyboard.json} | 0 keyboards/cannonkeys/ellipse/{info.json => keyboard.json} | 0 .../cannonkeys/ellipse_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/gentoo/{info.json => keyboard.json} | 0 keyboards/cannonkeys/gentoo_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/instant60/{info.json => keyboard.json} | 0 keyboards/cannonkeys/instant65/{info.json => keyboard.json} | 0 keyboards/cannonkeys/is0gr/{info.json => keyboard.json} | 0 keyboards/cannonkeys/leviatan/{info.json => keyboard.json} | 0 .../cannonkeys/malicious_ergo/{info.json => keyboard.json} | 0 .../cannonkeys/meetuppad2023/{info.json => keyboard.json} | 0 keyboards/cannonkeys/moment/{info.json => keyboard.json} | 0 keyboards/cannonkeys/moment_hs/{info.json => keyboard.json} | 0 .../cannonkeys/obliterated75/{info.json => keyboard.json} | 0 keyboards/cannonkeys/onyx/{info.json => keyboard.json} | 0 keyboards/cannonkeys/rekt1800/{info.json => keyboard.json} | 0 keyboards/cannonkeys/ripple/{info.json => keyboard.json} | 0 keyboards/cannonkeys/ripple_hs/{info.json => keyboard.json} | 0 .../cannonkeys/sagittarius/{info.json => keyboard.json} | 0 .../satisfaction75_hs/{info.json => keyboard.json} | 0 keyboards/cannonkeys/savage65/{info.json => keyboard.json} | 0 keyboards/cannonkeys/serenity/{info.json => keyboard.json} | 0 keyboards/cannonkeys/tmov2/{info.json => keyboard.json} | 0 keyboards/cannonkeys/tsukuyomi/{info.json => keyboard.json} | 0 keyboards/cannonkeys/vector/{info.json => keyboard.json} | 0 keyboards/cannonkeys/vicious40/{info.json => keyboard.json} | 0 keyboards/cantor/{info.json => keyboard.json} | 0 keyboards/centromere/{info.json => keyboard.json} | 0 .../phoenix45_ortho/{info.json => keyboard.json} | 0 keyboards/checkerboards/quark/{info.json => keyboard.json} | 0 .../quark_squared/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_23u/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_60/{info.json => keyboard.json} | 0 .../cipulot/ec_alveus/1_0_0/{info.json => keyboard.json} | 0 .../cipulot/ec_alveus/1_2_0/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_pro2/{info.json => keyboard.json} | 0 .../cipulot/ec_prox/ansi_iso/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_prox/jis/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_theca/{info.json => keyboard.json} | 0 keyboards/cipulot/ec_typek/{info.json => keyboard.json} | 0 keyboards/cipulot/mnk_60_ec/{info.json => keyboard.json} | 0 keyboards/cipulot/mnk_65_ec/{info.json => keyboard.json} | 0 keyboards/cipulot/rf_r1_8_9xu/{info.json => keyboard.json} | 0 .../clueboard/2x1800/2021/{info.json => keyboard.json} | 0 keyboards/clueboard/60/{info.json => keyboard.json} | 0 .../controllerworks/city42/{info.json => keyboard.json} | 0 .../controllerworks/mini36/{info.json => keyboard.json} | 0 .../controllerworks/mini42/{info.json => keyboard.json} | 0 keyboards/converter/hp_46010a/{info.json => keyboard.json} | 0 .../converter/ibm_terminal/{info.json => keyboard.json} | 0 keyboards/converter/m0110_usb/{info.json => keyboard.json} | 0 .../converter/siemens_tastatur/{info.json => keyboard.json} | 0 .../converter/usb_usb/ble/{info.json => keyboard.json} | 6 ++++++ keyboards/converter/usb_usb/ble/rules.mk | 4 ---- .../usb_usb/pro_micro/{info.json => keyboard.json} | 0 keyboards/converter/xmk/{info.json => keyboard.json} | 0 keyboards/converter/xt_usb/{info.json => keyboard.json} | 0 .../coseyfannitutti/discipline/{info.json => keyboard.json} | 0 .../coseyfannitutti/mysterium/{info.json => keyboard.json} | 0 keyboards/cozykeys/speedo/v3/{info.json => keyboard.json} | 1 + keyboards/cozykeys/speedo/v3/rules.mk | 1 - .../resume1800/{info.json => keyboard.json} | 0 keyboards/crypt_macro/{info.json => keyboard.json} | 0 keyboards/custommk/cmk11/{info.json => keyboard.json} | 0 keyboards/custommk/ergostrafer/{info.json => keyboard.json} | 0 keyboards/custommk/evo70_r2/{info.json => keyboard.json} | 0 76 files changed, 7 insertions(+), 5 deletions(-) rename keyboards/cablecardesigns/phoenix/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/aella/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/an_c/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/bakeneko60_iso_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/bakeneko65_iso_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/balance/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/brutalv2_65/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/chimera65_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/cloudline/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/crin/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/devastatingtkl/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/ellipse/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/ellipse_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/gentoo/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/gentoo_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/instant60/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/instant65/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/is0gr/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/leviatan/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/malicious_ergo/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/meetuppad2023/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/moment/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/moment_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/obliterated75/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/onyx/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/rekt1800/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/ripple/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/ripple_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/sagittarius/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/satisfaction75_hs/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/savage65/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/serenity/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/tmov2/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/tsukuyomi/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/vector/{info.json => keyboard.json} (100%) rename keyboards/cannonkeys/vicious40/{info.json => keyboard.json} (100%) rename keyboards/cantor/{info.json => keyboard.json} (100%) rename keyboards/centromere/{info.json => keyboard.json} (100%) rename keyboards/checkerboards/phoenix45_ortho/{info.json => keyboard.json} (100%) rename keyboards/checkerboards/quark/{info.json => keyboard.json} (100%) rename keyboards/checkerboards/quark_squared/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_23u/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_60/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_alveus/1_0_0/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_alveus/1_2_0/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_pro2/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_prox/ansi_iso/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_prox/jis/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_theca/{info.json => keyboard.json} (100%) rename keyboards/cipulot/ec_typek/{info.json => keyboard.json} (100%) rename keyboards/cipulot/mnk_60_ec/{info.json => keyboard.json} (100%) rename keyboards/cipulot/mnk_65_ec/{info.json => keyboard.json} (100%) rename keyboards/cipulot/rf_r1_8_9xu/{info.json => keyboard.json} (100%) rename keyboards/clueboard/2x1800/2021/{info.json => keyboard.json} (100%) rename keyboards/clueboard/60/{info.json => keyboard.json} (100%) rename keyboards/controllerworks/city42/{info.json => keyboard.json} (100%) rename keyboards/controllerworks/mini36/{info.json => keyboard.json} (100%) rename keyboards/controllerworks/mini42/{info.json => keyboard.json} (100%) rename keyboards/converter/hp_46010a/{info.json => keyboard.json} (100%) rename keyboards/converter/ibm_terminal/{info.json => keyboard.json} (100%) rename keyboards/converter/m0110_usb/{info.json => keyboard.json} (100%) rename keyboards/converter/siemens_tastatur/{info.json => keyboard.json} (100%) rename keyboards/converter/usb_usb/ble/{info.json => keyboard.json} (50%) rename keyboards/converter/usb_usb/pro_micro/{info.json => keyboard.json} (100%) rename keyboards/converter/xmk/{info.json => keyboard.json} (100%) rename keyboards/converter/xt_usb/{info.json => keyboard.json} (100%) rename keyboards/coseyfannitutti/discipline/{info.json => keyboard.json} (100%) rename keyboards/coseyfannitutti/mysterium/{info.json => keyboard.json} (100%) rename keyboards/cozykeys/speedo/v3/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cozykeys/speedo/v3/rules.mk rename keyboards/crimsonkeyboards/resume1800/{info.json => keyboard.json} (100%) rename keyboards/crypt_macro/{info.json => keyboard.json} (100%) rename keyboards/custommk/cmk11/{info.json => keyboard.json} (100%) rename keyboards/custommk/ergostrafer/{info.json => keyboard.json} (100%) rename keyboards/custommk/evo70_r2/{info.json => keyboard.json} (100%) diff --git a/keyboards/cablecardesigns/phoenix/info.json b/keyboards/cablecardesigns/phoenix/keyboard.json similarity index 100% rename from keyboards/cablecardesigns/phoenix/info.json rename to keyboards/cablecardesigns/phoenix/keyboard.json diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/keyboard.json similarity index 100% rename from keyboards/cannonkeys/aella/info.json rename to keyboards/cannonkeys/aella/keyboard.json diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/keyboard.json similarity index 100% rename from keyboards/cannonkeys/an_c/info.json rename to keyboards/cannonkeys/an_c/keyboard.json diff --git a/keyboards/cannonkeys/bakeneko60_iso_hs/info.json b/keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/bakeneko60_iso_hs/info.json rename to keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json diff --git a/keyboards/cannonkeys/bakeneko65_iso_hs/info.json b/keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/bakeneko65_iso_hs/info.json rename to keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/keyboard.json similarity index 100% rename from keyboards/cannonkeys/balance/info.json rename to keyboards/cannonkeys/balance/keyboard.json diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/keyboard.json similarity index 100% rename from keyboards/cannonkeys/brutalv2_65/info.json rename to keyboards/cannonkeys/brutalv2_65/keyboard.json diff --git a/keyboards/cannonkeys/chimera65_hs/info.json b/keyboards/cannonkeys/chimera65_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/chimera65_hs/info.json rename to keyboards/cannonkeys/chimera65_hs/keyboard.json diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/keyboard.json similarity index 100% rename from keyboards/cannonkeys/cloudline/info.json rename to keyboards/cannonkeys/cloudline/keyboard.json diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/keyboard.json similarity index 100% rename from keyboards/cannonkeys/crin/info.json rename to keyboards/cannonkeys/crin/keyboard.json diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/keyboard.json similarity index 100% rename from keyboards/cannonkeys/devastatingtkl/info.json rename to keyboards/cannonkeys/devastatingtkl/keyboard.json diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ellipse/info.json rename to keyboards/cannonkeys/ellipse/keyboard.json diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ellipse_hs/info.json rename to keyboards/cannonkeys/ellipse_hs/keyboard.json diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/keyboard.json similarity index 100% rename from keyboards/cannonkeys/gentoo/info.json rename to keyboards/cannonkeys/gentoo/keyboard.json diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/gentoo_hs/info.json rename to keyboards/cannonkeys/gentoo_hs/keyboard.json diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/keyboard.json similarity index 100% rename from keyboards/cannonkeys/instant60/info.json rename to keyboards/cannonkeys/instant60/keyboard.json diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/keyboard.json similarity index 100% rename from keyboards/cannonkeys/instant65/info.json rename to keyboards/cannonkeys/instant65/keyboard.json diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/keyboard.json similarity index 100% rename from keyboards/cannonkeys/is0gr/info.json rename to keyboards/cannonkeys/is0gr/keyboard.json diff --git a/keyboards/cannonkeys/leviatan/info.json b/keyboards/cannonkeys/leviatan/keyboard.json similarity index 100% rename from keyboards/cannonkeys/leviatan/info.json rename to keyboards/cannonkeys/leviatan/keyboard.json diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/keyboard.json similarity index 100% rename from keyboards/cannonkeys/malicious_ergo/info.json rename to keyboards/cannonkeys/malicious_ergo/keyboard.json diff --git a/keyboards/cannonkeys/meetuppad2023/info.json b/keyboards/cannonkeys/meetuppad2023/keyboard.json similarity index 100% rename from keyboards/cannonkeys/meetuppad2023/info.json rename to keyboards/cannonkeys/meetuppad2023/keyboard.json diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/keyboard.json similarity index 100% rename from keyboards/cannonkeys/moment/info.json rename to keyboards/cannonkeys/moment/keyboard.json diff --git a/keyboards/cannonkeys/moment_hs/info.json b/keyboards/cannonkeys/moment_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/moment_hs/info.json rename to keyboards/cannonkeys/moment_hs/keyboard.json diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/keyboard.json similarity index 100% rename from keyboards/cannonkeys/obliterated75/info.json rename to keyboards/cannonkeys/obliterated75/keyboard.json diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/keyboard.json similarity index 100% rename from keyboards/cannonkeys/onyx/info.json rename to keyboards/cannonkeys/onyx/keyboard.json diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/keyboard.json similarity index 100% rename from keyboards/cannonkeys/rekt1800/info.json rename to keyboards/cannonkeys/rekt1800/keyboard.json diff --git a/keyboards/cannonkeys/ripple/info.json b/keyboards/cannonkeys/ripple/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ripple/info.json rename to keyboards/cannonkeys/ripple/keyboard.json diff --git a/keyboards/cannonkeys/ripple_hs/info.json b/keyboards/cannonkeys/ripple_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/ripple_hs/info.json rename to keyboards/cannonkeys/ripple_hs/keyboard.json diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/keyboard.json similarity index 100% rename from keyboards/cannonkeys/sagittarius/info.json rename to keyboards/cannonkeys/sagittarius/keyboard.json diff --git a/keyboards/cannonkeys/satisfaction75_hs/info.json b/keyboards/cannonkeys/satisfaction75_hs/keyboard.json similarity index 100% rename from keyboards/cannonkeys/satisfaction75_hs/info.json rename to keyboards/cannonkeys/satisfaction75_hs/keyboard.json diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/keyboard.json similarity index 100% rename from keyboards/cannonkeys/savage65/info.json rename to keyboards/cannonkeys/savage65/keyboard.json diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/keyboard.json similarity index 100% rename from keyboards/cannonkeys/serenity/info.json rename to keyboards/cannonkeys/serenity/keyboard.json diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/keyboard.json similarity index 100% rename from keyboards/cannonkeys/tmov2/info.json rename to keyboards/cannonkeys/tmov2/keyboard.json diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/keyboard.json similarity index 100% rename from keyboards/cannonkeys/tsukuyomi/info.json rename to keyboards/cannonkeys/tsukuyomi/keyboard.json diff --git a/keyboards/cannonkeys/vector/info.json b/keyboards/cannonkeys/vector/keyboard.json similarity index 100% rename from keyboards/cannonkeys/vector/info.json rename to keyboards/cannonkeys/vector/keyboard.json diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/keyboard.json similarity index 100% rename from keyboards/cannonkeys/vicious40/info.json rename to keyboards/cannonkeys/vicious40/keyboard.json diff --git a/keyboards/cantor/info.json b/keyboards/cantor/keyboard.json similarity index 100% rename from keyboards/cantor/info.json rename to keyboards/cantor/keyboard.json diff --git a/keyboards/centromere/info.json b/keyboards/centromere/keyboard.json similarity index 100% rename from keyboards/centromere/info.json rename to keyboards/centromere/keyboard.json diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/keyboard.json similarity index 100% rename from keyboards/checkerboards/phoenix45_ortho/info.json rename to keyboards/checkerboards/phoenix45_ortho/keyboard.json diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/keyboard.json similarity index 100% rename from keyboards/checkerboards/quark/info.json rename to keyboards/checkerboards/quark/keyboard.json diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/keyboard.json similarity index 100% rename from keyboards/checkerboards/quark_squared/info.json rename to keyboards/checkerboards/quark_squared/keyboard.json diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_23u/info.json rename to keyboards/cipulot/ec_23u/keyboard.json diff --git a/keyboards/cipulot/ec_60/info.json b/keyboards/cipulot/ec_60/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_60/info.json rename to keyboards/cipulot/ec_60/keyboard.json diff --git a/keyboards/cipulot/ec_alveus/1_0_0/info.json b/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_alveus/1_0_0/info.json rename to keyboards/cipulot/ec_alveus/1_0_0/keyboard.json diff --git a/keyboards/cipulot/ec_alveus/1_2_0/info.json b/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_alveus/1_2_0/info.json rename to keyboards/cipulot/ec_alveus/1_2_0/keyboard.json diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_pro2/info.json rename to keyboards/cipulot/ec_pro2/keyboard.json diff --git a/keyboards/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_prox/ansi_iso/info.json rename to keyboards/cipulot/ec_prox/ansi_iso/keyboard.json diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_prox/jis/info.json rename to keyboards/cipulot/ec_prox/jis/keyboard.json diff --git a/keyboards/cipulot/ec_theca/info.json b/keyboards/cipulot/ec_theca/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_theca/info.json rename to keyboards/cipulot/ec_theca/keyboard.json diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/keyboard.json similarity index 100% rename from keyboards/cipulot/ec_typek/info.json rename to keyboards/cipulot/ec_typek/keyboard.json diff --git a/keyboards/cipulot/mnk_60_ec/info.json b/keyboards/cipulot/mnk_60_ec/keyboard.json similarity index 100% rename from keyboards/cipulot/mnk_60_ec/info.json rename to keyboards/cipulot/mnk_60_ec/keyboard.json diff --git a/keyboards/cipulot/mnk_65_ec/info.json b/keyboards/cipulot/mnk_65_ec/keyboard.json similarity index 100% rename from keyboards/cipulot/mnk_65_ec/info.json rename to keyboards/cipulot/mnk_65_ec/keyboard.json diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/keyboard.json similarity index 100% rename from keyboards/cipulot/rf_r1_8_9xu/info.json rename to keyboards/cipulot/rf_r1_8_9xu/keyboard.json diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/keyboard.json similarity index 100% rename from keyboards/clueboard/2x1800/2021/info.json rename to keyboards/clueboard/2x1800/2021/keyboard.json diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/keyboard.json similarity index 100% rename from keyboards/clueboard/60/info.json rename to keyboards/clueboard/60/keyboard.json diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/keyboard.json similarity index 100% rename from keyboards/controllerworks/city42/info.json rename to keyboards/controllerworks/city42/keyboard.json diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/keyboard.json similarity index 100% rename from keyboards/controllerworks/mini36/info.json rename to keyboards/controllerworks/mini36/keyboard.json diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/keyboard.json similarity index 100% rename from keyboards/controllerworks/mini42/info.json rename to keyboards/controllerworks/mini42/keyboard.json diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/keyboard.json similarity index 100% rename from keyboards/converter/hp_46010a/info.json rename to keyboards/converter/hp_46010a/keyboard.json diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/keyboard.json similarity index 100% rename from keyboards/converter/ibm_terminal/info.json rename to keyboards/converter/ibm_terminal/keyboard.json diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/keyboard.json similarity index 100% rename from keyboards/converter/m0110_usb/info.json rename to keyboards/converter/m0110_usb/keyboard.json diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/keyboard.json similarity index 100% rename from keyboards/converter/siemens_tastatur/info.json rename to keyboards/converter/siemens_tastatur/keyboard.json diff --git a/keyboards/converter/usb_usb/ble/info.json b/keyboards/converter/usb_usb/ble/keyboard.json similarity index 50% rename from keyboards/converter/usb_usb/ble/info.json rename to keyboards/converter/usb_usb/ble/keyboard.json index 18edf5f577c..b92bfe7f3e0 100644 --- a/keyboards/converter/usb_usb/ble/info.json +++ b/keyboards/converter/usb_usb/ble/keyboard.json @@ -2,5 +2,11 @@ "bootloader": "caterina", "bluetooth": { "driver": "bluefruit_le" + }, + "build": { + "lto": true + }, + "features":{ + "bluetooth": true } } diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk index 5b0435372b7..3437a35bdf1 100644 --- a/keyboards/converter/usb_usb/ble/rules.mk +++ b/keyboards/converter/usb_usb/ble/rules.mk @@ -1,6 +1,2 @@ # Processor frequency F_CPU = 8000000 - -EXTRAKEY_ENABLE = no -BLUETOOTH_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/converter/usb_usb/pro_micro/info.json b/keyboards/converter/usb_usb/pro_micro/keyboard.json similarity index 100% rename from keyboards/converter/usb_usb/pro_micro/info.json rename to keyboards/converter/usb_usb/pro_micro/keyboard.json diff --git a/keyboards/converter/xmk/info.json b/keyboards/converter/xmk/keyboard.json similarity index 100% rename from keyboards/converter/xmk/info.json rename to keyboards/converter/xmk/keyboard.json diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/keyboard.json similarity index 100% rename from keyboards/converter/xt_usb/info.json rename to keyboards/converter/xt_usb/keyboard.json diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/keyboard.json similarity index 100% rename from keyboards/coseyfannitutti/discipline/info.json rename to keyboards/coseyfannitutti/discipline/keyboard.json diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/keyboard.json similarity index 100% rename from keyboards/coseyfannitutti/mysterium/info.json rename to keyboards/coseyfannitutti/mysterium/keyboard.json diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/keyboard.json similarity index 99% rename from keyboards/cozykeys/speedo/v3/info.json rename to keyboards/cozykeys/speedo/v3/keyboard.json index 7636d9b702f..c4aaaecb6d1 100644 --- a/keyboards/cozykeys/speedo/v3/info.json +++ b/keyboards/cozykeys/speedo/v3/keyboard.json @@ -36,6 +36,7 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "pin_compatible": "elite_c", "features": { "bootmagic": false, "mousekey": true, diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk deleted file mode 100644 index baf23318ccd..00000000000 --- a/keyboards/cozykeys/speedo/v3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -PIN_COMPATIBLE = elite_c diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/keyboard.json similarity index 100% rename from keyboards/crimsonkeyboards/resume1800/info.json rename to keyboards/crimsonkeyboards/resume1800/keyboard.json diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/keyboard.json similarity index 100% rename from keyboards/crypt_macro/info.json rename to keyboards/crypt_macro/keyboard.json diff --git a/keyboards/custommk/cmk11/info.json b/keyboards/custommk/cmk11/keyboard.json similarity index 100% rename from keyboards/custommk/cmk11/info.json rename to keyboards/custommk/cmk11/keyboard.json diff --git a/keyboards/custommk/ergostrafer/info.json b/keyboards/custommk/ergostrafer/keyboard.json similarity index 100% rename from keyboards/custommk/ergostrafer/info.json rename to keyboards/custommk/ergostrafer/keyboard.json diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/keyboard.json similarity index 100% rename from keyboards/custommk/evo70_r2/info.json rename to keyboards/custommk/evo70_r2/keyboard.json From 1d5ee895ad00b99d2d99a6cfb67b01b6dc84c874 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 16 Apr 2024 05:42:34 +0100 Subject: [PATCH 5/5] Migrate build target markers to keyboard.json - FG (#23534) --- keyboards/fallacy/{info.json => keyboard.json} | 0 keyboards/fc660c/{info.json => keyboard.json} | 0 keyboards/fc980c/{info.json => keyboard.json} | 0 keyboards/ferris/0_1/{info.json => keyboard.json} | 0 keyboards/ferris/0_2/bling/{info.json => keyboard.json} | 0 keyboards/ferris/0_2/bling/rules.mk | 0 keyboards/fjlabs/7vhotswap/{info.json => keyboard.json} | 0 keyboards/fjlabs/ad65/{info.json => keyboard.json} | 0 keyboards/fjlabs/avalon/{info.json => keyboard.json} | 0 keyboards/fjlabs/bks65/{info.json => keyboard.json} | 0 keyboards/fjlabs/bks65solder/{info.json => keyboard.json} | 0 keyboards/fjlabs/bolsa65/{info.json => keyboard.json} | 0 keyboards/fjlabs/kf87/{info.json => keyboard.json} | 0 keyboards/fjlabs/kyuu/{info.json => keyboard.json} | 0 keyboards/fjlabs/ldk65/{info.json => keyboard.json} | 0 keyboards/fjlabs/midway60/{info.json => keyboard.json} | 0 keyboards/fjlabs/mk61rgbansi/{info.json => keyboard.json} | 0 keyboards/fjlabs/peaker/{info.json => keyboard.json} | 0 keyboards/fjlabs/polaris/{info.json => keyboard.json} | 0 keyboards/fjlabs/ready100/{info.json => keyboard.json} | 0 keyboards/fjlabs/sinanju/{info.json => keyboard.json} | 0 keyboards/fjlabs/sinanjuwk/{info.json => keyboard.json} | 0 keyboards/fjlabs/solanis/{info.json => keyboard.json} | 0 keyboards/fjlabs/swordfish/{info.json => keyboard.json} | 0 keyboards/fjlabs/tf60ansi/{info.json => keyboard.json} | 0 keyboards/fjlabs/tf60v2/{info.json => keyboard.json} | 0 keyboards/fjlabs/tf65rgbv2/{info.json => keyboard.json} | 0 keyboards/fractal/{info.json => keyboard.json} | 0 keyboards/frobiac/blackbowl/{info.json => keyboard.json} | 0 keyboards/gboards/ergotaco/{info.json => keyboard.json} | 0 keyboards/gboards/georgi/{info.json => keyboard.json} | 0 keyboards/gboards/gergo/{info.json => keyboard.json} | 0 keyboards/gboards/gergoplex/{info.json => keyboard.json} | 0 keyboards/geistmaschine/macropod/{info.json => keyboard.json} | 0 keyboards/geonworks/ee_at/{info.json => keyboard.json} | 0 keyboards/geonworks/w1_at/{info.json => keyboard.json} | 0 keyboards/gl516/a52gl/{info.json => keyboard.json} | 0 keyboards/gl516/j73gl/{info.json => keyboard.json} | 0 keyboards/gl516/n51gl/{info.json => keyboard.json} | 0 keyboards/glenpickle/chimera_ergo/{info.json => keyboard.json} | 0 keyboards/glenpickle/chimera_ls/{info.json => keyboard.json} | 0 keyboards/glenpickle/chimera_ortho/{info.json => keyboard.json} | 0 .../glenpickle/chimera_ortho_plus/{info.json => keyboard.json} | 0 keyboards/gmmk/numpad/{info.json => keyboard.json} | 0 keyboards/gon/nerd60/{info.json => keyboard.json} | 0 keyboards/gon/nerdtkl/{info.json => keyboard.json} | 0 keyboards/gopolar/gg86/{info.json => keyboard.json} | 0 keyboards/gray_studio/cod67/{info.json => keyboard.json} | 0 keyboards/gregandcin/teaqueen/{info.json => keyboard.json} | 0 49 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/fallacy/{info.json => keyboard.json} (100%) rename keyboards/fc660c/{info.json => keyboard.json} (100%) rename keyboards/fc980c/{info.json => keyboard.json} (100%) rename keyboards/ferris/0_1/{info.json => keyboard.json} (100%) rename keyboards/ferris/0_2/bling/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/ferris/0_2/bling/rules.mk rename keyboards/fjlabs/7vhotswap/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/ad65/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/avalon/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/bks65/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/bks65solder/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/bolsa65/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/kf87/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/kyuu/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/ldk65/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/midway60/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/mk61rgbansi/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/peaker/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/polaris/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/ready100/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/sinanju/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/sinanjuwk/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/solanis/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/swordfish/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/tf60ansi/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/tf60v2/{info.json => keyboard.json} (100%) rename keyboards/fjlabs/tf65rgbv2/{info.json => keyboard.json} (100%) rename keyboards/fractal/{info.json => keyboard.json} (100%) rename keyboards/frobiac/blackbowl/{info.json => keyboard.json} (100%) rename keyboards/gboards/ergotaco/{info.json => keyboard.json} (100%) rename keyboards/gboards/georgi/{info.json => keyboard.json} (100%) rename keyboards/gboards/gergo/{info.json => keyboard.json} (100%) rename keyboards/gboards/gergoplex/{info.json => keyboard.json} (100%) rename keyboards/geistmaschine/macropod/{info.json => keyboard.json} (100%) rename keyboards/geonworks/ee_at/{info.json => keyboard.json} (100%) rename keyboards/geonworks/w1_at/{info.json => keyboard.json} (100%) rename keyboards/gl516/a52gl/{info.json => keyboard.json} (100%) rename keyboards/gl516/j73gl/{info.json => keyboard.json} (100%) rename keyboards/gl516/n51gl/{info.json => keyboard.json} (100%) rename keyboards/glenpickle/chimera_ergo/{info.json => keyboard.json} (100%) rename keyboards/glenpickle/chimera_ls/{info.json => keyboard.json} (100%) rename keyboards/glenpickle/chimera_ortho/{info.json => keyboard.json} (100%) rename keyboards/glenpickle/chimera_ortho_plus/{info.json => keyboard.json} (100%) rename keyboards/gmmk/numpad/{info.json => keyboard.json} (100%) rename keyboards/gon/nerd60/{info.json => keyboard.json} (100%) rename keyboards/gon/nerdtkl/{info.json => keyboard.json} (100%) rename keyboards/gopolar/gg86/{info.json => keyboard.json} (100%) rename keyboards/gray_studio/cod67/{info.json => keyboard.json} (100%) rename keyboards/gregandcin/teaqueen/{info.json => keyboard.json} (100%) diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/keyboard.json similarity index 100% rename from keyboards/fallacy/info.json rename to keyboards/fallacy/keyboard.json diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/keyboard.json similarity index 100% rename from keyboards/fc660c/info.json rename to keyboards/fc660c/keyboard.json diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/keyboard.json similarity index 100% rename from keyboards/fc980c/info.json rename to keyboards/fc980c/keyboard.json diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/keyboard.json similarity index 100% rename from keyboards/ferris/0_1/info.json rename to keyboards/ferris/0_1/keyboard.json diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/keyboard.json similarity index 100% rename from keyboards/ferris/0_2/bling/info.json rename to keyboards/ferris/0_2/bling/keyboard.json diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/keyboard.json similarity index 100% rename from keyboards/fjlabs/7vhotswap/info.json rename to keyboards/fjlabs/7vhotswap/keyboard.json diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/keyboard.json similarity index 100% rename from keyboards/fjlabs/ad65/info.json rename to keyboards/fjlabs/ad65/keyboard.json diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/keyboard.json similarity index 100% rename from keyboards/fjlabs/avalon/info.json rename to keyboards/fjlabs/avalon/keyboard.json diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/keyboard.json similarity index 100% rename from keyboards/fjlabs/bks65/info.json rename to keyboards/fjlabs/bks65/keyboard.json diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/keyboard.json similarity index 100% rename from keyboards/fjlabs/bks65solder/info.json rename to keyboards/fjlabs/bks65solder/keyboard.json diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/keyboard.json similarity index 100% rename from keyboards/fjlabs/bolsa65/info.json rename to keyboards/fjlabs/bolsa65/keyboard.json diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/keyboard.json similarity index 100% rename from keyboards/fjlabs/kf87/info.json rename to keyboards/fjlabs/kf87/keyboard.json diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/keyboard.json similarity index 100% rename from keyboards/fjlabs/kyuu/info.json rename to keyboards/fjlabs/kyuu/keyboard.json diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/keyboard.json similarity index 100% rename from keyboards/fjlabs/ldk65/info.json rename to keyboards/fjlabs/ldk65/keyboard.json diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/keyboard.json similarity index 100% rename from keyboards/fjlabs/midway60/info.json rename to keyboards/fjlabs/midway60/keyboard.json diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/keyboard.json similarity index 100% rename from keyboards/fjlabs/mk61rgbansi/info.json rename to keyboards/fjlabs/mk61rgbansi/keyboard.json diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/keyboard.json similarity index 100% rename from keyboards/fjlabs/peaker/info.json rename to keyboards/fjlabs/peaker/keyboard.json diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/keyboard.json similarity index 100% rename from keyboards/fjlabs/polaris/info.json rename to keyboards/fjlabs/polaris/keyboard.json diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/keyboard.json similarity index 100% rename from keyboards/fjlabs/ready100/info.json rename to keyboards/fjlabs/ready100/keyboard.json diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/keyboard.json similarity index 100% rename from keyboards/fjlabs/sinanju/info.json rename to keyboards/fjlabs/sinanju/keyboard.json diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/keyboard.json similarity index 100% rename from keyboards/fjlabs/sinanjuwk/info.json rename to keyboards/fjlabs/sinanjuwk/keyboard.json diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/keyboard.json similarity index 100% rename from keyboards/fjlabs/solanis/info.json rename to keyboards/fjlabs/solanis/keyboard.json diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/keyboard.json similarity index 100% rename from keyboards/fjlabs/swordfish/info.json rename to keyboards/fjlabs/swordfish/keyboard.json diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/keyboard.json similarity index 100% rename from keyboards/fjlabs/tf60ansi/info.json rename to keyboards/fjlabs/tf60ansi/keyboard.json diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/keyboard.json similarity index 100% rename from keyboards/fjlabs/tf60v2/info.json rename to keyboards/fjlabs/tf60v2/keyboard.json diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/keyboard.json similarity index 100% rename from keyboards/fjlabs/tf65rgbv2/info.json rename to keyboards/fjlabs/tf65rgbv2/keyboard.json diff --git a/keyboards/fractal/info.json b/keyboards/fractal/keyboard.json similarity index 100% rename from keyboards/fractal/info.json rename to keyboards/fractal/keyboard.json diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/keyboard.json similarity index 100% rename from keyboards/frobiac/blackbowl/info.json rename to keyboards/frobiac/blackbowl/keyboard.json diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/keyboard.json similarity index 100% rename from keyboards/gboards/ergotaco/info.json rename to keyboards/gboards/ergotaco/keyboard.json diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/keyboard.json similarity index 100% rename from keyboards/gboards/georgi/info.json rename to keyboards/gboards/georgi/keyboard.json diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/keyboard.json similarity index 100% rename from keyboards/gboards/gergo/info.json rename to keyboards/gboards/gergo/keyboard.json diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/keyboard.json similarity index 100% rename from keyboards/gboards/gergoplex/info.json rename to keyboards/gboards/gergoplex/keyboard.json diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/keyboard.json similarity index 100% rename from keyboards/geistmaschine/macropod/info.json rename to keyboards/geistmaschine/macropod/keyboard.json diff --git a/keyboards/geonworks/ee_at/info.json b/keyboards/geonworks/ee_at/keyboard.json similarity index 100% rename from keyboards/geonworks/ee_at/info.json rename to keyboards/geonworks/ee_at/keyboard.json diff --git a/keyboards/geonworks/w1_at/info.json b/keyboards/geonworks/w1_at/keyboard.json similarity index 100% rename from keyboards/geonworks/w1_at/info.json rename to keyboards/geonworks/w1_at/keyboard.json diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/keyboard.json similarity index 100% rename from keyboards/gl516/a52gl/info.json rename to keyboards/gl516/a52gl/keyboard.json diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/keyboard.json similarity index 100% rename from keyboards/gl516/j73gl/info.json rename to keyboards/gl516/j73gl/keyboard.json diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/keyboard.json similarity index 100% rename from keyboards/gl516/n51gl/info.json rename to keyboards/gl516/n51gl/keyboard.json diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/keyboard.json similarity index 100% rename from keyboards/glenpickle/chimera_ergo/info.json rename to keyboards/glenpickle/chimera_ergo/keyboard.json diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/keyboard.json similarity index 100% rename from keyboards/glenpickle/chimera_ls/info.json rename to keyboards/glenpickle/chimera_ls/keyboard.json diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/keyboard.json similarity index 100% rename from keyboards/glenpickle/chimera_ortho/info.json rename to keyboards/glenpickle/chimera_ortho/keyboard.json diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/keyboard.json similarity index 100% rename from keyboards/glenpickle/chimera_ortho_plus/info.json rename to keyboards/glenpickle/chimera_ortho_plus/keyboard.json diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/keyboard.json similarity index 100% rename from keyboards/gmmk/numpad/info.json rename to keyboards/gmmk/numpad/keyboard.json diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/keyboard.json similarity index 100% rename from keyboards/gon/nerd60/info.json rename to keyboards/gon/nerd60/keyboard.json diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/keyboard.json similarity index 100% rename from keyboards/gon/nerdtkl/info.json rename to keyboards/gon/nerdtkl/keyboard.json diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/keyboard.json similarity index 100% rename from keyboards/gopolar/gg86/info.json rename to keyboards/gopolar/gg86/keyboard.json diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/keyboard.json similarity index 100% rename from keyboards/gray_studio/cod67/info.json rename to keyboards/gray_studio/cod67/keyboard.json diff --git a/keyboards/gregandcin/teaqueen/info.json b/keyboards/gregandcin/teaqueen/keyboard.json similarity index 100% rename from keyboards/gregandcin/teaqueen/info.json rename to keyboards/gregandcin/teaqueen/keyboard.json