From 6b60089fc704e4fc6bb75686b725a19da6a92fa9 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 12 Apr 2024 23:34:44 +0100 Subject: [PATCH 01/23] Migrate build target markers to keyboard.json - 0AB (#23488) --- .../10bleoledhub/{info.json => keyboard.json} | 9 ++++++ keyboards/10bleoledhub/rules.mk | 16 ---------- keyboards/1k/{info.json => keyboard.json} | 10 ++++++ keyboards/1k/rules.mk | 24 -------------- .../1upslider8/{info.json => keyboard.json} | 0 .../1upkeyboards/pi40/grid_v1_1/keyboard.json | 1 + .../1upkeyboards/pi40/mit_v1_0/keyboard.json | 1 + .../1upkeyboards/pi40/mit_v1_1/keyboard.json | 1 + keyboards/1upkeyboards/pi40/rules.mk | 2 -- keyboards/25keys/zinc/rules.mk | 3 -- .../{rev2/info.json => rev1/keyboard.json} | 10 +++++- keyboards/3w6/rev1/rules.mk | 16 ---------- .../{rev1/info.json => rev2/keyboard.json} | 10 +++++- keyboards/3w6/rev2/rules.mk | 16 ---------- .../rev_e/{info.json => keyboard.json} | 0 .../rev_e_ansi/{info.json => keyboard.json} | 0 .../rev_e_iso/{info.json => keyboard.json} | 0 .../shark/alpha/{info.json => keyboard.json} | 0 .../macropad/{info.json => keyboard.json} | 0 .../mine/{info.json => keyboard.json} | 0 .../ext65/rev3/{info.json => keyboard.json} | 0 .../rev1/{info.json => keyboard.json} | 0 .../lunar_ii/{info.json => keyboard.json} | 0 .../sango/{info.json => keyboard.json} | 0 keyboards/al1/{info.json => keyboard.json} | 0 keyboards/alas/{info.json => keyboard.json} | 0 .../pianoforte/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../amj66/{info.json => keyboard.json} | 0 .../amj96/{info.json => keyboard.json} | 0 .../annepro2/c15/{info.json => keyboard.json} | 0 .../annepro2/c18/{info.json => keyboard.json} | 0 keyboards/argyle/{info.json => keyboard.json} | 0 .../wings/{info.json => keyboard.json} | 0 .../lvl/rev_hs01/{info.json => keyboard.json} | 0 .../aurora65/{info.json => keyboard.json} | 0 .../helpo/{info.json => keyboard.json} | 0 .../baion_808/{info.json => keyboard.json} | 0 keyboards/bajjak/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../basketweave/{info.json => keyboard.json} | 0 .../dynamis/{info.json => keyboard.json} | 0 .../piantor/{info.json => keyboard.json} | 0 .../piantor_pro/{info.json => keyboard.json} | 0 .../bioi/g60/{info.json => keyboard.json} | 0 .../bioi/g60ble/{info.json => keyboard.json} | 0 .../morgan65/{info.json => keyboard.json} | 0 .../equals/48/{info.json => keyboard.json} | 0 .../equals/60/{info.json => keyboard.json} | 0 .../lulu/rp2040/{info.json => keyboard.json} | 0 .../unicorne/{info.json => keyboard.json} | 0 .../2019/{info.json => keyboard.json} | 32 +++++++++++++++++-- keyboards/boston_meetup/info.json | 32 ------------------- keyboards/boston_meetup/rules.mk | 1 - .../ghost_squid/{info.json => keyboard.json} | 0 .../hid_liber/{info.json => keyboard.json} | 0 keyboards/bpiphany/hid_liber/rules.mk | 4 +-- .../kitten_paw/{info.json => keyboard.json} | 0 .../2013/{info.json => keyboard.json} | 0 .../2015/{info.json => keyboard.json} | 0 .../tiger_lily/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 keyboards/budgy/{info.json => keyboard.json} | 0 .../buzzard/rev1/{info.json => keyboard.json} | 0 64 files changed, 71 insertions(+), 117 deletions(-) rename keyboards/10bleoledhub/{info.json => keyboard.json} (89%) rename keyboards/1k/{info.json => keyboard.json} (71%) rename keyboards/1upkeyboards/1upslider8/{info.json => keyboard.json} (100%) rename keyboards/3w6/{rev2/info.json => rev1/keyboard.json} (90%) rename keyboards/3w6/{rev1/info.json => rev2/keyboard.json} (90%) rename keyboards/4pplet/waffling60/rev_e/{info.json => keyboard.json} (100%) rename keyboards/4pplet/waffling60/rev_e_ansi/{info.json => keyboard.json} (100%) rename keyboards/4pplet/waffling60/rev_e_iso/{info.json => keyboard.json} (100%) rename keyboards/acheron/shark/alpha/{info.json => keyboard.json} (100%) rename keyboards/adafruit/macropad/{info.json => keyboard.json} (100%) rename keyboards/adpenrose/mine/{info.json => keyboard.json} (100%) rename keyboards/aeboards/ext65/rev3/{info.json => keyboard.json} (100%) rename keyboards/aeboards/satellite/rev1/{info.json => keyboard.json} (100%) rename keyboards/ai03/lunar_ii/{info.json => keyboard.json} (100%) rename keyboards/aidansmithdotdev/sango/{info.json => keyboard.json} (100%) rename keyboards/al1/{info.json => keyboard.json} (100%) rename keyboards/alas/{info.json => keyboard.json} (100%) rename keyboards/aliceh66/pianoforte/{info.json => keyboard.json} (100%) rename keyboards/aliceh66/pianoforte_hs/{info.json => keyboard.json} (100%) rename keyboards/amjkeyboard/amj66/{info.json => keyboard.json} (100%) rename keyboards/amjkeyboard/amj96/{info.json => keyboard.json} (100%) rename keyboards/annepro2/c15/{info.json => keyboard.json} (100%) rename keyboards/annepro2/c18/{info.json => keyboard.json} (100%) rename keyboards/argyle/{info.json => keyboard.json} (100%) rename keyboards/arrowmechanics/wings/{info.json => keyboard.json} (100%) rename keyboards/artifact/lvl/rev_hs01/{info.json => keyboard.json} (100%) rename keyboards/aurora65/{info.json => keyboard.json} (100%) rename keyboards/axolstudio/helpo/{info.json => keyboard.json} (100%) rename keyboards/baion_808/{info.json => keyboard.json} (100%) rename keyboards/bajjak/{info.json => keyboard.json} (100%) rename keyboards/barleycorn_smd/{info.json => keyboard.json} (100%) rename keyboards/basketweave/{info.json => keyboard.json} (100%) rename keyboards/bbrfkr/dynamis/{info.json => keyboard.json} (100%) rename keyboards/beekeeb/piantor/{info.json => keyboard.json} (100%) rename keyboards/beekeeb/piantor_pro/{info.json => keyboard.json} (100%) rename keyboards/bioi/g60/{info.json => keyboard.json} (100%) rename keyboards/bioi/g60ble/{info.json => keyboard.json} (100%) rename keyboards/bioi/morgan65/{info.json => keyboard.json} (100%) rename keyboards/boardsource/equals/48/{info.json => keyboard.json} (100%) rename keyboards/boardsource/equals/60/{info.json => keyboard.json} (100%) rename keyboards/boardsource/lulu/rp2040/{info.json => keyboard.json} (100%) rename keyboards/boardsource/unicorne/{info.json => keyboard.json} (100%) rename keyboards/boston_meetup/2019/{info.json => keyboard.json} (51%) delete mode 100644 keyboards/boston_meetup/info.json rename keyboards/bpiphany/ghost_squid/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/hid_liber/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/kitten_paw/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/pegasushoof/2013/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/pegasushoof/2015/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/tiger_lily/{info.json => keyboard.json} (100%) rename keyboards/bpiphany/unloved_bastard/{info.json => keyboard.json} (100%) rename keyboards/budgy/{info.json => keyboard.json} (100%) rename keyboards/buzzard/rev1/{info.json => keyboard.json} (100%) diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/keyboard.json similarity index 89% rename from keyboards/10bleoledhub/info.json rename to keyboards/10bleoledhub/keyboard.json index 17ebcaf4587..8f48e09127f 100644 --- a/keyboards/10bleoledhub/info.json +++ b/keyboards/10bleoledhub/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x7C99", "device_version": "0.0.1" }, + "features": { + "bluetooth": true, + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true + }, "bluetooth": { "driver": "bluefruit_le" }, diff --git a/keyboards/10bleoledhub/rules.mk b/keyboards/10bleoledhub/rules.mk index 12bfe122d62..3437a35bdf1 100644 --- a/keyboards/10bleoledhub/rules.mk +++ b/keyboards/10bleoledhub/rules.mk @@ -1,18 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BLUETOOTH_ENABLE = yes -OLED_ENABLE = yes -ENCODER_ENABLE = yes diff --git a/keyboards/1k/info.json b/keyboards/1k/keyboard.json similarity index 71% rename from keyboards/1k/info.json rename to keyboards/1k/keyboard.json index 34f33d50595..440856d0bd4 100644 --- a/keyboards/1k/info.json +++ b/keyboards/1k/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "attiny85", + "bootloader": "custom", + "build": { + "lto": true + }, + "features": { + "grave_esc": false, + "magic": false, + "space_cadet": false + }, "rgblight": { "led_count": 1 }, diff --git a/keyboards/1k/rules.mk b/keyboards/1k/rules.mk index b3bd401f6ba..4078fe342aa 100644 --- a/keyboards/1k/rules.mk +++ b/keyboards/1k/rules.mk @@ -1,26 +1,2 @@ -# MCU name -MCU = attiny85 - -# Bootloader selection -BOOTLOADER = custom BOOTLOADER_SIZE = 1862 PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Save as much space as we can... -LTO_ENABLE = yes -GRAVE_ESC_ENABLE = no -MAGIC_ENABLE = no -SPACE_CADET_ENABLE = no diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/keyboard.json similarity index 100% rename from keyboards/1upkeyboards/1upslider8/info.json rename to keyboards/1upkeyboards/1upslider8/keyboard.json diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json index 3512838186a..63f76eb1a65 100644 --- a/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json +++ b/keyboards/1upkeyboards/pi40/grid_v1_1/keyboard.json @@ -24,6 +24,7 @@ "extrakey": true, "mousekey": true, "nkro": false, + "oled": true, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json index 230ce3d8574..ed1f1391261 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keyboard.json @@ -24,6 +24,7 @@ "extrakey": true, "mousekey": true, "nkro": false, + "oled": true, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json index 47625ecc4dd..aa19a502b98 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_1/keyboard.json @@ -24,6 +24,7 @@ "extrakey": true, "mousekey": true, "nkro": false, + "oled": true, "rgb_matrix": true }, "matrix_pins": { diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk index 3451f44976a..48aea570e01 100644 --- a/keyboards/1upkeyboards/pi40/rules.mk +++ b/keyboards/1upkeyboards/pi40/rules.mk @@ -1,3 +1 @@ -OLED_ENABLE = yes - DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0 diff --git a/keyboards/25keys/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk index a8c773a3054..1edcb0a3455 100644 --- a/keyboards/25keys/zinc/rules.mk +++ b/keyboards/25keys/zinc/rules.mk @@ -1,4 +1 @@ DEFAULT_FOLDER = 25keys/zinc/rev1 - -#SRC += i2c.c -SRC += serial.c diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev1/keyboard.json similarity index 90% rename from keyboards/3w6/rev2/info.json rename to keyboards/3w6/rev1/keyboard.json index 70ee0e0fcac..478c79b9427 100644 --- a/keyboards/3w6/rev2/info.json +++ b/keyboards/3w6/rev1/keyboard.json @@ -1,6 +1,14 @@ { "usb": { - "device_version": "0.0.2" + "device_version": "0.0.1", + "no_startup_check": true + }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/3w6/rev1/rules.mk b/keyboards/3w6/rev1/rules.mk index b7988ce4f55..cea39bb5c90 100644 --- a/keyboards/3w6/rev1/rules.mk +++ b/keyboards/3w6/rev1/rules.mk @@ -1,19 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite -NO_USB_STARTUP_CHECK = yes -LTO_ENABLE = no - SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev2/keyboard.json similarity index 90% rename from keyboards/3w6/rev1/info.json rename to keyboards/3w6/rev2/keyboard.json index 2db9363564d..f3981e88d98 100644 --- a/keyboards/3w6/rev1/info.json +++ b/keyboards/3w6/rev2/keyboard.json @@ -1,6 +1,14 @@ { "usb": { - "device_version": "0.0.1" + "device_version": "0.0.2", + "no_startup_check": true + }, + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/3w6/rev2/rules.mk b/keyboards/3w6/rev2/rules.mk index b7988ce4f55..cea39bb5c90 100644 --- a/keyboards/3w6/rev2/rules.mk +++ b/keyboards/3w6/rev2/rules.mk @@ -1,19 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite -NO_USB_STARTUP_CHECK = yes -LTO_ENABLE = no - SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/4pplet/waffling60/rev_e/info.json b/keyboards/4pplet/waffling60/rev_e/keyboard.json similarity index 100% rename from keyboards/4pplet/waffling60/rev_e/info.json rename to keyboards/4pplet/waffling60/rev_e/keyboard.json diff --git a/keyboards/4pplet/waffling60/rev_e_ansi/info.json b/keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json similarity index 100% rename from keyboards/4pplet/waffling60/rev_e_ansi/info.json rename to keyboards/4pplet/waffling60/rev_e_ansi/keyboard.json diff --git a/keyboards/4pplet/waffling60/rev_e_iso/info.json b/keyboards/4pplet/waffling60/rev_e_iso/keyboard.json similarity index 100% rename from keyboards/4pplet/waffling60/rev_e_iso/info.json rename to keyboards/4pplet/waffling60/rev_e_iso/keyboard.json diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/keyboard.json similarity index 100% rename from keyboards/acheron/shark/alpha/info.json rename to keyboards/acheron/shark/alpha/keyboard.json diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/keyboard.json similarity index 100% rename from keyboards/adafruit/macropad/info.json rename to keyboards/adafruit/macropad/keyboard.json diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/keyboard.json similarity index 100% rename from keyboards/adpenrose/mine/info.json rename to keyboards/adpenrose/mine/keyboard.json diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/keyboard.json similarity index 100% rename from keyboards/aeboards/ext65/rev3/info.json rename to keyboards/aeboards/ext65/rev3/keyboard.json diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/keyboard.json similarity index 100% rename from keyboards/aeboards/satellite/rev1/info.json rename to keyboards/aeboards/satellite/rev1/keyboard.json diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/keyboard.json similarity index 100% rename from keyboards/ai03/lunar_ii/info.json rename to keyboards/ai03/lunar_ii/keyboard.json diff --git a/keyboards/aidansmithdotdev/sango/info.json b/keyboards/aidansmithdotdev/sango/keyboard.json similarity index 100% rename from keyboards/aidansmithdotdev/sango/info.json rename to keyboards/aidansmithdotdev/sango/keyboard.json diff --git a/keyboards/al1/info.json b/keyboards/al1/keyboard.json similarity index 100% rename from keyboards/al1/info.json rename to keyboards/al1/keyboard.json diff --git a/keyboards/alas/info.json b/keyboards/alas/keyboard.json similarity index 100% rename from keyboards/alas/info.json rename to keyboards/alas/keyboard.json diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/keyboard.json similarity index 100% rename from keyboards/aliceh66/pianoforte/info.json rename to keyboards/aliceh66/pianoforte/keyboard.json diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/keyboard.json similarity index 100% rename from keyboards/aliceh66/pianoforte_hs/info.json rename to keyboards/aliceh66/pianoforte_hs/keyboard.json diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/keyboard.json similarity index 100% rename from keyboards/amjkeyboard/amj66/info.json rename to keyboards/amjkeyboard/amj66/keyboard.json diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/keyboard.json similarity index 100% rename from keyboards/amjkeyboard/amj96/info.json rename to keyboards/amjkeyboard/amj96/keyboard.json diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/keyboard.json similarity index 100% rename from keyboards/annepro2/c15/info.json rename to keyboards/annepro2/c15/keyboard.json diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/keyboard.json similarity index 100% rename from keyboards/annepro2/c18/info.json rename to keyboards/annepro2/c18/keyboard.json diff --git a/keyboards/argyle/info.json b/keyboards/argyle/keyboard.json similarity index 100% rename from keyboards/argyle/info.json rename to keyboards/argyle/keyboard.json diff --git a/keyboards/arrowmechanics/wings/info.json b/keyboards/arrowmechanics/wings/keyboard.json similarity index 100% rename from keyboards/arrowmechanics/wings/info.json rename to keyboards/arrowmechanics/wings/keyboard.json diff --git a/keyboards/artifact/lvl/rev_hs01/info.json b/keyboards/artifact/lvl/rev_hs01/keyboard.json similarity index 100% rename from keyboards/artifact/lvl/rev_hs01/info.json rename to keyboards/artifact/lvl/rev_hs01/keyboard.json diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/keyboard.json similarity index 100% rename from keyboards/aurora65/info.json rename to keyboards/aurora65/keyboard.json diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/keyboard.json similarity index 100% rename from keyboards/axolstudio/helpo/info.json rename to keyboards/axolstudio/helpo/keyboard.json diff --git a/keyboards/baion_808/info.json b/keyboards/baion_808/keyboard.json similarity index 100% rename from keyboards/baion_808/info.json rename to keyboards/baion_808/keyboard.json diff --git a/keyboards/bajjak/info.json b/keyboards/bajjak/keyboard.json similarity index 100% rename from keyboards/bajjak/info.json rename to keyboards/bajjak/keyboard.json diff --git a/keyboards/barleycorn_smd/info.json b/keyboards/barleycorn_smd/keyboard.json similarity index 100% rename from keyboards/barleycorn_smd/info.json rename to keyboards/barleycorn_smd/keyboard.json diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/keyboard.json similarity index 100% rename from keyboards/basketweave/info.json rename to keyboards/basketweave/keyboard.json diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/keyboard.json similarity index 100% rename from keyboards/bbrfkr/dynamis/info.json rename to keyboards/bbrfkr/dynamis/keyboard.json diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/keyboard.json similarity index 100% rename from keyboards/beekeeb/piantor/info.json rename to keyboards/beekeeb/piantor/keyboard.json diff --git a/keyboards/beekeeb/piantor_pro/info.json b/keyboards/beekeeb/piantor_pro/keyboard.json similarity index 100% rename from keyboards/beekeeb/piantor_pro/info.json rename to keyboards/beekeeb/piantor_pro/keyboard.json diff --git a/keyboards/bioi/g60/info.json b/keyboards/bioi/g60/keyboard.json similarity index 100% rename from keyboards/bioi/g60/info.json rename to keyboards/bioi/g60/keyboard.json diff --git a/keyboards/bioi/g60ble/info.json b/keyboards/bioi/g60ble/keyboard.json similarity index 100% rename from keyboards/bioi/g60ble/info.json rename to keyboards/bioi/g60ble/keyboard.json diff --git a/keyboards/bioi/morgan65/info.json b/keyboards/bioi/morgan65/keyboard.json similarity index 100% rename from keyboards/bioi/morgan65/info.json rename to keyboards/bioi/morgan65/keyboard.json diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/keyboard.json similarity index 100% rename from keyboards/boardsource/equals/48/info.json rename to keyboards/boardsource/equals/48/keyboard.json diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/keyboard.json similarity index 100% rename from keyboards/boardsource/equals/60/info.json rename to keyboards/boardsource/equals/60/keyboard.json diff --git a/keyboards/boardsource/lulu/rp2040/info.json b/keyboards/boardsource/lulu/rp2040/keyboard.json similarity index 100% rename from keyboards/boardsource/lulu/rp2040/info.json rename to keyboards/boardsource/lulu/rp2040/keyboard.json diff --git a/keyboards/boardsource/unicorne/info.json b/keyboards/boardsource/unicorne/keyboard.json similarity index 100% rename from keyboards/boardsource/unicorne/info.json rename to keyboards/boardsource/unicorne/keyboard.json diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/keyboard.json similarity index 51% rename from keyboards/boston_meetup/2019/info.json rename to keyboards/boston_meetup/2019/keyboard.json index 5ced95c018b..97990bb5030 100644 --- a/keyboards/boston_meetup/2019/info.json +++ b/keyboards/boston_meetup/2019/keyboard.json @@ -1,6 +1,12 @@ { + "keyboard_name": "Boston Meetup Board", + "manufacturer": "ishtob", + "url": "", + "maintainer": "qmk", "usb": { - "device_version": "20.1.9" + "vid": "0xFB30", + "pid": "0x26BE", + "device_version": "20.1.9" }, "features": { "bootmagic": true, @@ -45,5 +51,27 @@ "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", - "debounce": 6 + "debounce": 6, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} + ] + } + } } diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json deleted file mode 100644 index 3156c643c96..00000000000 --- a/keyboards/boston_meetup/info.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "keyboard_name": "Boston Meetup Board", - "manufacturer": "ishtob", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0xFB30", - "pid": "0x26BE" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3} - ] - } - } -} diff --git a/keyboards/boston_meetup/rules.mk b/keyboards/boston_meetup/rules.mk index 6dd899edc85..6d6745a0e57 100644 --- a/keyboards/boston_meetup/rules.mk +++ b/keyboards/boston_meetup/rules.mk @@ -1,2 +1 @@ - DEFAULT_FOLDER = boston_meetup/2019 diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/keyboard.json similarity index 100% rename from keyboards/bpiphany/ghost_squid/info.json rename to keyboards/bpiphany/ghost_squid/keyboard.json diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/keyboard.json similarity index 100% rename from keyboards/bpiphany/hid_liber/info.json rename to keyboards/bpiphany/hid_liber/keyboard.json diff --git a/keyboards/bpiphany/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk index 1b9ebdb1312..3215e3588a3 100755 --- a/keyboards/bpiphany/hid_liber/rules.mk +++ b/keyboards/bpiphany/hid_liber/rules.mk @@ -1,4 +1,2 @@ -CUSTOM_MATRIX = yes # Custom matrix file - -# Project specific files +CUSTOM_MATRIX = yes SRC = matrix.c diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/keyboard.json similarity index 100% rename from keyboards/bpiphany/kitten_paw/info.json rename to keyboards/bpiphany/kitten_paw/keyboard.json diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/keyboard.json similarity index 100% rename from keyboards/bpiphany/pegasushoof/2013/info.json rename to keyboards/bpiphany/pegasushoof/2013/keyboard.json diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/keyboard.json similarity index 100% rename from keyboards/bpiphany/pegasushoof/2015/info.json rename to keyboards/bpiphany/pegasushoof/2015/keyboard.json diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/keyboard.json similarity index 100% rename from keyboards/bpiphany/tiger_lily/info.json rename to keyboards/bpiphany/tiger_lily/keyboard.json diff --git a/keyboards/bpiphany/unloved_bastard/info.json b/keyboards/bpiphany/unloved_bastard/keyboard.json similarity index 100% rename from keyboards/bpiphany/unloved_bastard/info.json rename to keyboards/bpiphany/unloved_bastard/keyboard.json diff --git a/keyboards/budgy/info.json b/keyboards/budgy/keyboard.json similarity index 100% rename from keyboards/budgy/info.json rename to keyboards/budgy/keyboard.json diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/keyboard.json similarity index 100% rename from keyboards/buzzard/rev1/info.json rename to keyboards/buzzard/rev1/keyboard.json From bbf63a84664282289a10ccf2b7bd4dadde3ed635 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 13 Apr 2024 13:15:22 +1000 Subject: [PATCH 02/23] LED Matrix: replace backlight keycodes with newly added ones (#23455) --- .../66_hotswap/gen1/keymaps/66_ansi/keymap.c | 2 +- .../66_hotswap/gen1/keymaps/default/keymap.c | 6 ++-- .../keymaps/halfkeyboard/keymap.c | 4 +-- .../ansi/white/keymaps/default/keymap.c | 16 +++++----- .../ansi/white/keymaps/keychron/keymap.c | 16 +++++----- .../c1_pro/ansi/white/keymaps/via/keymap.c | 16 +++++----- keyboards/keychron/c1_pro/ansi/white/white.c | 2 +- .../ansi/white/keymaps/default/keymap.c | 16 +++++----- .../ansi/white/keymaps/keychron/keymap.c | 16 +++++----- .../c2_pro/ansi/white/keymaps/via/keymap.c | 16 +++++----- .../s1/ansi/white/keymaps/default/keymap.c | 16 +++++----- .../s1/ansi/white/keymaps/keychron/keymap.c | 16 +++++----- .../s1/ansi/white/keymaps/via/keymap.c | 16 +++++----- keyboards/keychron/s1/s1.c | 2 +- quantum/process_keycode/process_led_matrix.c | 29 ++++++++++++++----- 15 files changed, 102 insertions(+), 87 deletions(-) diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c index 4dfa570cbcc..9bd7f227dc1 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/66_ansi/keymap.c @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _CL: Control layer */ [_CL] = LAYOUT_66_ansi( - BL_STEP,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, + LM_NEXT,RGB_M_P,RGB_M_B,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, RGB_TOG, RGB_VAI, _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, RGB_VAD, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, diff --git a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c index 2a1a7722721..07f7d0f7dea 100644 --- a/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c +++ b/keyboards/clueboard/66_hotswap/gen1/keymaps/default/keymap.c @@ -68,11 +68,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _CL: Control layer */ [_CL] = LAYOUT( - BL_STEP,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, BL_TOGG, BL_UP, - _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, BL_DOWN, + LM_NEXT,S_ONEUP,S_SCALE,RGB_M_R,RGB_M_SW,RGB_M_SN,RGB_M_K,RGB_M_X,RGB_M_G,_______,_______,_______,_______, LM_TOGG, LM_BRIU, + _______,_______,_______,_______,QK_BOOT, _______,_______,_______,_______,_______,_______,_______,_______,_______, LM_BRID, _______,_______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, RGB_SAI, - _______,_______,_______, BL_BRTG,BL_BRTG, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), + _______,_______,_______, _______,_______, _______,_______,MO(_FL),_______,RGB_HUD,RGB_SAD,RGB_HUI), }; diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c index 35f459fab5f..48b26c704ee 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c @@ -233,8 +233,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_DOWN, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_MINUS, KC_KP_ENTER, KC_NO,KC_AMPR,KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_PLUS, KC_NO, KC_TRNS,KC_DOT, KC_0, KC_KP_EQUAL, KC_NO, - BL_OFF, KC_TRNS, - BL_ON, + LM_OFF, KC_TRNS, + LM_ON, KC_NO, KC_NO, LT(HALFSYMB, KC_ENT) ), /* Keymap 6: Mirrored Symbol Layer diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c index a829c118922..93dab79e7a1 100644 --- a/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c +++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/default/keymap.c @@ -30,7 +30,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_tkl_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_tkl_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_tkl_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, BL_STEP, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_tkl_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c index e17d67eb718..f819b4fc031 100644 --- a/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c +++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/keychron/keymap.c @@ -26,7 +26,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_tkl_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_tkl_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_tkl_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_CRTA, BL_STEP, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_CRTA, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_tkl_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c index a829c118922..93dab79e7a1 100644 --- a/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c +++ b/keyboards/keychron/c1_pro/ansi/white/keymaps/via/keymap.c @@ -30,7 +30,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_tkl_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_tkl_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_tkl_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, BL_STEP, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_tkl_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/c1_pro/ansi/white/white.c b/keyboards/keychron/c1_pro/ansi/white/white.c index 2b41845c9b5..9009225b3b2 100644 --- a/keyboards/keychron/c1_pro/ansi/white/white.c +++ b/keyboards/keychron/c1_pro/ansi/white/white.c @@ -128,7 +128,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return false; } switch (keycode) { - case BL_TOGG: + case LM_TOGG: if (record->event.pressed) { switch (led_matrix_get_flags()) { case LED_FLAG_ALL: { diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c index 70934e122e3..b8c26b19397 100644 --- a/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c +++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/default/keymap.c @@ -30,7 +30,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [MAC_FN] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [WIN_BASE] = LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_NO, BL_STEP, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [WIN_FN] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c index 09002c3d7a4..c99b5bc4916 100644 --- a/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c +++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/keychron/keymap.c @@ -26,7 +26,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [MAC_FN] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [WIN_BASE] = LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_CRTA, BL_STEP, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_CRTA, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [WIN_FN] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c index 547521e099b..a162e3d3a5e 100644 --- a/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c +++ b/keyboards/keychron/c2_pro/ansi/white/keymaps/via/keymap.c @@ -28,7 +28,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -36,15 +36,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [MAC_FN] = LAYOUT( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [WIN_BASE] = LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_NO, BL_STEP, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_NO, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, @@ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), [WIN_FN] = LAYOUT( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c index 00dc1c07793..1ee03394298 100644 --- a/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c +++ b/keyboards/keychron/s1/ansi/white/keymaps/default/keymap.c @@ -30,7 +30,7 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_75_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_75_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_75_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, BL_STEP, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_75_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c index baced4f97c7..cf080071764 100644 --- a/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c +++ b/keyboards/keychron/s1/ansi/white/keymaps/keychron/keymap.c @@ -28,7 +28,7 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_75_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -36,15 +36,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_75_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_75_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, BL_STEP, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_75_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c index 10d2e08aef3..a515205b3a0 100644 --- a/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c +++ b/keyboards/keychron/s1/ansi/white/keymaps/via/keymap.c @@ -30,7 +30,7 @@ enum layers { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_75_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, BL_STEP, + KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_75_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), [WIN_BASE] = LAYOUT_75_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, BL_STEP, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, LM_NEXT, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, @@ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_75_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, LM_BRID, LM_BRIU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, LM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + LM_TOGG, LM_NEXT, LM_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, LM_BRID, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/s1/s1.c b/keyboards/keychron/s1/s1.c index 2f1b905505f..51bc0596c4a 100644 --- a/keyboards/keychron/s1/s1.c +++ b/keyboards/keychron/s1/s1.c @@ -78,7 +78,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (!process_record_user(keycode, record)) { return false; } switch (keycode) { #ifdef LED_MATRIX_ENABLE - case BL_TOGG: + case LM_TOGG: if (record->event.pressed) { switch (led_matrix_get_flags()) { case LED_FLAG_ALL: { diff --git a/quantum/process_keycode/process_led_matrix.c b/quantum/process_keycode/process_led_matrix.c index 217c9a2c28a..7f95bf10115 100644 --- a/quantum/process_keycode/process_led_matrix.c +++ b/quantum/process_keycode/process_led_matrix.c @@ -7,24 +7,39 @@ bool process_led_matrix(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { switch (keycode) { - case QK_BACKLIGHT_ON: + case QK_BACKLIGHT_ON: // TODO: Remove backlight keycodes + case QK_LED_MATRIX_ON: led_matrix_enable(); return false; case QK_BACKLIGHT_OFF: + case QK_LED_MATRIX_OFF: led_matrix_disable(); return false; - case QK_BACKLIGHT_DOWN: - led_matrix_decrease_val(); - return false; - case QK_BACKLIGHT_UP: - led_matrix_increase_val(); - return false; case QK_BACKLIGHT_TOGGLE: + case QK_LED_MATRIX_TOGGLE: led_matrix_toggle(); return false; case QK_BACKLIGHT_STEP: + case QK_LED_MATRIX_MODE_NEXT: led_matrix_step(); return false; + case QK_LED_MATRIX_MODE_PREVIOUS: + led_matrix_step_reverse(); + return false; + case QK_BACKLIGHT_UP: + case QK_LED_MATRIX_BRIGHTNESS_UP: + led_matrix_increase_val(); + return false; + case QK_BACKLIGHT_DOWN: + case QK_LED_MATRIX_BRIGHTNESS_DOWN: + led_matrix_decrease_val(); + return false; + case QK_LED_MATRIX_SPEED_UP: + led_matrix_increase_speed(); + return false; + case QK_LED_MATRIX_SPEED_DOWN: + led_matrix_decrease_speed(); + return false; } } From 43a122e050647057dbaa16bc50417b9306e00bcc Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 13 Apr 2024 06:31:34 +0100 Subject: [PATCH 03/23] Migrate build target markers to keyboard.json - W (#23511) --- .../waterfowl/{info.json => keyboard.json} | 8 ++++ keyboards/waterfowl/rules.mk | 15 ------- keyboards/wekey/we27/config.h | 39 ------------------- .../wekey/we27/{info.json => keyboard.json} | 14 +++++++ keyboards/wekey/we27/rules.mk | 15 ------- keyboards/westm/westmergo/config.h | 22 ----------- .../westmergo/{info.json => keyboard.json} | 15 +++++++ keyboards/westm/westmergo/rules.mk | 13 ------- .../whale/sk/v3/{info.json => keyboard.json} | 6 +++ keyboards/whale/sk/v3/rules.mk | 12 ------ .../{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/rama_works_kara/rules.mk | 15 +------ .../{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/rama_works_koyu/rules.mk | 15 +------ .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m10_c/rules.mk | 18 ++------- .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m50_a/rules.mk | 18 ++------- .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m60_a/rules.mk | 15 +------ .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m65_b/rules.mk | 18 ++------- .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_m65_bx/rules.mk | 18 ++------- .../{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/rama_works_m6_a/rules.mk | 13 ------- .../{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/rama_works_m6_b/rules.mk | 15 +------ .../{info.json => keyboard.json} | 6 +++ .../wilba_tech/rama_works_u80_a/rules.mk | 13 +------ .../wt60_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt60_a/rules.mk | 13 +------ .../wt60_b/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt60_b/rules.mk | 15 +------ .../wt60_bx/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt60_bx/rules.mk | 15 +------ .../wt60_c/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt60_c/rules.mk | 15 +------ .../wt65_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt65_a/rules.mk | 13 +------ .../wt65_b/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt65_b/rules.mk | 13 +------ .../wt69_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt69_a/rules.mk | 12 ------ .../wt75_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt75_a/rules.mk | 13 +------ .../wt75_b/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt75_b/rules.mk | 13 +------ .../wt75_c/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt75_c/rules.mk | 13 +------ .../wt80_a/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/wt80_a/rules.mk | 13 +------ keyboards/wilba_tech/wt80_bc/config.h | 22 ----------- .../wt80_bc/{info.json => keyboard.json} | 12 ++++++ keyboards/wilba_tech/wt80_bc/rules.mk | 12 ------ keyboards/wilba_tech/wt8_a/config.h | 22 ----------- .../wt8_a/{info.json => keyboard.json} | 12 ++++++ keyboards/wilba_tech/wt8_a/rules.mk | 12 ------ .../zeal60/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/zeal60/rules.mk | 15 +------ .../zeal65/{info.json => keyboard.json} | 6 +++ keyboards/wilba_tech/zeal65/rules.mk | 15 +------ .../wolf/frogpad/{info.json => keyboard.json} | 0 .../wolf/kuku65/{info.json => keyboard.json} | 6 +++ keyboards/wolf/kuku65/rules.mk | 13 ------- .../wolf/m60_b/{info.json => keyboard.json} | 0 .../wolf/m6_c/{info.json => keyboard.json} | 0 .../wolf/neely65/{info.json => keyboard.json} | 0 .../wolf/ryujin/{info.json => keyboard.json} | 6 +++ keyboards/wolf/ryujin/rules.mk | 13 ------- .../wolf/sabre/{info.json => keyboard.json} | 7 ++++ keyboards/wolf/sabre/rules.mk | 14 ------- .../wolf/ts60/{info.json => keyboard.json} | 8 ++++ keyboards/wolf/ts60/rules.mk | 13 ------- keyboards/wolfmarkclub/wm1/config.h | 39 ------------------- .../wm1/{info.json => keyboard.json} | 21 ++++++++++ keyboards/wolfmarkclub/wm1/rules.mk | 22 ----------- .../micro/{info.json => keyboard.json} | 0 .../nano/{info.json => keyboard.json} | 12 ++++++ keyboards/work_louder/nano/rules.mk | 17 -------- .../numpad/{info.json => keyboard.json} | 0 keyboards/wren/config.h | 21 ---------- keyboards/wren/{info.json => keyboard.json} | 13 +++++++ keyboards/wren/rules.mk | 13 ------- .../creek70/{info.json => keyboard.json} | 3 +- keyboards/wuque/creek70/rules.mk | 1 - keyboards/wuque/ikki68_aurora/config.h | 24 ------------ .../{info.json => keyboard.json} | 13 +++++++ keyboards/wuque/ikki68_aurora/rules.mk | 14 ------- .../serneity65/{info.json => keyboard.json} | 8 ++++ keyboards/wuque/serneity65/rules.mk | 15 ------- 91 files changed, 330 insertions(+), 711 deletions(-) rename keyboards/waterfowl/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/waterfowl/rules.mk delete mode 100644 keyboards/wekey/we27/config.h rename keyboards/wekey/we27/{info.json => keyboard.json} (89%) delete mode 100644 keyboards/westm/westmergo/config.h rename keyboards/westm/westmergo/{info.json => keyboard.json} (93%) rename keyboards/whale/sk/v3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/whale/sk/v3/rules.mk rename keyboards/wilba_tech/rama_works_kara/{info.json => keyboard.json} (96%) rename keyboards/wilba_tech/rama_works_koyu/{info.json => keyboard.json} (97%) rename keyboards/wilba_tech/rama_works_m10_c/{info.json => keyboard.json} (91%) rename keyboards/wilba_tech/rama_works_m50_a/{info.json => keyboard.json} (96%) rename keyboards/wilba_tech/rama_works_m60_a/{info.json => keyboard.json} (96%) rename keyboards/wilba_tech/rama_works_m65_b/{info.json => keyboard.json} (97%) rename keyboards/wilba_tech/rama_works_m65_bx/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/rama_works_m6_a/{info.json => keyboard.json} (87%) rename keyboards/wilba_tech/rama_works_m6_b/{info.json => keyboard.json} (87%) rename keyboards/wilba_tech/rama_works_u80_a/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt60_a/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt60_b/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt60_bx/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt60_c/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt65_a/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt65_b/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt69_a/{info.json => keyboard.json} (98%) rename keyboards/wilba_tech/wt75_a/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt75_b/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt75_c/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/wt80_a/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/wilba_tech/wt80_bc/config.h rename keyboards/wilba_tech/wt80_bc/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/wilba_tech/wt8_a/config.h rename keyboards/wilba_tech/wt8_a/{info.json => keyboard.json} (80%) rename keyboards/wilba_tech/zeal60/{info.json => keyboard.json} (99%) rename keyboards/wilba_tech/zeal65/{info.json => keyboard.json} (98%) rename keyboards/wolf/frogpad/{info.json => keyboard.json} (100%) rename keyboards/wolf/kuku65/{info.json => keyboard.json} (97%) rename keyboards/wolf/m60_b/{info.json => keyboard.json} (100%) rename keyboards/wolf/m6_c/{info.json => keyboard.json} (100%) rename keyboards/wolf/neely65/{info.json => keyboard.json} (100%) rename keyboards/wolf/ryujin/{info.json => keyboard.json} (97%) rename keyboards/wolf/sabre/{info.json => keyboard.json} (97%) rename keyboards/wolf/ts60/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/wolfmarkclub/wm1/config.h rename keyboards/wolfmarkclub/wm1/{info.json => keyboard.json} (91%) rename keyboards/work_louder/micro/{info.json => keyboard.json} (100%) rename keyboards/work_louder/nano/{info.json => keyboard.json} (91%) rename keyboards/work_louder/numpad/{info.json => keyboard.json} (100%) rename keyboards/wren/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/wren/rules.mk rename keyboards/wuque/creek70/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wuque/creek70/rules.mk delete mode 100644 keyboards/wuque/ikki68_aurora/config.h rename keyboards/wuque/ikki68_aurora/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wuque/ikki68_aurora/rules.mk rename keyboards/wuque/serneity65/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/wuque/serneity65/rules.mk diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/keyboard.json similarity index 94% rename from keyboards/waterfowl/info.json rename to keyboards/waterfowl/keyboard.json index 92b4add8ea2..a1783130426 100644 --- a/keyboards/waterfowl/info.json +++ b/keyboards/waterfowl/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x9CE3", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/waterfowl/rules.mk b/keyboards/waterfowl/rules.mk deleted file mode 100644 index afab74111f8..00000000000 --- a/keyboards/waterfowl/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -OLED_ENABLE = yes # Enables the use of OLED displays -ENCODER_ENABLE = yes # Enables the encoders diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h deleted file mode 100644 index c86ead57bd8..00000000000 --- a/keyboards/wekey/we27/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 @wekey - -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/wekey/we27/info.json b/keyboards/wekey/we27/keyboard.json similarity index 89% rename from keyboards/wekey/we27/info.json rename to keyboards/wekey/we27/keyboard.json index 802ae8eed6c..d8cb7b0f802 100644 --- a/keyboards/wekey/we27/info.json +++ b/keyboards/wekey/we27/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "animations": { "rainbow_moving_chevron": true diff --git a/keyboards/wekey/we27/rules.mk b/keyboards/wekey/we27/rules.mk index 1c5cc136ca4..942ef4c5dbd 100644 --- a/keyboards/wekey/we27/rules.mk +++ b/keyboards/wekey/we27/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes # Use RGB matrix - RGB_MATRIX_CUSTOM_KB = yes diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h deleted file mode 100644 index 4e85b2e402a..00000000000 --- a/keyboards/westm/westmergo/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2021 WestM - * - * 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/westm/westmergo/info.json b/keyboards/westm/westmergo/keyboard.json similarity index 93% rename from keyboards/westm/westmergo/info.json rename to keyboards/westm/westmergo/keyboard.json index de733b988a8..0ead8662029 100644 --- a/keyboards/westm/westmergo/info.json +++ b/keyboards/westm/westmergo/keyboard.json @@ -8,6 +8,21 @@ "pid": "0x0201", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 16, "animations": { diff --git a/keyboards/westm/westmergo/rules.mk b/keyboards/westm/westmergo/rules.mk index aae254503b0..0ab54aaaf71 100644 --- a/keyboards/westm/westmergo/rules.mk +++ b/keyboards/westm/westmergo/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 = 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 \ No newline at end of file diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/keyboard.json similarity index 98% rename from keyboards/whale/sk/v3/info.json rename to keyboards/whale/sk/v3/keyboard.json index a7751b1d064..ce73d8251cb 100644 --- a/keyboards/whale/sk/v3/info.json +++ b/keyboards/whale/sk/v3/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0495", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "F4", "F5", "F6"], "rows": ["B1", "B2", "B3", "B4", "B5", "B6"] diff --git a/keyboards/whale/sk/v3/rules.mk b/keyboards/whale/sk/v3/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/whale/sk/v3/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/keyboard.json similarity index 96% rename from keyboards/wilba_tech/rama_works_kara/info.json rename to keyboards/wilba_tech/rama_works_kara/keyboard.json index d4a5d079b3c..896892e2847 100644 --- a/keyboards/wilba_tech/rama_works_kara/info.json +++ b/keyboards/wilba_tech/rama_works_kara/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4B52", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_kara/rules.mk b/keyboards/wilba_tech/rama_works_kara/rules.mk index b49711824a2..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_kara/rules.mk +++ b/keyboards/wilba_tech/rama_works_kara/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 - 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/wilba_tech/rama_works_koyu/info.json b/keyboards/wilba_tech/rama_works_koyu/keyboard.json similarity index 97% rename from keyboards/wilba_tech/rama_works_koyu/info.json rename to keyboards/wilba_tech/rama_works_koyu/keyboard.json index 6d3def254d5..507b5e1546f 100644 --- a/keyboards/wilba_tech/rama_works_koyu/info.json +++ b/keyboards/wilba_tech/rama_works_koyu/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x4B59", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_koyu/rules.mk b/keyboards/wilba_tech/rama_works_koyu/rules.mk index c921fc5c184..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_koyu/rules.mk +++ b/keyboards/wilba_tech/rama_works_koyu/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - 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/wilba_tech/rama_works_m10_c/info.json b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json similarity index 91% rename from keyboards/wilba_tech/rama_works_m10_c/info.json rename to keyboards/wilba_tech/rama_works_m10_c/keyboard.json index 3b75a67557e..bba4720aa34 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/info.json +++ b/keyboards/wilba_tech/rama_works_m10_c/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x00AC", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D7", "B6", "F0", "D6", "B5", "F1", "D4", "B4", "F4", "F5"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m10_c/rules.mk b/keyboards/wilba_tech/rama_works_m10_c/rules.mk index d8a2bae4553..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/rules.mk +++ b/keyboards/wilba_tech/rama_works_m10_c/rules.mk @@ -1,25 +1,13 @@ -# 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 -CIE1931_CURVE = yes - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +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/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json similarity index 96% rename from keyboards/wilba_tech/rama_works_m50_a/info.json rename to keyboards/wilba_tech/rama_works_m50_a/keyboard.json index 5745804c5dd..bf33a12277f 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/info.json +++ b/keyboards/wilba_tech/rama_works_m50_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x050A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "B5", "C7", "C6", "B6", "B2", "B3", "B1", "B4", "D7", "D6", "D4", "D3"], "rows": ["F0", "F1", "F5", "F6"] diff --git a/keyboards/wilba_tech/rama_works_m50_a/rules.mk b/keyboards/wilba_tech/rama_works_m50_a/rules.mk index d8a2bae4553..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m50_a/rules.mk @@ -1,25 +1,13 @@ -# 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 -CIE1931_CURVE = yes - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +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/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json similarity index 96% rename from keyboards/wilba_tech/rama_works_m60_a/info.json rename to keyboards/wilba_tech/rama_works_m60_a/keyboard.json index 32f6f2a5d3d..566f6cd42a4 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/info.json +++ b/keyboards/wilba_tech/rama_works_m60_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m60_a/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/rules.mk index c921fc5c184..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m60_a/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - 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/wilba_tech/rama_works_m65_b/info.json b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json similarity index 97% rename from keyboards/wilba_tech/rama_works_m65_b/info.json rename to keyboards/wilba_tech/rama_works_m65_b/keyboard.json index 5bc67f79251..156affff7da 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/info.json +++ b/keyboards/wilba_tech/rama_works_m65_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x065B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m65_b/rules.mk b/keyboards/wilba_tech/rama_works_m65_b/rules.mk index d8a2bae4553..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/rules.mk +++ b/keyboards/wilba_tech/rama_works_m65_b/rules.mk @@ -1,25 +1,13 @@ -# 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 -CIE1931_CURVE = yes - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +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/wilba_tech/rama_works_m65_bx/info.json b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json similarity index 98% rename from keyboards/wilba_tech/rama_works_m65_bx/info.json rename to keyboards/wilba_tech/rama_works_m65_bx/keyboard.json index 113dae991ba..9b4edcc6efc 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/info.json +++ b/keyboards/wilba_tech/rama_works_m65_bx/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x165B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk index d8a2bae4553..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/rules.mk +++ b/keyboards/wilba_tech/rama_works_m65_bx/rules.mk @@ -1,25 +1,13 @@ -# 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 -CIE1931_CURVE = yes - # Do not put the microcontroller into power saving mode # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN +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/wilba_tech/rama_works_m6_a/info.json b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json similarity index 87% rename from keyboards/wilba_tech/rama_works_m6_a/info.json rename to keyboards/wilba_tech/rama_works_m6_a/keyboard.json index 73091d30363..df7fc90a962 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/info.json +++ b/keyboards/wilba_tech/rama_works_m6_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x006A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "B5", "F4", "D7", "C6", "F6"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m6_a/rules.mk b/keyboards/wilba_tech/rama_works_m6_a/rules.mk index 95303152b9b..806a82e12af 100644 --- a/keyboards/wilba_tech/rama_works_m6_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_m6_a/rules.mk @@ -2,16 +2,3 @@ # when we get USB suspend event. We want it to keep updating # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN - -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. diff --git a/keyboards/wilba_tech/rama_works_m6_b/info.json b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json similarity index 87% rename from keyboards/wilba_tech/rama_works_m6_b/info.json rename to keyboards/wilba_tech/rama_works_m6_b/keyboard.json index 4356011aae1..4d258b826b9 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/info.json +++ b/keyboards/wilba_tech/rama_works_m6_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x006B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "B5", "F4", "D7", "C6", "F6"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/rama_works_m6_b/rules.mk b/keyboards/wilba_tech/rama_works_m6_b/rules.mk index eff0605d909..4650d7a6ea2 100644 --- a/keyboards/wilba_tech/rama_works_m6_b/rules.mk +++ b/keyboards/wilba_tech/rama_works_m6_b/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. - 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/is31fl3218.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/wilba_tech/rama_works_u80_a/info.json b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json similarity index 98% rename from keyboards/wilba_tech/rama_works_u80_a/info.json rename to keyboards/wilba_tech/rama_works_u80_a/keyboard.json index 96349f39093..bf06d9508f2 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/info.json +++ b/keyboards/wilba_tech/rama_works_u80_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x080A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/rama_works_u80_a/rules.mk b/keyboards/wilba_tech/rama_works_u80_a/rules.mk index b2629858808..d6df34b9bc0 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/rules.mk +++ b/keyboards/wilba_tech/rama_works_u80_a/rules.mk @@ -1,19 +1,8 @@ -# 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 -AUDIO_ENABLE = no # Audio output 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/wilba_tech/wt60_a/info.json b/keyboards/wilba_tech/wt60_a/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt60_a/info.json rename to keyboards/wilba_tech/wt60_a/keyboard.json index 6016905bdc3..1c6d9f8c35d 100644 --- a/keyboards/wilba_tech/wt60_a/info.json +++ b/keyboards/wilba_tech/wt60_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x060A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_a/rules.mk b/keyboards/wilba_tech/wt60_a/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt60_a/rules.mk +++ b/keyboards/wilba_tech/wt60_a/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt60_b/info.json b/keyboards/wilba_tech/wt60_b/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt60_b/info.json rename to keyboards/wilba_tech/wt60_b/keyboard.json index 253c081b9aa..765ba96f61f 100644 --- a/keyboards/wilba_tech/wt60_b/info.json +++ b/keyboards/wilba_tech/wt60_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x60B0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_b/rules.mk b/keyboards/wilba_tech/wt60_b/rules.mk index 397643d3722..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/wt60_b/rules.mk +++ b/keyboards/wilba_tech/wt60_b/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - 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/wilba_tech/wt60_bx/info.json b/keyboards/wilba_tech/wt60_bx/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt60_bx/info.json rename to keyboards/wilba_tech/wt60_bx/keyboard.json index 1978ce8a4f1..6b4b6e9fb18 100644 --- a/keyboards/wilba_tech/wt60_bx/info.json +++ b/keyboards/wilba_tech/wt60_bx/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x60B1", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_bx/rules.mk b/keyboards/wilba_tech/wt60_bx/rules.mk index 397643d3722..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/wt60_bx/rules.mk +++ b/keyboards/wilba_tech/wt60_bx/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - 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/wilba_tech/wt60_c/info.json b/keyboards/wilba_tech/wt60_c/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt60_c/info.json rename to keyboards/wilba_tech/wt60_c/keyboard.json index 652714f52af..569cca93b75 100644 --- a/keyboards/wilba_tech/wt60_c/info.json +++ b/keyboards/wilba_tech/wt60_c/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x60C0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt60_c/rules.mk b/keyboards/wilba_tech/wt60_c/rules.mk index 397643d3722..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/wt60_c/rules.mk +++ b/keyboards/wilba_tech/wt60_c/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - 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/wilba_tech/wt65_a/info.json b/keyboards/wilba_tech/wt65_a/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt65_a/info.json rename to keyboards/wilba_tech/wt65_a/keyboard.json index 1957c88dd2f..ec87e830f07 100644 --- a/keyboards/wilba_tech/wt65_a/info.json +++ b/keyboards/wilba_tech/wt65_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x065A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_a/rules.mk b/keyboards/wilba_tech/wt65_a/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt65_a/rules.mk +++ b/keyboards/wilba_tech/wt65_a/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt65_b/info.json b/keyboards/wilba_tech/wt65_b/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt65_b/info.json rename to keyboards/wilba_tech/wt65_b/keyboard.json index 10de33b143b..56f71f3fc11 100644 --- a/keyboards/wilba_tech/wt65_b/info.json +++ b/keyboards/wilba_tech/wt65_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x065B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt65_b/rules.mk b/keyboards/wilba_tech/wt65_b/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt65_b/rules.mk +++ b/keyboards/wilba_tech/wt65_b/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt69_a/info.json b/keyboards/wilba_tech/wt69_a/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt69_a/info.json rename to keyboards/wilba_tech/wt69_a/keyboard.json index bd93286a0f1..8321ae86c40 100644 --- a/keyboards/wilba_tech/wt69_a/info.json +++ b/keyboards/wilba_tech/wt69_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x069A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["B7", "B0", "F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt69_a/rules.mk b/keyboards/wilba_tech/wt69_a/rules.mk index 396da8c7344..c0b7344f731 100644 --- a/keyboards/wilba_tech/wt69_a/rules.mk +++ b/keyboards/wilba_tech/wt69_a/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 = 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 - # project specific files SRC = keyboards/wilba_tech/wt_main.c diff --git a/keyboards/wilba_tech/wt75_a/info.json b/keyboards/wilba_tech/wt75_a/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt75_a/info.json rename to keyboards/wilba_tech/wt75_a/keyboard.json index 5cbb6f1f8b6..609dff0c36f 100644 --- a/keyboards/wilba_tech/wt75_a/info.json +++ b/keyboards/wilba_tech/wt75_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x075A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt75_a/rules.mk b/keyboards/wilba_tech/wt75_a/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt75_a/rules.mk +++ b/keyboards/wilba_tech/wt75_a/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt75_b/info.json b/keyboards/wilba_tech/wt75_b/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt75_b/info.json rename to keyboards/wilba_tech/wt75_b/keyboard.json index c0e996e0018..15bc61e9236 100644 --- a/keyboards/wilba_tech/wt75_b/info.json +++ b/keyboards/wilba_tech/wt75_b/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x075B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B7", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "D4"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt75_b/rules.mk b/keyboards/wilba_tech/wt75_b/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt75_b/rules.mk +++ b/keyboards/wilba_tech/wt75_b/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt75_c/info.json b/keyboards/wilba_tech/wt75_c/keyboard.json similarity index 99% rename from keyboards/wilba_tech/wt75_c/info.json rename to keyboards/wilba_tech/wt75_c/keyboard.json index daa6303fb96..38d1450ae09 100644 --- a/keyboards/wilba_tech/wt75_c/info.json +++ b/keyboards/wilba_tech/wt75_c/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x075C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B7", "D4"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt75_c/rules.mk b/keyboards/wilba_tech/wt75_c/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt75_c/rules.mk +++ b/keyboards/wilba_tech/wt75_c/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt80_a/info.json b/keyboards/wilba_tech/wt80_a/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt80_a/info.json rename to keyboards/wilba_tech/wt80_a/keyboard.json index 570b3dc03af..d7d6d11882e 100644 --- a/keyboards/wilba_tech/wt80_a/info.json +++ b/keyboards/wilba_tech/wt80_a/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x080A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt80_a/rules.mk b/keyboards/wilba_tech/wt80_a/rules.mk index f7482c7a2f2..858c317c200 100644 --- a/keyboards/wilba_tech/wt80_a/rules.mk +++ b/keyboards/wilba_tech/wt80_a/rules.mk @@ -1,18 +1,7 @@ -# 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 -AUDIO_ENABLE = no # Audio output +I2C_DRIVER_REQUIRED = yes # project specific files SRC = drivers/led/issi/is31fl3736-mono.c \ quantum/color.c \ keyboards/wilba_tech/wt_mono_backlight.c \ keyboards/wilba_tech/wt_main.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file diff --git a/keyboards/wilba_tech/wt80_bc/config.h b/keyboards/wilba_tech/wt80_bc/config.h deleted file mode 100644 index 9541b1df126..00000000000 --- a/keyboards/wilba_tech/wt80_bc/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Jason Williams (Wilba) - * - * 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/wilba_tech/wt80_bc/info.json b/keyboards/wilba_tech/wt80_bc/keyboard.json similarity index 98% rename from keyboards/wilba_tech/wt80_bc/info.json rename to keyboards/wilba_tech/wt80_bc/keyboard.json index b76e9cf86ce..072b965aefe 100644 --- a/keyboards/wilba_tech/wt80_bc/info.json +++ b/keyboards/wilba_tech/wt80_bc/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x80B0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B7", "B0"], "rows": ["F1", "F0", "E6", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/wt80_bc/rules.mk b/keyboards/wilba_tech/wt80_bc/rules.mk index 5b8a8888456..c0b7344f731 100644 --- a/keyboards/wilba_tech/wt80_bc/rules.mk +++ b/keyboards/wilba_tech/wt80_bc/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 = 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 - # project specific files SRC = keyboards/wilba_tech/wt_main.c diff --git a/keyboards/wilba_tech/wt8_a/config.h b/keyboards/wilba_tech/wt8_a/config.h deleted file mode 100644 index 1377a18714c..00000000000 --- a/keyboards/wilba_tech/wt8_a/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * - * 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/wilba_tech/wt8_a/info.json b/keyboards/wilba_tech/wt8_a/keyboard.json similarity index 80% rename from keyboards/wilba_tech/wt8_a/info.json rename to keyboards/wilba_tech/wt8_a/keyboard.json index a07707d7897..a84ff6a33f9 100644 --- a/keyboards/wilba_tech/wt8_a/info.json +++ b/keyboards/wilba_tech/wt8_a/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x008A", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F1", "B2", "B6", "F6", "F7", "D5", "B4"], "rows": ["E6"] diff --git a/keyboards/wilba_tech/wt8_a/rules.mk b/keyboards/wilba_tech/wt8_a/rules.mk index 396da8c7344..c0b7344f731 100644 --- a/keyboards/wilba_tech/wt8_a/rules.mk +++ b/keyboards/wilba_tech/wt8_a/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 = 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 - # project specific files SRC = keyboards/wilba_tech/wt_main.c diff --git a/keyboards/wilba_tech/zeal60/info.json b/keyboards/wilba_tech/zeal60/keyboard.json similarity index 99% rename from keyboards/wilba_tech/zeal60/info.json rename to keyboards/wilba_tech/zeal60/keyboard.json index 295d11c0696..34f7a312aaf 100644 --- a/keyboards/wilba_tech/zeal60/info.json +++ b/keyboards/wilba_tech/zeal60/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/zeal60/rules.mk b/keyboards/wilba_tech/zeal60/rules.mk index d1ce11b473c..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/zeal60/rules.mk +++ b/keyboards/wilba_tech/zeal60/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - 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/wilba_tech/zeal65/info.json b/keyboards/wilba_tech/zeal65/keyboard.json similarity index 98% rename from keyboards/wilba_tech/zeal65/info.json rename to keyboards/wilba_tech/zeal65/keyboard.json index 814ea28660e..2bc5e65b7b2 100644 --- a/keyboards/wilba_tech/zeal65/info.json +++ b/keyboards/wilba_tech/zeal65/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F0", "F1", "F4", "F6", "F7"] diff --git a/keyboards/wilba_tech/zeal65/rules.mk b/keyboards/wilba_tech/zeal65/rules.mk index d1ce11b473c..34e6eaa45b8 100644 --- a/keyboards/wilba_tech/zeal65/rules.mk +++ b/keyboards/wilba_tech/zeal65/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - 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/wolf/frogpad/info.json b/keyboards/wolf/frogpad/keyboard.json similarity index 100% rename from keyboards/wolf/frogpad/info.json rename to keyboards/wolf/frogpad/keyboard.json diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/keyboard.json similarity index 97% rename from keyboards/wolf/kuku65/info.json rename to keyboards/wolf/kuku65/keyboard.json index e088a5b7779..5146d77d1b5 100644 --- a/keyboards/wolf/kuku65/info.json +++ b/keyboards/wolf/kuku65/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0052", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"], "rows": ["B3", "B2", "B1", "B0", "B7"] diff --git a/keyboards/wolf/kuku65/rules.mk b/keyboards/wolf/kuku65/rules.mk index 67bb6296514..3437a35bdf1 100644 --- a/keyboards/wolf/kuku65/rules.mk +++ b/keyboards/wolf/kuku65/rules.mk @@ -1,15 +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 = 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/wolf/m60_b/info.json b/keyboards/wolf/m60_b/keyboard.json similarity index 100% rename from keyboards/wolf/m60_b/info.json rename to keyboards/wolf/m60_b/keyboard.json diff --git a/keyboards/wolf/m6_c/info.json b/keyboards/wolf/m6_c/keyboard.json similarity index 100% rename from keyboards/wolf/m6_c/info.json rename to keyboards/wolf/m6_c/keyboard.json diff --git a/keyboards/wolf/neely65/info.json b/keyboards/wolf/neely65/keyboard.json similarity index 100% rename from keyboards/wolf/neely65/info.json rename to keyboards/wolf/neely65/keyboard.json diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/keyboard.json similarity index 97% rename from keyboards/wolf/ryujin/info.json rename to keyboards/wolf/ryujin/keyboard.json index 1e7702a3401..8e72cccd9e9 100644 --- a/keyboards/wolf/ryujin/info.json +++ b/keyboards/wolf/ryujin/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0200", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D5", "D3", "D2", "D1", "D0"] diff --git a/keyboards/wolf/ryujin/rules.mk b/keyboards/wolf/ryujin/rules.mk index 67bb6296514..3437a35bdf1 100644 --- a/keyboards/wolf/ryujin/rules.mk +++ b/keyboards/wolf/ryujin/rules.mk @@ -1,15 +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 = 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/wolf/sabre/info.json b/keyboards/wolf/sabre/keyboard.json similarity index 97% rename from keyboards/wolf/sabre/info.json rename to keyboards/wolf/sabre/keyboard.json index 1be6824d09e..11b235efe7a 100644 --- a/keyboards/wolf/sabre/info.json +++ b/keyboards/wolf/sabre/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0055", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B2", "B1"], "rows": ["D0", "D1", "F1", "F0", "B5", "B6", "C7", "C6", "F6", "F7", "F4", "F5"] diff --git a/keyboards/wolf/sabre/rules.mk b/keyboards/wolf/sabre/rules.mk index e7cc37d18d6..3437a35bdf1 100644 --- a/keyboards/wolf/sabre/rules.mk +++ b/keyboards/wolf/sabre/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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -BACKLIGHT_ENABLE = yes diff --git a/keyboards/wolf/ts60/info.json b/keyboards/wolf/ts60/keyboard.json similarity index 97% rename from keyboards/wolf/ts60/info.json rename to keyboards/wolf/ts60/keyboard.json index 8f6d9318ea5..ff5059f2f1c 100644 --- a/keyboards/wolf/ts60/info.json +++ b/keyboards/wolf/ts60/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D1", "D5", "C7", "C6", "B6", "B5", "B4", "D7"], "rows": ["D2", "D3", "D6", "D4", "F6", "F7", "F5", "F0", "F4", "F1"] diff --git a/keyboards/wolf/ts60/rules.mk b/keyboards/wolf/ts60/rules.mk index fb26dc7de5f..3437a35bdf1 100644 --- a/keyboards/wolf/ts60/rules.mk +++ b/keyboards/wolf/ts60/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/wolfmarkclub/wm1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 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/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/keyboard.json similarity index 91% rename from keyboards/wolfmarkclub/wm1/info.json rename to keyboards/wolfmarkclub/wm1/keyboard.json index 04b8ae3b115..56c062e1024 100644 --- a/keyboards/wolfmarkclub/wm1/info.json +++ b/keyboards/wolfmarkclub/wm1/keyboard.json @@ -8,6 +8,25 @@ "pid": "0x2B29", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "sleep_led": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, @@ -34,6 +53,8 @@ "rows": ["C4", "A7", "A6", "A5", "A4"] }, "diode_direction": "COL2ROW", + "processor": "STM32F103", + "bootloader": "custom", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk index 512ef119fdb..63ba3477c3c 100644 --- a/keyboards/wolfmarkclub/wm1/rules.mk +++ b/keyboards/wolfmarkclub/wm1/rules.mk @@ -1,27 +1,5 @@ -# MCU name -MCU = STM32F103 - # GENERIC STM32F103C8T6 board - mass storage bootloader MCU_LDSCRIPT = wm1_f103 BOARD = STM32_F103_STM32DUINO -# Bootloader selection -BOOTLOADER = custom - PROGRAM_CMD = echo 'CLI flashing not supported' >&2 - -# 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 -SLEEP_LED_ENABLE = yes -LTO_ENABLE = yes - diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/keyboard.json similarity index 100% rename from keyboards/work_louder/micro/info.json rename to keyboards/work_louder/micro/keyboard.json diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/keyboard.json similarity index 91% rename from keyboards/work_louder/nano/info.json rename to keyboards/work_louder/nano/keyboard.json index 61c48b3e802..e15d095de0f 100644 --- a/keyboards/work_louder/nano/info.json +++ b/keyboards/work_louder/nano/keyboard.json @@ -9,6 +9,18 @@ "device_version": "0.0.1", "max_power": 100 }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "rgblight": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/work_louder/nano/rules.mk b/keyboards/work_louder/nano/rules.mk index bcbb4bb31d5..e0822c009b2 100644 --- a/keyboards/work_louder/nano/rules.mk +++ b/keyboards/work_louder/nano/rules.mk @@ -1,18 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -LTO_ENABLE = yes - -RGB_MATRIX_ENABLE = yes - SRC += rgb_functions.c diff --git a/keyboards/work_louder/numpad/info.json b/keyboards/work_louder/numpad/keyboard.json similarity index 100% rename from keyboards/work_louder/numpad/info.json rename to keyboards/work_louder/numpad/keyboard.json diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h index bd4af23167d..4969f8e8318 100644 --- a/keyboards/wren/config.h +++ b/keyboards/wren/config.h @@ -18,24 +18,3 @@ 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 diff --git a/keyboards/wren/info.json b/keyboards/wren/keyboard.json similarity index 95% rename from keyboards/wren/info.json rename to keyboards/wren/keyboard.json index ed56ff2b3ad..c6d0330e2ff 100644 --- a/keyboards/wren/info.json +++ b/keyboards/wren/keyboard.json @@ -7,6 +7,19 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D7", "F0"], "rows": ["D3", "D2", "C6", "D4", "B5"] diff --git a/keyboards/wren/rules.mk b/keyboards/wren/rules.mk deleted file mode 100644 index 088c390ec80..00000000000 --- a/keyboards/wren/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 = 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 # Enables the use of one or more encoders diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/keyboard.json similarity index 99% rename from keyboards/wuque/creek70/info.json rename to keyboards/wuque/creek70/keyboard.json index f0951430db3..e7227ace8e5 100644 --- a/keyboards/wuque/creek70/info.json +++ b/keyboards/wuque/creek70/keyboard.json @@ -11,7 +11,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgblight": true }, "matrix_pins": { "rows": ["B3", "B2", "F0", "D3", "D1"], diff --git a/keyboards/wuque/creek70/rules.mk b/keyboards/wuque/creek70/rules.mk deleted file mode 100644 index 1e3cebb1451..00000000000 --- a/keyboards/wuque/creek70/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = yes diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h deleted file mode 100644 index db5a8d534ef..00000000000 --- a/keyboards/wuque/ikki68_aurora/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 wuquestudio - -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/wuque/ikki68_aurora/info.json b/keyboards/wuque/ikki68_aurora/keyboard.json similarity index 99% rename from keyboards/wuque/ikki68_aurora/info.json rename to keyboards/wuque/ikki68_aurora/keyboard.json index a65b265b66c..31d0ff2f91e 100644 --- a/keyboards/wuque/ikki68_aurora/info.json +++ b/keyboards/wuque/ikki68_aurora/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0", "F0", "F1", "E6", "B5", "B4", "D7", "D6", "D4", "F4", "F5", "F6"], "rows": ["B7", "B3", "B2", "B1", "B0"] diff --git a/keyboards/wuque/ikki68_aurora/rules.mk b/keyboards/wuque/ikki68_aurora/rules.mk deleted file mode 100644 index 540e0c2514d..00000000000 --- a/keyboards/wuque/ikki68_aurora/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LAYOUT = 68_ansi 68_iso diff --git a/keyboards/wuque/serneity65/info.json b/keyboards/wuque/serneity65/keyboard.json similarity index 99% rename from keyboards/wuque/serneity65/info.json rename to keyboards/wuque/serneity65/keyboard.json index f27073b2858..b64103d5338 100644 --- a/keyboards/wuque/serneity65/info.json +++ b/keyboards/wuque/serneity65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B6", "B5", "D5", "D4", "D6", "B4", "D7", "F1", "F4", "F5", "F6", "F7", "C7", "E6", "B7"], "rows": ["B0", "F0", "B1", "D2", "D3"] diff --git a/keyboards/wuque/serneity65/rules.mk b/keyboards/wuque/serneity65/rules.mk deleted file mode 100644 index 8c163bff643..00000000000 --- a/keyboards/wuque/serneity65/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 = 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 -ENCODER_ENABLE = yes # Enable Encoder - -LAYOUT = 65_ansi From 8ad3a36fb60d75b5f0279f0cd4d9c24dde6b6330 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 12 Apr 2024 22:33:49 -0700 Subject: [PATCH 04/23] Data-Driven Keyboard Conversions: D (#23461) --- .../claw44/rev1/{info.json => keyboard.json} | 5 +++++ keyboards/dailycraft/claw44/rev1/rules.mk | 13 ------------- keyboards/dailycraft/claw44/rules.mk | 13 ------------- .../dailycraft/sandbox/rev1/keyboard.json | 6 ++++++ .../sandbox/rev2/{info.json => keyboard.json} | 6 ++++++ keyboards/dailycraft/sandbox/rev2/rules.mk | 1 - keyboards/dailycraft/sandbox/rules.mk | 14 -------------- keyboards/dailycraft/wings42/info.json | 5 ----- .../dailycraft/wings42/rev1/keyboard.json | 6 ++++++ .../wings42/rev1_extkeys/keyboard.json | 6 ++++++ .../dailycraft/wings42/rev2/keyboard.json | 6 ++++++ keyboards/dailycraft/wings42/rules.mk | 13 ------------- keyboards/dc01/arrow/info.json | 9 ++++++++- keyboards/dc01/arrow/rules.mk | 14 +------------- keyboards/dc01/left/info.json | 6 ++++++ keyboards/dc01/left/rules.mk | 14 +------------- keyboards/dc01/numpad/info.json | 9 ++++++++- keyboards/dc01/numpad/rules.mk | 14 +------------- keyboards/dc01/right/info.json | 9 ++++++++- keyboards/dc01/right/rules.mk | 14 +------------- keyboards/delikeeb/vanana/info.json | 9 --------- .../vanana/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/delikeeb/vanana/rev1/rules.mk | 2 -- .../vanana/rev2/{info.json => keyboard.json} | 11 +++++++++++ keyboards/delikeeb/vanana/rev2/rules.mk | 2 -- .../delikeeb/waaffle/rev3/elite_c/info.json | 4 ---- .../waaffle/rev3/elite_c/keyboard.json | 14 ++++++++++++++ .../delikeeb/waaffle/rev3/elite_c/rules.mk | 3 --- keyboards/delikeeb/waaffle/rev3/info.json | 8 -------- .../delikeeb/waaffle/rev3/pro_micro/info.json | 4 ---- .../waaffle/rev3/pro_micro/keyboard.json | 12 ++++++++++++ .../delikeeb/waaffle/rev3/pro_micro/rules.mk | 3 --- keyboards/deltasplit75/rules.mk | 13 ------------- .../v2/{info.json => keyboard.json} | 6 ++++++ keyboards/deltasplit75/v2/rules.mk | 1 - keyboards/deng/thirty/info.json | 8 ++++++++ keyboards/deng/thirty/rules.mk | 13 ------------- keyboards/dichotomy/info.json | 9 +++++++++ keyboards/dichotomy/rules.mk | 11 ----------- .../ergoinu/{info.json => keyboard.json} | 6 ++++++ keyboards/dm9records/ergoinu/rules.mk | 12 ------------ keyboards/dm9records/plaid/info.json | 5 +++++ keyboards/dm9records/plaid/rules.mk | 13 ------------- keyboards/dm9records/tartan/info.json | 5 +++++ keyboards/dm9records/tartan/rules.mk | 13 ------------- keyboards/doio/kb16/info.json | 9 --------- keyboards/doio/kb16/rev1/info.json | 7 +++++++ keyboards/doio/kb16/rev2/info.json | 11 ++++++++++- keyboards/doio/kb38/info.json | 4 +++- keyboards/doio/kb38/rules.mk | 4 +--- .../doppelganger/{info.json => keyboard.json} | 6 ++++++ keyboards/doppelganger/rules.mk | 12 ------------ keyboards/dp3000/info.json | 10 ---------- keyboards/dp3000/rev1/keyboard.json | 8 ++++++++ keyboards/dp3000/rev2/keyboard.json | 8 ++++++++ keyboards/dp60/info.json | 7 +++++++ keyboards/dp60/rules.mk | 14 -------------- .../draculad/{info.json => keyboard.json} | 13 +++++++++++++ keyboards/draculad/rules.mk | 16 ---------------- keyboards/draytronics/scarlet/info.json | 5 +++++ keyboards/draytronics/scarlet/rules.mk | 13 ------------- keyboards/duck/eagle_viper/v2/info.json | 9 +++++++++ keyboards/duck/eagle_viper/v2/rules.mk | 13 ------------- keyboards/duck/jetfire/info.json | 9 +++++++++ keyboards/duck/jetfire/rules.mk | 13 ------------- keyboards/duck/lightsaver/info.json | 9 +++++++++ keyboards/duck/lightsaver/rules.mk | 13 ------------- keyboards/duck/octagon/v1/info.json | 9 +++++++++ keyboards/duck/octagon/v1/rules.mk | 13 ------------- keyboards/duck/octagon/v2/info.json | 9 +++++++++ keyboards/duck/octagon/v2/rules.mk | 13 ------------- keyboards/duck/orion/v3/info.json | 9 +++++++++ keyboards/duck/orion/v3/rules.mk | 13 ------------- keyboards/duck/tcv3/info.json | 8 ++++++++ keyboards/duck/tcv3/rules.mk | 13 ------------- keyboards/ducky/one2mini/1861st/info.json | 7 +++++++ keyboards/ducky/one2mini/1861st/rules.mk | 15 --------------- keyboards/ducky/one2sf/1967st/info.json | 7 +++++++ keyboards/ducky/one2sf/1967st/rules.mk | 15 --------------- keyboards/dumbo/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbo/rules.mk | 12 ------------ .../dumbpad/v0x/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v0x/rules.mk | 15 --------------- .../{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v0x_dualencoder/rules.mk | 15 --------------- .../v0x_right/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v0x_right/rules.mk | 15 --------------- .../dumbpad/v1x/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v1x/rules.mk | 15 --------------- .../{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v1x_dualencoder/rules.mk | 15 --------------- .../v1x_oled/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v1x_oled/rules.mk | 16 ---------------- .../v1x_right/{info.json => keyboard.json} | 8 ++++++++ keyboards/dumbpad/v1x_right/rules.mk | 15 --------------- .../dumbpad/v3x/{info.json => keyboard.json} | 7 +++++++ keyboards/dumbpad/v3x/rules.mk | 16 ---------------- keyboards/durgod/dgk6x/info.json | 10 ++++++++++ keyboards/durgod/dgk6x/rules.mk | 16 ---------------- keyboards/durgod/k310/base/info.json | 9 +++++++++ keyboards/durgod/k310/base/rules.mk | 14 -------------- .../dz60rgb/v1/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb/v1/rules.mk | 13 ------------- .../dz60rgb/v2/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb/v2/rules.mk | 13 ------------- keyboards/dztech/dz60rgb/v2_1/info.json | 12 ++++++++++++ keyboards/dztech/dz60rgb/v2_1/rules.mk | 18 ------------------ .../v1/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb_ansi/v1/rules.mk | 13 ------------- .../v2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/dztech/dz60rgb_ansi/v2/rules.mk | 15 --------------- keyboards/dztech/dz60rgb_ansi/v2_1/info.json | 10 ++++++++++ keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk | 15 --------------- .../v1/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb_wkl/v1/rules.mk | 13 ------------- .../v2/{info.json => keyboard.json} | 7 +++++++ keyboards/dztech/dz60rgb_wkl/v2/rules.mk | 13 ------------- keyboards/dztech/dz60rgb_wkl/v2_1/info.json | 10 ++++++++++ keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk | 15 --------------- .../dz64rgb/{info.json => keyboard.json} | 11 +++++++++++ keyboards/dztech/dz64rgb/rules.mk | 15 --------------- keyboards/dztech/dz65rgb/v3/info.json | 10 ++++++++++ keyboards/dztech/dz65rgb/v3/rules.mk | 15 --------------- 123 files changed, 486 insertions(+), 747 deletions(-) rename keyboards/dailycraft/claw44/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/dailycraft/claw44/rev1/rules.mk rename keyboards/dailycraft/sandbox/rev2/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/dailycraft/sandbox/rev2/rules.mk delete mode 100644 keyboards/dailycraft/wings42/info.json rename keyboards/delikeeb/vanana/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/delikeeb/vanana/rev1/rules.mk rename keyboards/delikeeb/vanana/rev2/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/delikeeb/vanana/rev2/rules.mk delete mode 100644 keyboards/delikeeb/waaffle/rev3/elite_c/info.json create mode 100644 keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json delete mode 100644 keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk delete mode 100644 keyboards/delikeeb/waaffle/rev3/pro_micro/info.json create mode 100644 keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json delete mode 100644 keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk rename keyboards/deltasplit75/v2/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/deltasplit75/v2/rules.mk rename keyboards/dm9records/ergoinu/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/dm9records/ergoinu/rules.mk rename keyboards/doppelganger/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/doppelganger/rules.mk rename keyboards/draculad/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/draculad/rules.mk rename keyboards/dumbo/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/dumbo/rules.mk rename keyboards/dumbpad/v0x/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v0x/rules.mk rename keyboards/dumbpad/v0x_dualencoder/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v0x_dualencoder/rules.mk rename keyboards/dumbpad/v0x_right/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v0x_right/rules.mk rename keyboards/dumbpad/v1x/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v1x/rules.mk rename keyboards/dumbpad/v1x_dualencoder/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v1x_dualencoder/rules.mk rename keyboards/dumbpad/v1x_oled/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v1x_oled/rules.mk rename keyboards/dumbpad/v1x_right/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dumbpad/v1x_right/rules.mk rename keyboards/dumbpad/v3x/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/dumbpad/v3x/rules.mk rename keyboards/dztech/dz60rgb/v1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/dztech/dz60rgb/v1/rules.mk rename keyboards/dztech/dz60rgb/v2/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/dztech/dz60rgb/v2/rules.mk rename keyboards/dztech/dz60rgb_ansi/v1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/dztech/dz60rgb_ansi/v1/rules.mk rename keyboards/dztech/dz60rgb_ansi/v2/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/dztech/dz60rgb_ansi/v2/rules.mk rename keyboards/dztech/dz60rgb_wkl/v1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/dztech/dz60rgb_wkl/v1/rules.mk rename keyboards/dztech/dz60rgb_wkl/v2/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/dztech/dz60rgb_wkl/v2/rules.mk rename keyboards/dztech/dz64rgb/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/dztech/dz64rgb/rules.mk diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/keyboard.json similarity index 96% rename from keyboards/dailycraft/claw44/rev1/info.json rename to keyboards/dailycraft/claw44/rev1/keyboard.json index b3caa8ad13e..724cf5979fb 100644 --- a/keyboards/dailycraft/claw44/rev1/info.json +++ b/keyboards/dailycraft/claw44/rev1/keyboard.json @@ -19,6 +19,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/claw44/rev1/rules.mk b/keyboards/dailycraft/claw44/rev1/rules.mk deleted file mode 100644 index 7e2ee0ceacb..00000000000 --- a/keyboards/dailycraft/claw44/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -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. -SWAP_HANDS_ENABLE = no # Enable one-hand typing - -OLED_ENABLE = no # Add OLED displays support diff --git a/keyboards/dailycraft/claw44/rules.mk b/keyboards/dailycraft/claw44/rules.mk index 6bc66a514a3..0344b3ee285 100644 --- a/keyboards/dailycraft/claw44/rules.mk +++ b/keyboards/dailycraft/claw44/rules.mk @@ -1,14 +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. - DEFAULT_FOLDER = dailycraft/claw44/rev1 diff --git a/keyboards/dailycraft/sandbox/rev1/keyboard.json b/keyboards/dailycraft/sandbox/rev1/keyboard.json index 8ff7c65a2f0..0a48996815e 100644 --- a/keyboards/dailycraft/sandbox/rev1/keyboard.json +++ b/keyboards/dailycraft/sandbox/rev1/keyboard.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/keyboard.json similarity index 92% rename from keyboards/dailycraft/sandbox/rev2/info.json rename to keyboards/dailycraft/sandbox/rev2/keyboard.json index 5d7255ff67e..d6f0ac2c2a5 100644 --- a/keyboards/dailycraft/sandbox/rev2/info.json +++ b/keyboards/dailycraft/sandbox/rev2/keyboard.json @@ -19,6 +19,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "oled": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/sandbox/rev2/rules.mk b/keyboards/dailycraft/sandbox/rev2/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/dailycraft/sandbox/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank diff --git a/keyboards/dailycraft/sandbox/rules.mk b/keyboards/dailycraft/sandbox/rules.mk index 2afb4624d12..c62f01e18f5 100644 --- a/keyboards/dailycraft/sandbox/rules.mk +++ b/keyboards/dailycraft/sandbox/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes - DEFAULT_FOLDER = dailycraft/sandbox/rev2 diff --git a/keyboards/dailycraft/wings42/info.json b/keyboards/dailycraft/wings42/info.json deleted file mode 100644 index 2b9790e84e6..00000000000 --- a/keyboards/dailycraft/wings42/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "split": { - "enabled": true - } -} diff --git a/keyboards/dailycraft/wings42/rev1/keyboard.json b/keyboards/dailycraft/wings42/rev1/keyboard.json index 657c8a9e512..a32b591bd6e 100644 --- a/keyboards/dailycraft/wings42/rev1/keyboard.json +++ b/keyboards/dailycraft/wings42/rev1/keyboard.json @@ -14,10 +14,16 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "community_layouts": [ "split_3x6_3" ], diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json index 53db2db4ca6..ff665a3bb75 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json +++ b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json @@ -14,10 +14,16 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dailycraft/wings42/rev2/keyboard.json b/keyboards/dailycraft/wings42/rev2/keyboard.json index a3c3e2396ef..dcb3a0268de 100644 --- a/keyboards/dailycraft/wings42/rev2/keyboard.json +++ b/keyboards/dailycraft/wings42/rev2/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "features": { @@ -27,6 +28,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layout_aliases": { "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3" }, diff --git a/keyboards/dailycraft/wings42/rules.mk b/keyboards/dailycraft/wings42/rules.mk index f69adcecec0..b027fec9b97 100644 --- a/keyboards/dailycraft/wings42/rules.mk +++ b/keyboards/dailycraft/wings42/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = dailycraft/wings42/rev2 diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/info.json index 992b623d45c..85ca25c23e8 100644 --- a/keyboards/dc01/arrow/info.json +++ b/keyboards/dc01/arrow/info.json @@ -6,10 +6,17 @@ "usb": { "vid": "0x8968", "pid": "0x1012", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dc01/arrow/rules.mk b/keyboards/dc01/arrow/rules.mk index b2c66861ea5..d4c0eb26725 100644 --- a/keyboards/dc01/arrow/rules.mk +++ b/keyboards/dc01/arrow/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c \ i2c_slave.c diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/info.json index 17fe3c64a28..e2967909955 100644 --- a/keyboards/dc01/left/info.json +++ b/keyboards/dc01/left/info.json @@ -10,6 +10,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT_ansi": { diff --git a/keyboards/dc01/left/rules.mk b/keyboards/dc01/left/rules.mk index 3a9422733c1..2493924f46a 100644 --- a/keyboards/dc01/left/rules.mk +++ b/keyboards/dc01/left/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/info.json index eab2d0c33f4..0cf73c23e33 100644 --- a/keyboards/dc01/numpad/info.json +++ b/keyboards/dc01/numpad/info.json @@ -6,10 +6,17 @@ "usb": { "vid": "0x8968", "pid": "0x1013", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "community_layouts": ["numpad_5x4", "ortho_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/dc01/numpad/rules.mk b/keyboards/dc01/numpad/rules.mk index b2c66861ea5..d4c0eb26725 100644 --- a/keyboards/dc01/numpad/rules.mk +++ b/keyboards/dc01/numpad/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c \ i2c_slave.c diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/info.json index 2b89117c44b..6f48e05483e 100644 --- a/keyboards/dc01/right/info.json +++ b/keyboards/dc01/right/info.json @@ -6,10 +6,17 @@ "usb": { "vid": "0x8968", "pid": "0x1011", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/dc01/right/rules.mk b/keyboards/dc01/right/rules.mk index b2c66861ea5..d4c0eb26725 100644 --- a/keyboards/dc01/right/rules.mk +++ b/keyboards/dc01/right/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in -CUSTOM_MATRIX = yes # Use custom matrix +CUSTOM_MATRIX = yes SRC += matrix.c \ i2c_slave.c diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json index 67bec439f13..520cd92b09c 100644 --- a/keyboards/delikeeb/vanana/info.json +++ b/keyboards/delikeeb/vanana/info.json @@ -2,15 +2,6 @@ "manufacturer": "dELIKEEb", "url": "", "maintainer": "noclew", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": false - }, "usb": { "vid": "0x9906", "pid": "0x0013" diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/keyboard.json similarity index 95% rename from keyboards/delikeeb/vanana/rev1/info.json rename to keyboards/delikeeb/vanana/rev1/keyboard.json index a4c101ec237..9ae59761de9 100644 --- a/keyboards/delikeeb/vanana/rev1/info.json +++ b/keyboards/delikeeb/vanana/rev1/keyboard.json @@ -28,6 +28,15 @@ {"pin_a": "F1", "pin_b": "F0"} ] }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/delikeeb/vanana/rev1/rules.mk b/keyboards/delikeeb/vanana/rev1/rules.mk deleted file mode 100644 index eee766eca6c..00000000000 --- a/keyboards/delikeeb/vanana/rev1/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/keyboard.json similarity index 94% rename from keyboards/delikeeb/vanana/rev2/info.json rename to keyboards/delikeeb/vanana/rev2/keyboard.json index 252e111fb2a..a15ad3e71a3 100644 --- a/keyboards/delikeeb/vanana/rev2/info.json +++ b/keyboards/delikeeb/vanana/rev2/keyboard.json @@ -28,6 +28,17 @@ {"pin_a": "F0", "pin_b": "F1"} ] }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true, + "audio": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/delikeeb/vanana/rev2/rules.mk b/keyboards/delikeeb/vanana/rev2/rules.mk deleted file mode 100644 index 8bb6ab5d91c..00000000000 --- a/keyboards/delikeeb/vanana/rev2/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json b/keyboards/delikeeb/waaffle/rev3/elite_c/info.json deleted file mode 100644 index 042c41f34d6..00000000000 --- a/keyboards/delikeeb/waaffle/rev3/elite_c/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "processor": "atmega32u4", - "bootloader": "atmel-dfu" -} diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json new file mode 100644 index 00000000000..44fd177e020 --- /dev/null +++ b/keyboards/delikeeb/waaffle/rev3/elite_c/keyboard.json @@ -0,0 +1,14 @@ +{ + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true, + "encoder": true + } +} diff --git a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk b/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk deleted file mode 100644 index 307296b1bae..00000000000 --- a/keyboards/delikeeb/waaffle/rev3/elite_c/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# supported on Elite-C controllers -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable Rotary Encoder diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json index 1f9a8124a96..1201411d46b 100644 --- a/keyboards/delikeeb/waaffle/rev3/info.json +++ b/keyboards/delikeeb/waaffle/rev3/info.json @@ -22,14 +22,6 @@ "ws2812": { "pin": "C7" }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": false - }, "matrix_pins": { "cols": ["D3", "D2", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F4", "B6", "B2", "B3", "B1", "F5", "F6", "F7"] diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json deleted file mode 100644 index 4369a041038..00000000000 --- a/keyboards/delikeeb/waaffle/rev3/pro_micro/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "processor": "atmega32u4", - "bootloader": "caterina" -} diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json new file mode 100644 index 00000000000..a97bf794ea1 --- /dev/null +++ b/keyboards/delikeeb/waaffle/rev3/pro_micro/keyboard.json @@ -0,0 +1,12 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + } +} diff --git a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk b/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk deleted file mode 100644 index 17c9907319d..00000000000 --- a/keyboards/delikeeb/waaffle/rev3/pro_micro/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# not supported on Pro Micro controllers -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -ENCODER_ENABLE = no # Enable Rotary Encoder diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk index da8a2124e8f..ee888337e5e 100644 --- a/keyboards/deltasplit75/rules.mk +++ b/keyboards/deltasplit75/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 = deltasplit75/v2 diff --git a/keyboards/deltasplit75/v2/info.json b/keyboards/deltasplit75/v2/keyboard.json similarity index 98% rename from keyboards/deltasplit75/v2/info.json rename to keyboards/deltasplit75/v2/keyboard.json index 8372650df5d..2c1968e0b59 100644 --- a/keyboards/deltasplit75/v2/info.json +++ b/keyboards/deltasplit75/v2/keyboard.json @@ -24,6 +24,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "layouts": { "LAYOUT_v2": { "layout": [ diff --git a/keyboards/deltasplit75/v2/rules.mk b/keyboards/deltasplit75/v2/rules.mk deleted file mode 100644 index f845616741c..00000000000 --- a/keyboards/deltasplit75/v2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/info.json index 8e594cccb9c..a26d727f12b 100644 --- a/keyboards/deng/thirty/info.json +++ b/keyboards/deng/thirty/info.json @@ -78,6 +78,14 @@ }, "processor": "STM32F103", "bootloader": "stm32duino", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true, + "rgb_matrix": true + }, "layouts": { "LAYOUT_ortho_3x10": { "layout": [ diff --git a/keyboards/deng/thirty/rules.mk b/keyboards/deng/thirty/rules.mk index d1753c1e6c4..04fe1eba2ac 100644 --- a/keyboards/deng/thirty/rules.mk +++ b/keyboards/deng/thirty/rules.mk @@ -1,15 +1,2 @@ - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/info.json index 1b2d9a29c9b..bc3546a0829 100644 --- a/keyboards/dichotomy/info.json +++ b/keyboards/dichotomy/info.json @@ -10,6 +10,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "pointing_device": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk index bfa5252a039..fd5fa4db1a9 100755 --- a/keyboards/dichotomy/rules.mk +++ b/keyboards/dichotomy/rules.mk @@ -1,16 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -#MOUSEKEY_ENABLE = yes # Mouse keys -POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully. POINTING_DEVICE_DRIVER = custom -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 # Remote matrix from the wireless bridge -NKRO_ENABLE = yes # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality # # project specific files SRC += matrix.c diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/keyboard.json similarity index 97% rename from keyboards/dm9records/ergoinu/info.json rename to keyboards/dm9records/ergoinu/keyboard.json index a78ecef2114..c132f18268b 100644 --- a/keyboards/dm9records/ergoinu/info.json +++ b/keyboards/dm9records/ergoinu/keyboard.json @@ -26,6 +26,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/dm9records/ergoinu/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 = 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/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json index a18de0accdb..a2052e55621 100644 --- a/keyboards/dm9records/plaid/info.json +++ b/keyboards/dm9records/plaid/info.json @@ -16,6 +16,11 @@ "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12", diff --git a/keyboards/dm9records/plaid/rules.mk b/keyboards/dm9records/plaid/rules.mk index 760f9b9650b..16051206467 100644 --- a/keyboards/dm9records/plaid/rules.mk +++ b/keyboards/dm9records/plaid/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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json index 0f8168edb9d..208dcf330b9 100644 --- a/keyboards/dm9records/tartan/info.json +++ b/keyboards/dm9records/tartan/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layout_aliases": { "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift" diff --git a/keyboards/dm9records/tartan/rules.mk b/keyboards/dm9records/tartan/rules.mk index 722ea170590..16051206467 100644 --- a/keyboards/dm9records/tartan/rules.mk +++ b/keyboards/dm9records/tartan/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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/doio/kb16/info.json b/keyboards/doio/kb16/info.json index cadfabdf861..08c19819bb0 100644 --- a/keyboards/doio/kb16/info.json +++ b/keyboards/doio/kb16/info.json @@ -8,15 +8,6 @@ "force_nkro": true }, "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "nkro": true, - "oled": true, - "rgb_matrix": true, - "encoder": true - }, "build": { "lto": true }, diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/info.json index fc9b30a20a0..e1382860b8f 100644 --- a/keyboards/doio/kb16/rev1/info.json +++ b/keyboards/doio/kb16/rev1/info.json @@ -3,6 +3,13 @@ "device_version": "0.0.1" }, "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "oled": true, + "rgb_matrix": true, + "encoder": true, "grave_esc": false, "space_cadet": false, "magic": false diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json index b3f14e180d7..a1157072910 100644 --- a/keyboards/doio/kb16/rev2/info.json +++ b/keyboards/doio/kb16/rev2/info.json @@ -17,5 +17,14 @@ "pin": "A10" }, "processor": "STM32F103", - "bootloader": "stm32duino" + "bootloader": "stm32duino", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "oled": true, + "rgb_matrix": true, + "encoder": true + } } diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json index a1775a2b107..7e978b2be8b 100644 --- a/keyboards/doio/kb38/info.json +++ b/keyboards/doio/kb38/info.json @@ -12,7 +12,9 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true + "rgb_matrix": true, + "oled": true, + "encoder": true }, "matrix_pins": { "cols": ["F5", "F4", "F1", "F0", "B7", "B6", "B5", "B4"], diff --git a/keyboards/doio/kb38/rules.mk b/keyboards/doio/kb38/rules.mk index a5f1063634e..942ef4c5dbd 100644 --- a/keyboards/doio/kb38/rules.mk +++ b/keyboards/doio/kb38/rules.mk @@ -1,3 +1 @@ -OLED_ENABLE = yes -ENCODER_ENABLE = yes -RGB_MATRIX_CUSTOM_KB = yes \ No newline at end of file +RGB_MATRIX_CUSTOM_KB = yes diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/keyboard.json similarity index 97% rename from keyboards/doppelganger/info.json rename to keyboards/doppelganger/keyboard.json index e9f3aba7157..2be90e30abf 100644 --- a/keyboards/doppelganger/info.json +++ b/keyboards/doppelganger/keyboard.json @@ -35,6 +35,12 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/doppelganger/rules.mk b/keyboards/doppelganger/rules.mk deleted file mode 100644 index 3414d97c204..00000000000 --- a/keyboards/doppelganger/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 = 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/dp3000/info.json b/keyboards/dp3000/info.json index 442d6d6a66d..7fa05f4c121 100644 --- a/keyboards/dp3000/info.json +++ b/keyboards/dp3000/info.json @@ -3,16 +3,6 @@ "maintainer": "depermana12", "diode_direction": "COL2ROW", "development_board": "promicro", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "encoder": true, - "oled": true, - "mousekey": false, - "nkro": false - }, "build": { "lto": true }, diff --git a/keyboards/dp3000/rev1/keyboard.json b/keyboards/dp3000/rev1/keyboard.json index 63d023de5cf..aa7ff8bc0a9 100644 --- a/keyboards/dp3000/rev1/keyboard.json +++ b/keyboards/dp3000/rev1/keyboard.json @@ -1,6 +1,14 @@ { "keyboard_name": "dp3000", "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "encoder": true, + "oled": true, + "mousekey": false, + "nkro": false, "rgb_matrix": true }, "usb": { diff --git a/keyboards/dp3000/rev2/keyboard.json b/keyboards/dp3000/rev2/keyboard.json index f6f03eeb639..7d82c384601 100644 --- a/keyboards/dp3000/rev2/keyboard.json +++ b/keyboards/dp3000/rev2/keyboard.json @@ -1,6 +1,14 @@ { "keyboard_name": "dp3000 rev2", "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "encoder": true, + "oled": true, + "mousekey": false, + "nkro": false, "rgblight": true }, "usb": { diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json index ec36a725c34..c9b3b6fddef 100644 --- a/keyboards/dp60/info.json +++ b/keyboards/dp60/info.json @@ -64,6 +64,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "layout_aliases": { "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift", "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb" diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk index 0aa07f4709d..8784813b335 100644 --- a/keyboards/dp60/rules.mk +++ b/keyboards/dp60/rules.mk @@ -1,16 +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 = 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 = no # Use RGB underglow light -RGB_MATRIX_ENABLE = yes - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/draculad/info.json b/keyboards/draculad/keyboard.json similarity index 92% rename from keyboards/draculad/info.json rename to keyboards/draculad/keyboard.json index 1635b8bd2c1..bfaa8a4979d 100644 --- a/keyboards/draculad/info.json +++ b/keyboards/draculad/keyboard.json @@ -49,6 +49,19 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "oled": true, + "wpm": true, + "encoder": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/draculad/rules.mk b/keyboards/draculad/rules.mk deleted file mode 100644 index 130d29fb1de..00000000000 --- a/keyboards/draculad/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -WPM_ENABLE = yes -ENCODER_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/info.json index cb84baca06c..b70c7bfae65 100644 --- a/keyboards/draytronics/scarlet/info.json +++ b/keyboards/draytronics/scarlet/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/draytronics/scarlet/rules.mk b/keyboards/draytronics/scarlet/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/draytronics/scarlet/rules.mk +++ b/keyboards/draytronics/scarlet/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json index c2acc3b0d95..9c16c48db3e 100644 --- a/keyboards/duck/eagle_viper/v2/info.json +++ b/keyboards/duck/eagle_viper/v2/info.json @@ -32,6 +32,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_eagle": "LAYOUT_60_ansi", "LAYOUT_viper": "LAYOUT_60_hhkb", diff --git a/keyboards/duck/eagle_viper/v2/rules.mk b/keyboards/duck/eagle_viper/v2/rules.mk index a2b82ea590e..819cb814ecc 100644 --- a/keyboards/duck/eagle_viper/v2/rules.mk +++ b/keyboards/duck/eagle_viper/v2/rules.mk @@ -1,15 +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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = yes SRC += indicator_leds.c matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json index fbd5d8cb140..a97ff193a88 100644 --- a/keyboards/duck/jetfire/info.json +++ b/keyboards/duck/jetfire/info.json @@ -35,6 +35,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "console": true, + "command": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/duck/jetfire/rules.mk b/keyboards/duck/jetfire/rules.mk index 26898366237..8d6e39eef11 100644 --- a/keyboards/duck/jetfire/rules.mk +++ b/keyboards/duck/jetfire/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json index 06d0d59ed19..d4e1cd1e351 100644 --- a/keyboards/duck/lightsaver/info.json +++ b/keyboards/duck/lightsaver/info.json @@ -35,6 +35,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/duck/lightsaver/rules.mk b/keyboards/duck/lightsaver/rules.mk index 2014cb46117..8d6e39eef11 100644 --- a/keyboards/duck/lightsaver/rules.mk +++ b/keyboards/duck/lightsaver/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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json index fbbae2723a8..47f3acdc4d8 100644 --- a/keyboards/duck/octagon/v1/info.json +++ b/keyboards/duck/octagon/v1/info.json @@ -35,6 +35,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["75_ansi"], "layouts": { "LAYOUT_75_ansi": { diff --git a/keyboards/duck/octagon/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk index 5d79f0af09d..8784813b335 100644 --- a/keyboards/duck/octagon/v1/rules.mk +++ b/keyboards/duck/octagon/v1/rules.mk @@ -1,15 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json index be552c7b57a..4afbc42d47c 100644 --- a/keyboards/duck/octagon/v2/info.json +++ b/keyboards/duck/octagon/v2/info.json @@ -35,6 +35,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/duck/octagon/v2/rules.mk b/keyboards/duck/octagon/v2/rules.mk index 5e50c2ff8e9..8d6e39eef11 100644 --- a/keyboards/duck/octagon/v2/rules.mk +++ b/keyboards/duck/octagon/v2/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json index 97885c09102..280cd8b07f8 100644 --- a/keyboards/duck/orion/v3/info.json +++ b/keyboards/duck/orion/v3/info.json @@ -36,6 +36,15 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/duck/orion/v3/rules.mk b/keyboards/duck/orion/v3/rules.mk index 49bc32f39b8..8d6e39eef11 100644 --- a/keyboards/duck/orion/v3/rules.mk +++ b/keyboards/duck/orion/v3/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json index cee675229d9..c03142b4db2 100644 --- a/keyboards/duck/tcv3/info.json +++ b/keyboards/duck/tcv3/info.json @@ -31,6 +31,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/duck/tcv3/rules.mk b/keyboards/duck/tcv3/rules.mk index b13684d8fd9..8d6e39eef11 100644 --- a/keyboards/duck/tcv3/rules.mk +++ b/keyboards/duck/tcv3/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # 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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes - CUSTOM_MATRIX = yes SRC += indicator_leds.c \ matrix.c duck_led/duck_led.c diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json index 4eb7c4941ed..a39945d68c2 100644 --- a/keyboards/ducky/one2mini/1861st/info.json +++ b/keyboards/ducky/one2mini/1861st/info.json @@ -15,6 +15,13 @@ "dip_switch": { "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ] }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "dip_switch": true + }, "layout_aliases": { "LAYOUT_iso": "LAYOUT_60_iso" }, diff --git a/keyboards/ducky/one2mini/1861st/rules.mk b/keyboards/ducky/one2mini/1861st/rules.mk index b7db490c11e..5eb1c44f8a1 100644 --- a/keyboards/ducky/one2mini/1861st/rules.mk +++ b/keyboards/ducky/one2mini/1861st/rules.mk @@ -15,18 +15,3 @@ BOARD = NUC123SD4AN0 MCU = cortex-m0 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 ARMV = 6 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes - diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json index 3774be1bc06..3bb58fd48f3 100644 --- a/keyboards/ducky/one2sf/1967st/info.json +++ b/keyboards/ducky/one2sf/1967st/info.json @@ -16,6 +16,13 @@ "dip_switch": { "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ] }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "dip_switch": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ducky/one2sf/1967st/rules.mk b/keyboards/ducky/one2sf/1967st/rules.mk index b7db490c11e..5eb1c44f8a1 100644 --- a/keyboards/ducky/one2sf/1967st/rules.mk +++ b/keyboards/ducky/one2sf/1967st/rules.mk @@ -15,18 +15,3 @@ BOARD = NUC123SD4AN0 MCU = cortex-m0 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 ARMV = 6 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes - diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/keyboard.json similarity index 95% rename from keyboards/dumbo/info.json rename to keyboards/dumbo/keyboard.json index ddcab98dd32..84993a6b6d9 100644 --- a/keyboards/dumbo/info.json +++ b/keyboards/dumbo/keyboard.json @@ -33,6 +33,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_split_3x6_4": { "layout": [ diff --git a/keyboards/dumbo/rules.mk b/keyboards/dumbo/rules.mk deleted file mode 100644 index a64aa6f849b..00000000000 --- a/keyboards/dumbo/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/keyboard.json similarity index 88% rename from keyboards/dumbpad/v0x/info.json rename to keyboards/dumbpad/v0x/keyboard.json index 84594e01afe..f0cecd80638 100644 --- a/keyboards/dumbpad/v0x/info.json +++ b/keyboards/dumbpad/v0x/keyboard.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x/rules.mk b/keyboards/dumbpad/v0x/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v0x/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 = 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 - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/keyboard.json similarity index 88% rename from keyboards/dumbpad/v0x_dualencoder/info.json rename to keyboards/dumbpad/v0x_dualencoder/keyboard.json index a841d9d6425..71b501cedd5 100644 --- a/keyboards/dumbpad/v0x_dualencoder/info.json +++ b/keyboards/dumbpad/v0x_dualencoder/keyboard.json @@ -18,6 +18,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_dualencoder/rules.mk b/keyboards/dumbpad/v0x_dualencoder/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v0x_dualencoder/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 = 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 - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/keyboard.json similarity index 88% rename from keyboards/dumbpad/v0x_right/info.json rename to keyboards/dumbpad/v0x_right/keyboard.json index d0530abd7d1..883f2f785d7 100644 --- a/keyboards/dumbpad/v0x_right/info.json +++ b/keyboards/dumbpad/v0x_right/keyboard.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v0x_right/rules.mk b/keyboards/dumbpad/v0x_right/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v0x_right/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 = 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 - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/keyboard.json similarity index 88% rename from keyboards/dumbpad/v1x/info.json rename to keyboards/dumbpad/v1x/keyboard.json index f790bb80ecd..9ab78e1a9f1 100644 --- a/keyboards/dumbpad/v1x/info.json +++ b/keyboards/dumbpad/v1x/keyboard.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x/rules.mk b/keyboards/dumbpad/v1x/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v1x/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 = 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 - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/keyboard.json similarity index 88% rename from keyboards/dumbpad/v1x_dualencoder/info.json rename to keyboards/dumbpad/v1x_dualencoder/keyboard.json index ad16fa4417a..f3aeafe6252 100644 --- a/keyboards/dumbpad/v1x_dualencoder/info.json +++ b/keyboards/dumbpad/v1x_dualencoder/keyboard.json @@ -18,6 +18,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_dualencoder/rules.mk b/keyboards/dumbpad/v1x_dualencoder/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v1x_dualencoder/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 = 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 - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v1x_oled/info.json b/keyboards/dumbpad/v1x_oled/keyboard.json similarity index 88% rename from keyboards/dumbpad/v1x_oled/info.json rename to keyboards/dumbpad/v1x_oled/keyboard.json index b4dd15c76b7..3a437699b86 100644 --- a/keyboards/dumbpad/v1x_oled/info.json +++ b/keyboards/dumbpad/v1x_oled/keyboard.json @@ -15,6 +15,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "encoder": true, + "oled": true, + "wpm": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_oled/rules.mk b/keyboards/dumbpad/v1x_oled/rules.mk deleted file mode 100644 index 53db407bc36..00000000000 --- a/keyboards/dumbpad/v1x_oled/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/keyboard.json similarity index 88% rename from keyboards/dumbpad/v1x_right/info.json rename to keyboards/dumbpad/v1x_right/keyboard.json index 55b898b701a..583d60bc5d2 100644 --- a/keyboards/dumbpad/v1x_right/info.json +++ b/keyboards/dumbpad/v1x_right/keyboard.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "encoder": true, + "key_lock": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v1x_right/rules.mk b/keyboards/dumbpad/v1x_right/rules.mk deleted file mode 100644 index 7816aab001a..00000000000 --- a/keyboards/dumbpad/v1x_right/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 = 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 - -ENCODER_ENABLE = yes -KEY_LOCK_ENABLE = yes diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/keyboard.json similarity index 94% rename from keyboards/dumbpad/v3x/info.json rename to keyboards/dumbpad/v3x/keyboard.json index 4dc17272a95..7ea29cd9ad3 100644 --- a/keyboards/dumbpad/v3x/info.json +++ b/keyboards/dumbpad/v3x/keyboard.json @@ -57,6 +57,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "encoder": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/dumbpad/v3x/rules.mk b/keyboards/dumbpad/v3x/rules.mk deleted file mode 100644 index 11f04a3adec..00000000000 --- a/keyboards/dumbpad/v3x/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/durgod/dgk6x/info.json b/keyboards/durgod/dgk6x/info.json index b8d38e2d9f9..d036bc06308 100644 --- a/keyboards/durgod/dgk6x/info.json +++ b/keyboards/durgod/dgk6x/info.json @@ -54,5 +54,15 @@ }, "processor": "STM32F072", // F070 "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "board": "DURGOD_STM32_F070" } diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk index 36a93aa827b..597f5bbcf9e 100644 --- a/keyboards/durgod/dgk6x/rules.mk +++ b/keyboards/durgod/dgk6x/rules.mk @@ -1,20 +1,4 @@ # Do not put the microcontroller into power saving mode NO_SUSPEND_POWER_DOWN = yes -# 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 -LTO_ENABLE = yes - -RGB_MATRIX_ENABLE = yes - DEFAULT_FOLDER=durgod/dgk6x/hades_ansi diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/info.json index 6047c40fc05..94dae4d8097 100644 --- a/keyboards/durgod/k310/base/info.json +++ b/keyboards/durgod/k310/base/info.json @@ -12,5 +12,14 @@ }, "processor": "STM32F072", // F070 "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, + "build": { + "lto": true + }, "board": "DURGOD_STM32_F070" } diff --git a/keyboards/durgod/k310/base/rules.mk b/keyboards/durgod/k310/base/rules.mk index 454cf102ec2..0ab54aaaf71 100644 --- a/keyboards/durgod/k310/base/rules.mk +++ b/keyboards/durgod/k310/base/rules.mk @@ -1,16 +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 = 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 -LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb/v1/info.json b/keyboards/dztech/dz60rgb/v1/keyboard.json similarity index 93% rename from keyboards/dztech/dz60rgb/v1/info.json rename to keyboards/dztech/dz60rgb/v1/keyboard.json index 8a9801c4f30..fa82578c766 100644 --- a/keyboards/dztech/dz60rgb/v1/info.json +++ b/keyboards/dztech/dz60rgb/v1/keyboard.json @@ -61,6 +61,13 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb/v1/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb/v2/info.json b/keyboards/dztech/dz60rgb/v2/keyboard.json similarity index 90% rename from keyboards/dztech/dz60rgb/v2/info.json rename to keyboards/dztech/dz60rgb/v2/keyboard.json index c3e1837dbd3..710f86e04c5 100644 --- a/keyboards/dztech/dz60rgb/v2/info.json +++ b/keyboards/dztech/dz60rgb/v2/keyboard.json @@ -44,5 +44,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb/v2/rules.mk b/keyboards/dztech/dz60rgb/v2/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb/v2/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/info.json index 1d97037c311..7678e9985c9 100644 --- a/keyboards/dztech/dz60rgb/v2_1/info.json +++ b/keyboards/dztech/dz60rgb/v2_1/info.json @@ -43,5 +43,17 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "space_cadet": false, + "grave_esc": false + }, + "build": { + "lto": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb/v2_1/rules.mk b/keyboards/dztech/dz60rgb/v2_1/rules.mk index 5c51de83766..13252d81696 100644 --- a/keyboards/dztech/dz60rgb/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb/v2_1/rules.mk @@ -1,19 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix -LTO_ENABLE = yes - -SPACE_CADET_ENABLE = no -GRAVE_ESC_ENABLE = no diff --git a/keyboards/dztech/dz60rgb_ansi/v1/info.json b/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json similarity index 93% rename from keyboards/dztech/dz60rgb_ansi/v1/info.json rename to keyboards/dztech/dz60rgb_ansi/v1/keyboard.json index d09c967d008..de0229c1512 100644 --- a/keyboards/dztech/dz60rgb_ansi/v1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v1/keyboard.json @@ -61,6 +61,13 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v1/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb_ansi/v1/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb_ansi/v2/info.json b/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json similarity index 88% rename from keyboards/dztech/dz60rgb_ansi/v2/info.json rename to keyboards/dztech/dz60rgb_ansi/v2/keyboard.json index 5769daefef2..9a4a11ffdc6 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2/keyboard.json @@ -46,5 +46,15 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2/rules.mk deleted file mode 100644 index f478792adbc..00000000000 --- a/keyboards/dztech/dz60rgb_ansi/v2/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix - -LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json index 649ea2e2611..9d3b1efeac1 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/info.json @@ -43,5 +43,15 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk index a89963c2d40..13252d81696 100644 --- a/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb_ansi/v2_1/rules.mk @@ -1,16 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix -LTO_ENABLE = yes diff --git a/keyboards/dztech/dz60rgb_wkl/v1/info.json b/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json similarity index 93% rename from keyboards/dztech/dz60rgb_wkl/v1/info.json rename to keyboards/dztech/dz60rgb_wkl/v1/keyboard.json index 320d412aaef..c0b78aa8a9f 100644 --- a/keyboards/dztech/dz60rgb_wkl/v1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v1/keyboard.json @@ -61,6 +61,13 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "board": "QMK_PROTON_C", "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v1/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb_wkl/v1/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb_wkl/v2/info.json b/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json similarity index 90% rename from keyboards/dztech/dz60rgb_wkl/v2/info.json rename to keyboards/dztech/dz60rgb_wkl/v2/keyboard.json index f7d6acff0c7..fd095b548a5 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2/keyboard.json @@ -42,5 +42,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/dztech/dz60rgb_wkl/v2/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json index 5a3cc636024..968488e5449 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/info.json @@ -43,5 +43,15 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "debounce": 3 } diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk index a89963c2d40..13252d81696 100644 --- a/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk +++ b/keyboards/dztech/dz60rgb_wkl/v2_1/rules.mk @@ -1,16 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix -LTO_ENABLE = yes diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/keyboard.json similarity index 95% rename from keyboards/dztech/dz64rgb/info.json rename to keyboards/dztech/dz64rgb/keyboard.json index b568170e14d..ea22af59db9 100644 --- a/keyboards/dztech/dz64rgb/info.json +++ b/keyboards/dztech/dz64rgb/keyboard.json @@ -50,6 +50,17 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, + "community_layouts": ["64_ansi"], "layouts": { "LAYOUT_64_ansi": { "layout": [ diff --git a/keyboards/dztech/dz64rgb/rules.mk b/keyboards/dztech/dz64rgb/rules.mk deleted file mode 100644 index a20c8b449f7..00000000000 --- a/keyboards/dztech/dz64rgb/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -LTO_ENABLE = yes -LAYOUT= 64_ansi \ No newline at end of file diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/info.json index ea7390ee9ee..8fef8b34683 100644 --- a/keyboards/dztech/dz65rgb/v3/info.json +++ b/keyboards/dztech/dz65rgb/v3/info.json @@ -64,6 +64,16 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_65_ansi": { "layout": [ diff --git a/keyboards/dztech/dz65rgb/v3/rules.mk b/keyboards/dztech/dz65rgb/v3/rules.mk index bbe22adb0c5..13252d81696 100755 --- a/keyboards/dztech/dz65rgb/v3/rules.mk +++ b/keyboards/dztech/dz65rgb/v3/rules.mk @@ -1,16 +1 @@ BOOTLOADER_SIZE = 6144 - -# 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_ENABLE = yes # Use RGB matrix -LTO_ENABLE = yes From 2eea2cdc46b3e920578ed75c4545a8b5160135bd Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 13 Apr 2024 08:45:27 +0100 Subject: [PATCH 05/23] Miscellaneous keyboard.json migrations (#23486) --- .../bastardkb/tbk/{info.json => keyboard.json} | 9 +++++++++ keyboards/bastardkb/tbk/rules.mk | 12 ------------ .../flxlb/zplit/{info.json => keyboard.json} | 10 ++++++++++ keyboards/flxlb/zplit/rules.mk | 13 ------------- .../fungo/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/fungo/rev1/rules.mk | 15 --------------- keyboards/gummykey/{info.json => keyboard.json} | 8 ++++++++ keyboards/gummykey/rules.mk | 12 ------------ keyboards/hand88/{info.json => keyboard.json} | 8 ++++++++ keyboards/hand88/rules.mk | 13 ------------- .../handwired/brain/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/brain/rules.mk | 12 ------------ .../chiron/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/chiron/rules.mk | 16 ---------------- .../4x5/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_manuform/4x5/rules.mk | 12 ------------ .../4x5_5/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/4x5_5/rules.mk | 11 ----------- .../4x6/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_manuform/4x6/rules.mk | 12 ------------ .../4x6_5/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/4x6_5/rules.mk | 12 ------------ .../5x6/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_manuform/5x6/rules.mk | 12 ------------ .../5x6_2_5/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/5x6_2_5/rules.mk | 12 ------------ .../5x6_5/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/5x6_5/rules.mk | 12 ------------ .../5x6_6/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/5x6_6/rules.mk | 12 ------------ .../5x7/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_manuform/5x7/rules.mk | 12 ------------ .../6x6_4/{info.json => keyboard.json} | 8 ++++++++ .../handwired/dactyl_manuform/6x6_4/rules.mk | 12 ------------ .../dactyl_promicro/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_promicro/rules.mk | 12 ------------ .../dactyl_rah/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/dactyl_rah/rules.mk | 12 ------------ .../elrgo_s/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/elrgo_s/rules.mk | 12 ------------ .../freoduo/{info.json => keyboard.json} | 10 ++++++++++ keyboards/handwired/freoduo/rules.mk | 13 ------------- .../split_65/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/jtallbean/split_65/rules.mk | 12 ------------ .../handwired/ks63/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/ks63/rules.mk | 12 ------------ .../not_so_minidox/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/not_so_minidox/rules.mk | 12 ------------ .../skakunm_dactyl/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/skakunm_dactyl/rules.mk | 12 ------------ .../promicro/{info.json => keyboard.json} | 9 +++++++++ keyboards/handwired/split65/promicro/rules.mk | 13 ------------- .../split89/{info.json => keyboard.json} | 8 ++++++++ keyboards/handwired/split89/rules.mk | 12 ------------ .../hidtech/bastyl/{info.json => keyboard.json} | 9 +++++++++ keyboards/hidtech/bastyl/rules.mk | 12 ------------ .../miniaxe/{info.json => keyboard.json} | 8 ++++++++ keyboards/kagizaraya/miniaxe/rules.mk | 14 -------------- .../{info.json => keyboard.json} | 9 +++++++++ keyboards/kakunpc/rabbit_capture_plan/rules.mk | 13 ------------- .../mkiirgb/v2/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk | 12 ------------ .../kbdfans/maja/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/maja/rules.mk | 12 ------------ .../maja_soldered/{info.json => keyboard.json} | 9 +++++++++ keyboards/kbdfans/maja_soldered/rules.mk | 11 ----------- .../keebio/bfo9000/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebio/bfo9000/rules.mk | 12 ------------ .../keebio/fourier/{info.json => keyboard.json} | 9 +++++++++ keyboards/keebio/fourier/rules.mk | 12 ------------ .../iris/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/iris/rev1/rules.mk | 12 ------------ .../iris/rev1_led/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/iris/rev1_led/rules.mk | 12 ------------ .../iris/rev5/{info.json => keyboard.json} | 11 +++++++++++ keyboards/keebio/iris/rev5/rules.mk | 13 ------------- .../nyquist/rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/keebio/nyquist/rev1/rules.mk | 12 ------------ .../nyquist/rev2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/nyquist/rev2/rules.mk | 12 ------------ .../nyquist/rev3/{info.json => keyboard.json} | 10 ++++++++++ keyboards/keebio/nyquist/rev3/rules.mk | 12 ------------ .../keyprez/bison/{info.json => keyboard.json} | 9 +++++++++ keyboards/keyprez/bison/rules.mk | 14 -------------- .../keyprez/unicorn/{info.json => keyboard.json} | 9 +++++++++ keyboards/keyprez/unicorn/rules.mk | 13 ------------- .../gameroyadvance/{info.json => keyboard.json} | 9 +++++++++ keyboards/keystonecaps/gameroyadvance/rules.mk | 14 -------------- .../latin17rgb/{info.json => keyboard.json} | 9 +++++++++ keyboards/latincompass/latin17rgb/rules.mk | 13 ------------- keyboards/majistic/{info.json => keyboard.json} | 8 ++++++++ keyboards/majistic/rules.mk | 12 ------------ keyboards/manta60/{info.json => keyboard.json} | 9 +++++++++ keyboards/manta60/rules.mk | 14 -------------- .../mj61/rev1/{info.json => keyboard.json} | 9 +++++++++ keyboards/melgeek/mj61/rev1/rules.mk | 12 ------------ .../rev3/info.json => mj61/rev2/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj61/rev2/rules.mk | 12 ------------ .../rev1/info.json => mj63/rev1/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj63/rev1/rules.mk | 12 ------------ .../rev2/info.json => mj63/rev2/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj63/rev2/rules.mk | 12 ------------ .../rev1/info.json => mj64/rev1/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj64/rev1/rules.mk | 12 ------------ .../mj64/rev2/{info.json => keyboard.json} | 9 +++++++++ keyboards/melgeek/mj64/rev2/rules.mk | 12 ------------ .../rev2/info.json => mj64/rev3/keyboard.json} | 9 +++++++++ keyboards/melgeek/mj64/rev3/rules.mk | 12 ------------ .../merge/um70/{info.json => keyboard.json} | 11 +++++++++++ keyboards/merge/um70/rules.mk | 14 -------------- .../merge/um80/{info.json => keyboard.json} | 11 +++++++++++ keyboards/merge/um80/rules.mk | 14 -------------- keyboards/meson/{info.json => keyboard.json} | 9 +++++++++ keyboards/meson/rules.mk | 12 ------------ .../miller/gm862/{info.json => keyboard.json} | 9 +++++++++ keyboards/miller/gm862/rules.mk | 13 ------------- keyboards/mint60/{info.json => keyboard.json} | 9 +++++++++ keyboards/mint60/rules.mk | 12 ------------ .../momoka_ergo/{info.json => keyboard.json} | 9 +++++++++ keyboards/momoka_ergo/rules.mk | 12 ------------ .../nacly/sodium42/{info.json => keyboard.json} | 8 ++++++++ keyboards/nacly/sodium42/rules.mk | 12 ------------ .../nacly/sodium50/{info.json => keyboard.json} | 8 ++++++++ keyboards/nacly/sodium50/rules.mk | 12 ------------ .../nacly/sodium62/{info.json => keyboard.json} | 9 +++++++++ keyboards/nacly/sodium62/rules.mk | 14 -------------- .../splitreus62/{info.json => keyboard.json} | 9 +++++++++ keyboards/nacly/splitreus62/rules.mk | 12 ------------ .../obosob/arch_36/{info.json => keyboard.json} | 10 ++++++++++ keyboards/obosob/arch_36/rules.mk | 13 ------------- .../{info.json => keyboard.json} | 9 +++++++++ keyboards/obosob/steal_this_keyboard/rules.mk | 13 ------------- .../ergo_single/{info.json => keyboard.json} | 9 +++++++++ keyboards/ogre/ergo_single/rules.mk | 12 ------------ .../ogre/ergo_split/{info.json => keyboard.json} | 9 +++++++++ keyboards/ogre/ergo_split/rules.mk | 12 ------------ keyboards/pisces/{info.json => keyboard.json} | 8 ++++++++ keyboards/pisces/rules.mk | 12 ------------ keyboards/pluckey/{info.json => keyboard.json} | 9 +++++++++ keyboards/pluckey/rules.mk | 13 ------------- keyboards/pteron36/{info.json => keyboard.json} | 11 +++++++++++ keyboards/pteron36/rules.mk | 14 -------------- .../cocoa40/{info.json => keyboard.json} | 8 ++++++++ keyboards/recompile_keys/cocoa40/rules.mk | 12 ------------ .../7splus/{info.json => keyboard.json} | 9 +++++++++ keyboards/salicylic_acid3/7splus/rules.mk | 12 ------------ .../ajisai74/{info.json => keyboard.json} | 8 ++++++++ keyboards/salicylic_acid3/ajisai74/rules.mk | 12 ------------ .../ergoarrows/{info.json => keyboard.json} | 9 +++++++++ keyboards/salicylic_acid3/ergoarrows/rules.mk | 12 ------------ .../nknl7en/{info.json => keyboard.json} | 9 +++++++++ keyboards/salicylic_acid3/nknl7en/rules.mk | 12 ------------ .../nknl7jp/{info.json => keyboard.json} | 9 +++++++++ keyboards/salicylic_acid3/nknl7jp/rules.mk | 12 ------------ keyboards/scatter42/{info.json => keyboard.json} | 8 ++++++++ keyboards/scatter42/rules.mk | 12 ------------ keyboards/sparrow62/{info.json => keyboard.json} | 8 ++++++++ keyboards/sparrow62/rules.mk | 12 ------------ .../rev0/{info.json => keyboard.json} | 8 ++++++++ keyboards/takashiski/otaku_split/rev0/rules.mk | 12 ------------ .../rev1/{info.json => keyboard.json} | 8 ++++++++ keyboards/takashiski/otaku_split/rev1/rules.mk | 12 ------------ .../diverge3/{info.json => keyboard.json} | 9 +++++++++ keyboards/unikeyboard/diverge3/rules.mk | 12 ------------ .../divergetm2/{info.json => keyboard.json} | 8 ++++++++ keyboards/unikeyboard/divergetm2/rules.mk | 12 ------------ .../viktus/sp_mini/{info.json => keyboard.json} | 10 ++++++++++ keyboards/viktus/sp_mini/rules.mk | 13 ------------- 168 files changed, 738 insertions(+), 1042 deletions(-) rename keyboards/bastardkb/tbk/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/bastardkb/tbk/rules.mk rename keyboards/flxlb/zplit/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/flxlb/zplit/rules.mk rename keyboards/fungo/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/fungo/rev1/rules.mk rename keyboards/gummykey/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/gummykey/rules.mk rename keyboards/hand88/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/hand88/rules.mk rename keyboards/handwired/brain/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/brain/rules.mk rename keyboards/handwired/chiron/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/chiron/rules.mk rename keyboards/handwired/dactyl_manuform/4x5/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_manuform/4x5/rules.mk rename keyboards/handwired/dactyl_manuform/4x5_5/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/dactyl_manuform/4x5_5/rules.mk rename keyboards/handwired/dactyl_manuform/4x6/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/4x6/rules.mk rename keyboards/handwired/dactyl_manuform/4x6_5/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/rules.mk rename keyboards/handwired/dactyl_manuform/5x6/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6/rules.mk rename keyboards/handwired/dactyl_manuform/5x6_2_5/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk rename keyboards/handwired/dactyl_manuform/5x6_5/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_5/rules.mk rename keyboards/handwired/dactyl_manuform/5x6_6/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x6_6/rules.mk rename keyboards/handwired/dactyl_manuform/5x7/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_manuform/5x7/rules.mk rename keyboards/handwired/dactyl_manuform/6x6_4/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/rules.mk rename keyboards/handwired/dactyl_promicro/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_promicro/rules.mk rename keyboards/handwired/dactyl_rah/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/handwired/dactyl_rah/rules.mk rename keyboards/handwired/elrgo_s/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/elrgo_s/rules.mk rename keyboards/handwired/freoduo/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/freoduo/rules.mk rename keyboards/handwired/jtallbean/split_65/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/jtallbean/split_65/rules.mk rename keyboards/handwired/ks63/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/ks63/rules.mk rename keyboards/handwired/not_so_minidox/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/not_so_minidox/rules.mk rename keyboards/handwired/skakunm_dactyl/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/skakunm_dactyl/rules.mk rename keyboards/handwired/split65/promicro/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/handwired/split65/promicro/rules.mk rename keyboards/handwired/split89/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/split89/rules.mk rename keyboards/hidtech/bastyl/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/hidtech/bastyl/rules.mk rename keyboards/kagizaraya/miniaxe/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/kagizaraya/miniaxe/rules.mk rename keyboards/kakunpc/rabbit_capture_plan/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kakunpc/rabbit_capture_plan/rules.mk rename keyboards/kbdfans/kbd67/mkiirgb/v2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk rename keyboards/kbdfans/maja/{info.json => keyboard.json} (96%) delete mode 100755 keyboards/kbdfans/maja/rules.mk rename keyboards/kbdfans/maja_soldered/{info.json => keyboard.json} (95%) delete mode 100755 keyboards/kbdfans/maja_soldered/rules.mk rename keyboards/keebio/bfo9000/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keebio/bfo9000/rules.mk rename keyboards/keebio/fourier/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/fourier/rules.mk rename keyboards/keebio/iris/rev1/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/iris/rev1/rules.mk rename keyboards/keebio/iris/rev1_led/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/iris/rev1_led/rules.mk rename keyboards/keebio/iris/rev5/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/keebio/iris/rev5/rules.mk rename keyboards/keebio/nyquist/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/keebio/nyquist/rev1/rules.mk rename keyboards/keebio/nyquist/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/nyquist/rev2/rules.mk rename keyboards/keebio/nyquist/rev3/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keebio/nyquist/rev3/rules.mk rename keyboards/keyprez/bison/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/keyprez/bison/rules.mk rename keyboards/keyprez/unicorn/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/keyprez/unicorn/rules.mk rename keyboards/keystonecaps/gameroyadvance/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/keystonecaps/gameroyadvance/rules.mk rename keyboards/latincompass/latin17rgb/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/latincompass/latin17rgb/rules.mk rename keyboards/majistic/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/majistic/rules.mk rename keyboards/manta60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/manta60/rules.mk rename keyboards/melgeek/mj61/rev1/{info.json => keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj61/rev1/rules.mk rename keyboards/melgeek/{mj64/rev3/info.json => mj61/rev2/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj61/rev2/rules.mk rename keyboards/melgeek/{mj64/rev1/info.json => mj63/rev1/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj63/rev1/rules.mk rename keyboards/melgeek/{mj61/rev2/info.json => mj63/rev2/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj63/rev2/rules.mk rename keyboards/melgeek/{mj63/rev1/info.json => mj64/rev1/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj64/rev1/rules.mk rename keyboards/melgeek/mj64/rev2/{info.json => keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj64/rev2/rules.mk rename keyboards/melgeek/{mj63/rev2/info.json => mj64/rev3/keyboard.json} (52%) delete mode 100644 keyboards/melgeek/mj64/rev3/rules.mk rename keyboards/merge/um70/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/merge/um70/rules.mk rename keyboards/merge/um80/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/merge/um80/rules.mk rename keyboards/meson/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/meson/rules.mk rename keyboards/miller/gm862/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/miller/gm862/rules.mk rename keyboards/mint60/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/mint60/rules.mk rename keyboards/momoka_ergo/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/momoka_ergo/rules.mk rename keyboards/nacly/sodium42/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/nacly/sodium42/rules.mk rename keyboards/nacly/sodium50/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/nacly/sodium50/rules.mk rename keyboards/nacly/sodium62/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/nacly/sodium62/rules.mk rename keyboards/nacly/splitreus62/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/nacly/splitreus62/rules.mk rename keyboards/obosob/arch_36/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/obosob/arch_36/rules.mk rename keyboards/obosob/steal_this_keyboard/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/obosob/steal_this_keyboard/rules.mk rename keyboards/ogre/ergo_single/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ogre/ergo_single/rules.mk rename keyboards/ogre/ergo_split/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ogre/ergo_split/rules.mk rename keyboards/pisces/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/pisces/rules.mk rename keyboards/pluckey/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/pluckey/rules.mk rename keyboards/pteron36/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/pteron36/rules.mk rename keyboards/recompile_keys/cocoa40/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/recompile_keys/cocoa40/rules.mk rename keyboards/salicylic_acid3/7splus/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/7splus/rules.mk rename keyboards/salicylic_acid3/ajisai74/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/ajisai74/rules.mk rename keyboards/salicylic_acid3/ergoarrows/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/ergoarrows/rules.mk rename keyboards/salicylic_acid3/nknl7en/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/nknl7en/rules.mk rename keyboards/salicylic_acid3/nknl7jp/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/salicylic_acid3/nknl7jp/rules.mk rename keyboards/scatter42/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/scatter42/rules.mk rename keyboards/sparrow62/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/sparrow62/rules.mk rename keyboards/takashiski/otaku_split/rev0/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/takashiski/otaku_split/rev0/rules.mk rename keyboards/takashiski/otaku_split/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/takashiski/otaku_split/rev1/rules.mk rename keyboards/unikeyboard/diverge3/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/unikeyboard/diverge3/rules.mk rename keyboards/unikeyboard/divergetm2/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/unikeyboard/divergetm2/rules.mk rename keyboards/viktus/sp_mini/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/viktus/sp_mini/rules.mk diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/keyboard.json similarity index 95% rename from keyboards/bastardkb/tbk/info.json rename to keyboards/bastardkb/tbk/keyboard.json index 40c33619d19..90e37478a1e 100644 --- a/keyboards/bastardkb/tbk/info.json +++ b/keyboards/bastardkb/tbk/keyboard.json @@ -24,6 +24,15 @@ "ws2812": { "pin": "D2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], "rows": ["D7", "B5", "F7", "F6", "B6"] diff --git a/keyboards/bastardkb/tbk/rules.mk b/keyboards/bastardkb/tbk/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/bastardkb/tbk/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 = 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/flxlb/zplit/info.json b/keyboards/flxlb/zplit/keyboard.json similarity index 94% rename from keyboards/flxlb/zplit/info.json rename to keyboards/flxlb/zplit/keyboard.json index 850cb3f5d3b..2d5c33f49f3 100644 --- a/keyboards/flxlb/zplit/info.json +++ b/keyboards/flxlb/zplit/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B2", "B3", "D6", "D7", "B4", "B5"], "rows": ["D4", "F5", "F4", "F1"] diff --git a/keyboards/flxlb/zplit/rules.mk b/keyboards/flxlb/zplit/rules.mk deleted file mode 100644 index 901257cd173..00000000000 --- a/keyboards/flxlb/zplit/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/keyboard.json similarity index 96% rename from keyboards/fungo/rev1/info.json rename to keyboards/fungo/rev1/keyboard.json index 7c05cd7371b..988ba0f6431 100644 --- a/keyboards/fungo/rev1/info.json +++ b/keyboards/fungo/rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1233", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "key_lock": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"], diff --git a/keyboards/fungo/rev1/rules.mk b/keyboards/fungo/rev1/rules.mk deleted file mode 100644 index 2365546821a..00000000000 --- a/keyboards/fungo/rev1/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# 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 -KEY_LOCK_ENABLE = yes # kc_lock use - -OLED_ENABLE = no diff --git a/keyboards/gummykey/info.json b/keyboards/gummykey/keyboard.json similarity index 95% rename from keyboards/gummykey/info.json rename to keyboards/gummykey/keyboard.json index 1520809502a..bb7001438df 100644 --- a/keyboards/gummykey/info.json +++ b/keyboards/gummykey/keyboard.json @@ -3,6 +3,14 @@ "manufacturer": "Gumorr", "url": "https://github.com/gumorr/GummyKey", "maintainer": "Gumorr", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "usb": { "vid": "0xAA12", "pid": "0x0001", diff --git a/keyboards/gummykey/rules.mk b/keyboards/gummykey/rules.mk deleted file mode 100644 index 6e0404820cd..00000000000 --- a/keyboards/gummykey/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/hand88/info.json b/keyboards/hand88/keyboard.json similarity index 99% rename from keyboards/hand88/info.json rename to keyboards/hand88/keyboard.json index 0dc55ed89ac..cb8a320aaf0 100755 --- a/keyboards/hand88/info.json +++ b/keyboards/hand88/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3838", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A1", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"], "rows": ["A2", "A14", "A15", "B3", "B4", "B5"] diff --git a/keyboards/hand88/rules.mk b/keyboards/hand88/rules.mk deleted file mode 100644 index d3ca7b060e1..00000000000 --- a/keyboards/hand88/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/keyboard.json similarity index 95% rename from keyboards/handwired/brain/info.json rename to keyboards/handwired/brain/keyboard.json index 01ec6602b7c..e9093711d00 100644 --- a/keyboards/handwired/brain/info.json +++ b/keyboards/handwired/brain/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] diff --git a/keyboards/handwired/brain/rules.mk b/keyboards/handwired/brain/rules.mk deleted file mode 100644 index 6fe874e748b..00000000000 --- a/keyboards/handwired/brain/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/keyboard.json similarity index 95% rename from keyboards/handwired/chiron/info.json rename to keyboards/handwired/chiron/keyboard.json index 9d1d47564a7..6c2626df64b 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": true, + "nkro": false, + "rgblight": true, + "sleep_led": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/chiron/rules.mk b/keyboards/handwired/chiron/rules.mk deleted file mode 100644 index 61784649426..00000000000 --- a/keyboards/handwired/chiron/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -AUDIO_ENABLE = no -AUTOLOG_ENABLE = no -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -COMMAND_ENABLE = no -CONSOLE_ENABLE = no -DEBUG_ENABLE = no -EXTRAKEY_ENABLE = no -LEADER_ENABLE = no -MOUSEKEY_ENABLE = yes -NKRO_ENABLE = no # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes -SLEEP_LED_ENABLE = yes diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_manuform/4x5/info.json rename to keyboards/handwired/dactyl_manuform/4x5/keyboard.json index 12f6f6397a0..b779e9d3c1e 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/4x5/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json similarity index 94% rename from keyboards/handwired/dactyl_manuform/4x5_5/info.json rename to keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json index 689b43c5bf5..8f53dd03039 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "F6"], "rows": ["F7", "B1", "B3", "B2", "B4"] diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk deleted file mode 100644 index 7748be4c5b3..00000000000 --- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options - -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/4x6/info.json rename to keyboards/handwired/dactyl_manuform/4x6/keyboard.json index 9305461f865..feb58db5dbe 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x6/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/4x6/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json similarity index 97% rename from keyboards/handwired/dactyl_manuform/4x6_5/info.json rename to keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json index 9a879132a3e..a0607c70683 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/5x6/info.json rename to keyboards/handwired/dactyl_manuform/5x6/keyboard.json index 66658447487..b5681f4ca7e 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/5x6_2_5/info.json rename to keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json index ec6a432cb24..e36acea627c 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/5x6_5/info.json rename to keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json index 14b0105cae2..1153bcdb44e 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3536", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_5/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/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json similarity index 95% rename from keyboards/handwired/dactyl_manuform/5x6_6/info.json rename to keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json index 6a2b00ffffa..8a3e69f2efb 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk deleted file mode 100644 index e70d1927dee..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_manuform/5x7/info.json rename to keyboards/handwired/dactyl_manuform/5x7/keyboard.json index 8f1cfe5d17d..bc734607cf3 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/info.json +++ b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/dactyl_manuform/5x7/rules.mk b/keyboards/handwired/dactyl_manuform/5x7/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/5x7/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_manuform/6x6_4/info.json rename to keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json index e9b0eb40295..36051fb7feb 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json @@ -14,6 +14,14 @@ "ws2812": { "pin": "D3" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_promicro/info.json rename to keyboards/handwired/dactyl_promicro/keyboard.json index 3c354bbcec4..572ea05b2f3 100644 --- a/keyboards/handwired/dactyl_promicro/info.json +++ b/keyboards/handwired/dactyl_promicro/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_promicro/rules.mk b/keyboards/handwired/dactyl_promicro/rules.mk deleted file mode 100644 index d68e4764c51..00000000000 --- a/keyboards/handwired/dactyl_promicro/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/keyboard.json similarity index 96% rename from keyboards/handwired/dactyl_rah/info.json rename to keyboards/handwired/dactyl_rah/keyboard.json index 6cd23a54cf0..f550a055c7f 100644 --- a/keyboards/handwired/dactyl_rah/info.json +++ b/keyboards/handwired/dactyl_rah/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_rah/rules.mk b/keyboards/handwired/dactyl_rah/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/dactyl_rah/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/keyboard.json similarity index 94% rename from keyboards/handwired/elrgo_s/info.json rename to keyboards/handwired/elrgo_s/keyboard.json index ea54669232d..0da809d2ac5 100644 --- a/keyboards/handwired/elrgo_s/info.json +++ b/keyboards/handwired/elrgo_s/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/elrgo_s/rules.mk b/keyboards/handwired/elrgo_s/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/elrgo_s/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/keyboard.json similarity index 95% rename from keyboards/handwired/freoduo/info.json rename to keyboards/handwired/freoduo/keyboard.json index 04ba446e702..0d23776f4a6 100644 --- a/keyboards/handwired/freoduo/info.json +++ b/keyboards/handwired/freoduo/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x0602", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "velocikey": true + }, "matrix_pins": { "cols": ["B2", "B6", "F6", "B3", "B1", "F7"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/freoduo/rules.mk b/keyboards/handwired/freoduo/rules.mk deleted file mode 100644 index 89a6989a8c6..00000000000 --- a/keyboards/handwired/freoduo/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -VELOCIKEY_ENABLE = yes diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/keyboard.json similarity index 98% rename from keyboards/handwired/jtallbean/split_65/info.json rename to keyboards/handwired/jtallbean/split_65/keyboard.json index 502b41ebce0..d1b974a59be 100644 --- a/keyboards/handwired/jtallbean/split_65/info.json +++ b/keyboards/handwired/jtallbean/split_65/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"], "rows": ["F4", "F1", "F0", "C7", "B6"] diff --git a/keyboards/handwired/jtallbean/split_65/rules.mk b/keyboards/handwired/jtallbean/split_65/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/handwired/jtallbean/split_65/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/keyboard.json similarity index 95% rename from keyboards/handwired/ks63/info.json rename to keyboards/handwired/ks63/keyboard.json index 095f53b7c6c..542cd76811e 100644 --- a/keyboards/handwired/ks63/info.json +++ b/keyboards/handwired/ks63/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3061", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6"] diff --git a/keyboards/handwired/ks63/rules.mk b/keyboards/handwired/ks63/rules.mk deleted file mode 100644 index 3f2eac5940c..00000000000 --- a/keyboards/handwired/ks63/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/keyboard.json similarity index 94% rename from keyboards/handwired/not_so_minidox/info.json rename to keyboards/handwired/not_so_minidox/keyboard.json index e14bf01acb5..b48eba771bd 100644 --- a/keyboards/handwired/not_so_minidox/info.json +++ b/keyboards/handwired/not_so_minidox/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "D4"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/handwired/not_so_minidox/rules.mk b/keyboards/handwired/not_so_minidox/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/not_so_minidox/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/keyboard.json similarity index 93% rename from keyboards/handwired/skakunm_dactyl/info.json rename to keyboards/handwired/skakunm_dactyl/keyboard.json index fa7aad4c4d9..91ee5b1fb6c 100644 --- a/keyboards/handwired/skakunm_dactyl/info.json +++ b/keyboards/handwired/skakunm_dactyl/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/skakunm_dactyl/rules.mk b/keyboards/handwired/skakunm_dactyl/rules.mk deleted file mode 100644 index e39bab4422a..00000000000 --- a/keyboards/handwired/skakunm_dactyl/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/keyboard.json similarity index 95% rename from keyboards/handwired/split65/promicro/info.json rename to keyboards/handwired/split65/promicro/keyboard.json index c106e4fd5ed..5efdd93629f 100644 --- a/keyboards/handwired/split65/promicro/info.json +++ b/keyboards/handwired/split65/promicro/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "oled": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"], diff --git a/keyboards/handwired/split65/promicro/rules.mk b/keyboards/handwired/split65/promicro/rules.mk deleted file mode 100644 index c20f156f45f..00000000000 --- a/keyboards/handwired/split65/promicro/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 = 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 -OLED_ENABLE = yes diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/keyboard.json similarity index 97% rename from keyboards/handwired/split89/info.json rename to keyboards/handwired/split89/keyboard.json index 477f1f6612c..d30105844af 100644 --- a/keyboards/handwired/split89/info.json +++ b/keyboards/handwired/split89/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"], "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/split89/rules.mk b/keyboards/handwired/split89/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/handwired/split89/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/keyboard.json similarity index 95% rename from keyboards/hidtech/bastyl/info.json rename to keyboards/hidtech/bastyl/keyboard.json index 67903569ab2..5c3a9fcfcff 100644 --- a/keyboards/hidtech/bastyl/info.json +++ b/keyboards/hidtech/bastyl/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1827", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B4", "E6", "C6", "B1", "B3", "B2"], "rows": ["D7", "B5", "F7", "F6", "B6"] diff --git a/keyboards/hidtech/bastyl/rules.mk b/keyboards/hidtech/bastyl/rules.mk deleted file mode 100644 index 2eba275490a..00000000000 --- a/keyboards/hidtech/bastyl/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 = 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/kagizaraya/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/keyboard.json similarity index 94% rename from keyboards/kagizaraya/miniaxe/info.json rename to keyboards/kagizaraya/miniaxe/keyboard.json index a1de251618c..fa9f4d79dfc 100644 --- a/keyboards/kagizaraya/miniaxe/info.json +++ b/keyboards/kagizaraya/miniaxe/keyboard.json @@ -34,6 +34,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "direct": [ ["F1", "E6", "B0", "B2", "B3"], diff --git a/keyboards/kagizaraya/miniaxe/rules.mk b/keyboards/kagizaraya/miniaxe/rules.mk deleted file mode 100644 index f71583eb50d..00000000000 --- a/keyboards/kagizaraya/miniaxe/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -DEBUG_ENABLE = no diff --git a/keyboards/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json similarity index 96% rename from keyboards/kakunpc/rabbit_capture_plan/info.json rename to keyboards/kakunpc/rabbit_capture_plan/keyboard.json index fe6cf5bd012..7667e5e41b1 100644 --- a/keyboards/kakunpc/rabbit_capture_plan/info.json +++ b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json @@ -31,6 +31,15 @@ "twinkle": true } }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/kakunpc/rabbit_capture_plan/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/rules.mk deleted file mode 100644 index 698712de91f..00000000000 --- a/keyboards/kakunpc/rabbit_capture_plan/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = no diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json similarity index 96% rename from keyboards/kbdfans/kbd67/mkiirgb/v2/info.json rename to keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json index 9285255f36f..561c4df2ac0 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/keyboard.json @@ -39,6 +39,15 @@ "led_process_limit": 4, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "F1", "F4", "E6", "C6"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk deleted file mode 100644 index 502113e3b85..00000000000 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/keyboard.json similarity index 96% rename from keyboards/kbdfans/maja/info.json rename to keyboards/kbdfans/maja/keyboard.json index 7b64cae8934..c307f78637a 100644 --- a/keyboards/kbdfans/maja/info.json +++ b/keyboards/kbdfans/maja/keyboard.json @@ -45,6 +45,15 @@ "led_process_limit": 4, "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], "rows": ["F0", "B6", "B5", "B4", "D7"] diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk deleted file mode 100755 index a59c9aa4cf9..00000000000 --- a/keyboards/kbdfans/maja/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 -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/keyboard.json similarity index 95% rename from keyboards/kbdfans/maja_soldered/info.json rename to keyboards/kbdfans/maja_soldered/keyboard.json index 197f26870b8..f9ae338ae73 100644 --- a/keyboards/kbdfans/maja_soldered/info.json +++ b/keyboards/kbdfans/maja_soldered/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6069", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], "rows": ["F0", "B6", "D6", "B4", "D7"] diff --git a/keyboards/kbdfans/maja_soldered/rules.mk b/keyboards/kbdfans/maja_soldered/rules.mk deleted file mode 100755 index 901d395d65a..00000000000 --- a/keyboards/kbdfans/maja_soldered/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/keyboard.json similarity index 97% rename from keyboards/keebio/bfo9000/info.json rename to keyboards/keebio/bfo9000/keyboard.json index c5571d31db0..86fd59a5986 100644 --- a/keyboards/keebio/bfo9000/info.json +++ b/keyboards/keebio/bfo9000/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1169", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D3", "D2", "D4", "C6", "D7", "E6"] diff --git a/keyboards/keebio/bfo9000/rules.mk b/keyboards/keebio/bfo9000/rules.mk deleted file mode 100644 index b7f1787db7b..00000000000 --- a/keyboards/keebio/bfo9000/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/keyboard.json similarity index 94% rename from keyboards/keebio/fourier/info.json rename to keyboards/keebio/fourier/keyboard.json index 8f0de7e531e..a1dab05c567 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1247", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["F4", "D7", "E6", "B4"] diff --git a/keyboards/keebio/fourier/rules.mk b/keyboards/keebio/fourier/rules.mk deleted file mode 100644 index cda7d53ecb4..00000000000 --- a/keyboards/keebio/fourier/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 = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/keyboard.json similarity index 94% rename from keyboards/keebio/iris/rev1/info.json rename to keyboards/keebio/iris/rev1/keyboard.json index b639cb4328f..c6b69c36778 100644 --- a/keyboards/keebio/iris/rev1/info.json +++ b/keyboards/keebio/iris/rev1/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x1256", "device_version": "1.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5", "D4"] diff --git a/keyboards/keebio/iris/rev1/rules.mk b/keyboards/keebio/iris/rev1/rules.mk deleted file mode 100644 index 2ed95720625..00000000000 --- a/keyboards/keebio/iris/rev1/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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/keyboard.json similarity index 94% rename from keyboards/keebio/iris/rev1_led/info.json rename to keyboards/keebio/iris/rev1_led/keyboard.json index 85e6ba797af..70500da27e9 100644 --- a/keyboards/keebio/iris/rev1_led/info.json +++ b/keyboards/keebio/iris/rev1_led/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x1256", "device_version": "1.1.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "F4"], "rows": ["D7", "E6", "B4", "B5", "D4"] diff --git a/keyboards/keebio/iris/rev1_led/rules.mk b/keyboards/keebio/iris/rev1_led/rules.mk deleted file mode 100644 index 2ed95720625..00000000000 --- a/keyboards/keebio/iris/rev1_led/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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/keyboard.json similarity index 94% rename from keyboards/keebio/iris/rev5/info.json rename to keyboards/keebio/iris/rev5/keyboard.json index e812a086e90..a1f97a78311 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/keyboard.json @@ -4,6 +4,17 @@ "pid": "0x5356", "device_version": "5.1.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "D3", "D2", "B7", "D4"], "rows": ["B1", "F0", "F5", "F6", "F7"] diff --git a/keyboards/keebio/iris/rev5/rules.mk b/keyboards/keebio/iris/rev5/rules.mk deleted file mode 100644 index 8b2f28c1c46..00000000000 --- a/keyboards/keebio/iris/rev5/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes diff --git a/keyboards/keebio/nyquist/rev1/info.json b/keyboards/keebio/nyquist/rev1/keyboard.json similarity index 97% rename from keyboards/keebio/nyquist/rev1/info.json rename to keyboards/keebio/nyquist/rev1/keyboard.json index 105e159d5a3..717b49e9713 100644 --- a/keyboards/keebio/nyquist/rev1/info.json +++ b/keyboards/keebio/nyquist/rev1/keyboard.json @@ -4,6 +4,14 @@ "pid": "0x1156", "device_version": "1.0.0" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keebio/nyquist/rev1/rules.mk b/keyboards/keebio/nyquist/rev1/rules.mk deleted file mode 100644 index e39bab4422a..00000000000 --- a/keyboards/keebio/nyquist/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/nyquist/rev2/info.json b/keyboards/keebio/nyquist/rev2/keyboard.json similarity index 96% rename from keyboards/keebio/nyquist/rev2/info.json rename to keyboards/keebio/nyquist/rev2/keyboard.json index 31987f2f949..435cdd189fc 100644 --- a/keyboards/keebio/nyquist/rev2/info.json +++ b/keyboards/keebio/nyquist/rev2/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x2156", "device_version": "2.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D2", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/keebio/nyquist/rev2/rules.mk b/keyboards/keebio/nyquist/rev2/rules.mk deleted file mode 100644 index 083a3e806cb..00000000000 --- a/keyboards/keebio/nyquist/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keebio/nyquist/rev3/info.json b/keyboards/keebio/nyquist/rev3/keyboard.json similarity index 96% rename from keyboards/keebio/nyquist/rev3/info.json rename to keyboards/keebio/nyquist/rev3/keyboard.json index 955c9281074..80e5a10a17a 100644 --- a/keyboards/keebio/nyquist/rev3/info.json +++ b/keyboards/keebio/nyquist/rev3/keyboard.json @@ -4,6 +4,16 @@ "pid": "0x3156", "device_version": "3.0.0" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F4", "B7", "D2", "D3", "D4"], "rows": ["F0", "F5", "D7", "F6", "F7"] diff --git a/keyboards/keebio/nyquist/rev3/rules.mk b/keyboards/keebio/nyquist/rev3/rules.mk deleted file mode 100644 index 083a3e806cb..00000000000 --- a/keyboards/keebio/nyquist/rev3/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/keyboard.json similarity index 98% rename from keyboards/keyprez/bison/info.json rename to keyboards/keyprez/bison/keyboard.json index 29b1a9da723..462b9d4274c 100644 --- a/keyboards/keyprez/bison/info.json +++ b/keyboards/keyprez/bison/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D3", "E6", "B2", "B4", "D4", "F6", "F5", "F4"], "rows": ["D2", "F7", "B1", "B3", "D7"] diff --git a/keyboards/keyprez/bison/rules.mk b/keyboards/keyprez/bison/rules.mk deleted file mode 100644 index 453f0a34d38..00000000000 --- a/keyboards/keyprez/bison/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = yes diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/keyboard.json similarity index 96% rename from keyboards/keyprez/unicorn/info.json rename to keyboards/keyprez/unicorn/keyboard.json index 2d2ab010e79..56061290ea7 100644 --- a/keyboards/keyprez/unicorn/info.json +++ b/keyboards/keyprez/unicorn/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x7563", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"], "rows": ["F4", "D3", "F6", "F7", "B1", "B3"] diff --git a/keyboards/keyprez/unicorn/rules.mk b/keyboards/keyprez/unicorn/rules.mk deleted file mode 100644 index 4f4828ca976..00000000000 --- a/keyboards/keyprez/unicorn/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 -ENCODER_ENABLE = yes diff --git a/keyboards/keystonecaps/gameroyadvance/info.json b/keyboards/keystonecaps/gameroyadvance/keyboard.json similarity index 98% rename from keyboards/keystonecaps/gameroyadvance/info.json rename to keyboards/keystonecaps/gameroyadvance/keyboard.json index 21f078a7c58..89b30fe4d80 100644 --- a/keyboards/keystonecaps/gameroyadvance/info.json +++ b/keyboards/keystonecaps/gameroyadvance/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D4", "D0", "D1", "C6", "D7", "E6", "F4", "B2", "B6"], "rows": ["F5", "F6", "F7", "B1", "B3"] diff --git a/keyboards/keystonecaps/gameroyadvance/rules.mk b/keyboards/keystonecaps/gameroyadvance/rules.mk deleted file mode 100644 index f90bd0ef997..00000000000 --- a/keyboards/keystonecaps/gameroyadvance/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 = yes # 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/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/keyboard.json similarity index 94% rename from keyboards/latincompass/latin17rgb/info.json rename to keyboards/latincompass/latin17rgb/keyboard.json index a211846f628..161672aea4f 100644 --- a/keyboards/latincompass/latin17rgb/info.json +++ b/keyboards/latincompass/latin17rgb/keyboard.json @@ -64,6 +64,15 @@ "driver": "is31fl3731", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4"], "rows": ["C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/latincompass/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk deleted file mode 100644 index 0af5f68e5e1..00000000000 --- a/keyboards/latincompass/latin17rgb/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 = 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 diff --git a/keyboards/majistic/info.json b/keyboards/majistic/keyboard.json similarity index 96% rename from keyboards/majistic/info.json rename to keyboards/majistic/keyboard.json index 00dffa2fc19..258df08d883 100644 --- a/keyboards/majistic/info.json +++ b/keyboards/majistic/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x6E55", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], "rows": ["F6", "F7", "B1", "B3", "B2"] diff --git a/keyboards/majistic/rules.mk b/keyboards/majistic/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/majistic/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/manta60/info.json b/keyboards/manta60/keyboard.json similarity index 95% rename from keyboards/manta60/info.json rename to keyboards/manta60/keyboard.json index 06bcfb88d71..8482970b9b2 100644 --- a/keyboards/manta60/info.json +++ b/keyboards/manta60/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x991D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": false, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/manta60/rules.mk b/keyboards/manta60/rules.mk deleted file mode 100644 index be0c854d3c6..00000000000 --- a/keyboards/manta60/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 = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -IOS_DEVICE_ENABLE = no # connect to IOS device (iPad, iPhone) diff --git a/keyboards/melgeek/mj61/rev1/info.json b/keyboards/melgeek/mj61/rev1/keyboard.json similarity index 52% rename from keyboards/melgeek/mj61/rev1/info.json rename to keyboards/melgeek/mj61/rev1/keyboard.json index 67a4a004d62..e0bd315865d 100644 --- a/keyboards/melgeek/mj61/rev1/info.json +++ b/keyboards/melgeek/mj61/rev1/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj61/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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj61/rev2/keyboard.json similarity index 52% rename from keyboards/melgeek/mj64/rev3/info.json rename to keyboards/melgeek/mj61/rev2/keyboard.json index 62c58271177..779cfc091c8 100644 --- a/keyboards/melgeek/mj64/rev3/info.json +++ b/keyboards/melgeek/mj61/rev2/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj61/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj63/rev1/keyboard.json similarity index 52% rename from keyboards/melgeek/mj64/rev1/info.json rename to keyboards/melgeek/mj63/rev1/keyboard.json index 67a4a004d62..e0bd315865d 100644 --- a/keyboards/melgeek/mj64/rev1/info.json +++ b/keyboards/melgeek/mj63/rev1/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj63/rev1/rules.mk b/keyboards/melgeek/mj63/rev1/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj63/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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj61/rev2/info.json b/keyboards/melgeek/mj63/rev2/keyboard.json similarity index 52% rename from keyboards/melgeek/mj61/rev2/info.json rename to keyboards/melgeek/mj63/rev2/keyboard.json index 62c58271177..779cfc091c8 100644 --- a/keyboards/melgeek/mj61/rev2/info.json +++ b/keyboards/melgeek/mj63/rev2/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj63/rev2/rules.mk b/keyboards/melgeek/mj63/rev2/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj63/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj63/rev1/info.json b/keyboards/melgeek/mj64/rev1/keyboard.json similarity index 52% rename from keyboards/melgeek/mj63/rev1/info.json rename to keyboards/melgeek/mj64/rev1/keyboard.json index 67a4a004d62..e0bd315865d 100644 --- a/keyboards/melgeek/mj63/rev1/info.json +++ b/keyboards/melgeek/mj64/rev1/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj64/rev1/rules.mk b/keyboards/melgeek/mj64/rev1/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj64/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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/keyboard.json similarity index 52% rename from keyboards/melgeek/mj64/rev2/info.json rename to keyboards/melgeek/mj64/rev2/keyboard.json index 67a4a004d62..e0bd315865d 100644 --- a/keyboards/melgeek/mj64/rev2/info.json +++ b/keyboards/melgeek/mj64/rev2/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj64/rev2/rules.mk b/keyboards/melgeek/mj64/rev2/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj64/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/melgeek/mj63/rev2/info.json b/keyboards/melgeek/mj64/rev3/keyboard.json similarity index 52% rename from keyboards/melgeek/mj63/rev2/info.json rename to keyboards/melgeek/mj64/rev3/keyboard.json index 62c58271177..779cfc091c8 100644 --- a/keyboards/melgeek/mj63/rev2/info.json +++ b/keyboards/melgeek/mj64/rev3/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], "rows": ["B12", "B11", "B10", "B1", "A3"] diff --git a/keyboards/melgeek/mj64/rev3/rules.mk b/keyboards/melgeek/mj64/rev3/rules.mk deleted file mode 100644 index c66b1abcd45..00000000000 --- a/keyboards/melgeek/mj64/rev3/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = 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 -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/keyboard.json similarity index 98% rename from keyboards/merge/um70/info.json rename to keyboards/merge/um70/keyboard.json index a667dbe11be..c349abc7881 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x3222", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk deleted file mode 100644 index 45cbdcf0157..00000000000 --- a/keyboards/merge/um70/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/keyboard.json similarity index 96% rename from keyboards/merge/um80/info.json rename to keyboards/merge/um80/keyboard.json index 64939a18fbd..5a369877f88 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x3241", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], "rows": ["B0", "B1", "B2", "B3", "B7", "C7"] diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk deleted file mode 100644 index 45cbdcf0157..00000000000 --- a/keyboards/merge/um80/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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes diff --git a/keyboards/meson/info.json b/keyboards/meson/keyboard.json similarity index 96% rename from keyboards/meson/info.json rename to keyboards/meson/keyboard.json index aeec25f0465..72d9ec58e72 100644 --- a/keyboards/meson/info.json +++ b/keyboards/meson/keyboard.json @@ -7,6 +7,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"], "rows": ["F7", "C6", "F6", "F5"] diff --git a/keyboards/meson/rules.mk b/keyboards/meson/rules.mk deleted file mode 100644 index 9686f2e033e..00000000000 --- a/keyboards/meson/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/keyboard.json similarity index 96% rename from keyboards/miller/gm862/info.json rename to keyboards/miller/gm862/keyboard.json index 1249b0a5aba..b8c32cf16a6 100644 --- a/keyboards/miller/gm862/info.json +++ b/keyboards/miller/gm862/keyboard.json @@ -42,6 +42,15 @@ "driver": "is31fl3733", "sleep": true }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], "rows": ["F0", "F1", "F4", "F5", "B4"] diff --git a/keyboards/miller/gm862/rules.mk b/keyboards/miller/gm862/rules.mk deleted file mode 100644 index ea646d3d939..00000000000 --- a/keyboards/miller/gm862/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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix diff --git a/keyboards/mint60/info.json b/keyboards/mint60/keyboard.json similarity index 95% rename from keyboards/mint60/info.json rename to keyboards/mint60/keyboard.json index a7f992056ef..332a366aa6e 100644 --- a/keyboards/mint60/info.json +++ b/keyboards/mint60/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["D4", "B3", "B1", "F7", "B2", "B6", "F6", "F5"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/mint60/rules.mk b/keyboards/mint60/rules.mk deleted file mode 100644 index e788df9b325..00000000000 --- a/keyboards/mint60/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 = 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 = yes # Enable WS2812 RGB underlight. -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/keyboard.json similarity index 96% rename from keyboards/momoka_ergo/info.json rename to keyboards/momoka_ergo/keyboard.json index f509451ab3d..da21c509b92 100644 --- a/keyboards/momoka_ergo/info.json +++ b/keyboards/momoka_ergo/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"] diff --git a/keyboards/momoka_ergo/rules.mk b/keyboards/momoka_ergo/rules.mk deleted file mode 100644 index 6d85e16f920..00000000000 --- a/keyboards/momoka_ergo/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/keyboard.json similarity index 94% rename from keyboards/nacly/sodium42/info.json rename to keyboards/nacly/sodium42/keyboard.json index e87c76e21a6..f084ca2a239 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "B5", "B2", "B3"], "rows": ["F7", "D4", "D7", "B4"] diff --git a/keyboards/nacly/sodium42/rules.mk b/keyboards/nacly/sodium42/rules.mk deleted file mode 100644 index 7c9f712027b..00000000000 --- a/keyboards/nacly/sodium42/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 = 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 diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/keyboard.json similarity index 95% rename from keyboards/nacly/sodium50/info.json rename to keyboards/nacly/sodium50/keyboard.json index e82dc8c1b5d..ff7b691d9d7 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], "rows": ["F7", "D4", "D7", "B4"] diff --git a/keyboards/nacly/sodium50/rules.mk b/keyboards/nacly/sodium50/rules.mk deleted file mode 100644 index 7c9f712027b..00000000000 --- a/keyboards/nacly/sodium50/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 = 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 diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/keyboard.json similarity index 95% rename from keyboards/nacly/sodium62/info.json rename to keyboards/nacly/sodium62/keyboard.json index 45f5c488b8c..941bad2bd6c 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x636C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "oled": true + }, "matrix_pins": { "cols": ["D2", "C6", "E6", "B5", "B2", "B3", "B1"], "rows": ["F7", "D4", "D7", "B4", "B6"] diff --git a/keyboards/nacly/sodium62/rules.mk b/keyboards/nacly/sodium62/rules.mk deleted file mode 100644 index 020e7029212..00000000000 --- a/keyboards/nacly/sodium62/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 = 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 - -OLED_ENABLE = yes diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/keyboard.json similarity index 94% rename from keyboards/nacly/splitreus62/info.json rename to keyboards/nacly/splitreus62/keyboard.json index 85038a903b7..4efc32f5c5d 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xFED0", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["E6", "B4", "B5", "B6", "B2", "B3"], "rows": ["D3", "D2", "D1", "D4", "C6", "D7"] diff --git a/keyboards/nacly/splitreus62/rules.mk b/keyboards/nacly/splitreus62/rules.mk deleted file mode 100644 index 28c29a3b4dc..00000000000 --- a/keyboards/nacly/splitreus62/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 = 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 diff --git a/keyboards/obosob/arch_36/info.json b/keyboards/obosob/arch_36/keyboard.json similarity index 92% rename from keyboards/obosob/arch_36/info.json rename to keyboards/obosob/arch_36/keyboard.json index bc997372785..db3e356f3a7 100644 --- a/keyboards/obosob/arch_36/info.json +++ b/keyboards/obosob/arch_36/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x9CE3", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/obosob/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk deleted file mode 100644 index 7d3e33104ff..00000000000 --- a/keyboards/obosob/arch_36/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 = 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 -OLED_ENABLE = yes -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/obosob/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/keyboard.json similarity index 93% rename from keyboards/obosob/steal_this_keyboard/info.json rename to keyboards/obosob/steal_this_keyboard/keyboard.json index aecfffd7596..83de29d69c8 100644 --- a/keyboards/obosob/steal_this_keyboard/info.json +++ b/keyboards/obosob/steal_this_keyboard/keyboard.json @@ -10,6 +10,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "unicode": true + }, "matrix_pins": { "direct": [ ["F4", "F7", "B2", "D1", "D7"], diff --git a/keyboards/obosob/steal_this_keyboard/rules.mk b/keyboards/obosob/steal_this_keyboard/rules.mk deleted file mode 100644 index f59e3a88231..00000000000 --- a/keyboards/obosob/steal_this_keyboard/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 -UNICODE_ENABLE = yes # Unicode -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/keyboard.json similarity index 96% rename from keyboards/ogre/ergo_single/info.json rename to keyboards/ogre/ergo_single/keyboard.json index 6c3feea0e05..3ebd88b0d28 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/ogre/ergo_single/rules.mk b/keyboards/ogre/ergo_single/rules.mk deleted file mode 100644 index ff287d5235b..00000000000 --- a/keyboards/ogre/ergo_single/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/keyboard.json similarity index 96% rename from keyboards/ogre/ergo_split/info.json rename to keyboards/ogre/ergo_split/keyboard.json index d937fe9373a..765bebc2fba 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/ogre/ergo_split/rules.mk b/keyboards/ogre/ergo_split/rules.mk deleted file mode 100644 index ff287d5235b..00000000000 --- a/keyboards/ogre/ergo_split/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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/pisces/info.json b/keyboards/pisces/keyboard.json similarity index 93% rename from keyboards/pisces/info.json rename to keyboards/pisces/keyboard.json index 48ef9db5c0e..2783f1085fd 100644 --- a/keyboards/pisces/info.json +++ b/keyboards/pisces/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B1", "B2", "B3", "B4", "B5", "B6", "B7"], "rows": ["C4", "B0", "C7"] diff --git a/keyboards/pisces/rules.mk b/keyboards/pisces/rules.mk deleted file mode 100644 index 3b6a1809db1..00000000000 --- a/keyboards/pisces/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/pluckey/info.json b/keyboards/pluckey/keyboard.json similarity index 97% rename from keyboards/pluckey/info.json rename to keyboards/pluckey/keyboard.json index 0efd9db12d5..52e951e875c 100644 --- a/keyboards/pluckey/info.json +++ b/keyboards/pluckey/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x91CE", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "F7"], "rows": ["B4", "F5", "F6", "B6", "B5"] diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk deleted file mode 100644 index b03b6fa9058..00000000000 --- a/keyboards/pluckey/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 = 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/pteron36/info.json b/keyboards/pteron36/keyboard.json similarity index 95% rename from keyboards/pteron36/info.json rename to keyboards/pteron36/keyboard.json index 2adb97ec511..f4bab524196 100644 --- a/keyboards/pteron36/info.json +++ b/keyboards/pteron36/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x5054", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2"], "rows": ["E6", "D7", "B4", "B5"] diff --git a/keyboards/pteron36/rules.mk b/keyboards/pteron36/rules.mk deleted file mode 100644 index 182bad228c7..00000000000 --- a/keyboards/pteron36/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 -OLED_ENABLE = yes # OLED display -ENCODER_ENABLE = yes # Encoder support diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/keyboard.json similarity index 94% rename from keyboards/recompile_keys/cocoa40/info.json rename to keyboards/recompile_keys/cocoa40/keyboard.json index 1051dfb673a..f964ff6621d 100644 --- a/keyboards/recompile_keys/cocoa40/info.json +++ b/keyboards/recompile_keys/cocoa40/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "matrix_pins": { "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/recompile_keys/cocoa40/rules.mk b/keyboards/recompile_keys/cocoa40/rules.mk deleted file mode 100644 index 7552bdafa65..00000000000 --- a/keyboards/recompile_keys/cocoa40/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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/7splus/info.json rename to keyboards/salicylic_acid3/7splus/keyboard.json index 4a3ed4cc90f..38ca750cd47 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEAE7", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"], "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/7splus/rules.mk b/keyboards/salicylic_acid3/7splus/rules.mk deleted file mode 100644 index a3deaf30b97..00000000000 --- a/keyboards/salicylic_acid3/7splus/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/ajisai74/info.json rename to keyboards/salicylic_acid3/ajisai74/keyboard.json index 7c8110c1552..b29c5bf178c 100644 --- a/keyboards/salicylic_acid3/ajisai74/info.json +++ b/keyboards/salicylic_acid3/ajisai74/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xEB54", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D3"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/ajisai74/rules.mk b/keyboards/salicylic_acid3/ajisai74/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/salicylic_acid3/ajisai74/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/ergoarrows/info.json rename to keyboards/salicylic_acid3/ergoarrows/keyboard.json index bc6a715f1d6..bb9956a2d07 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEA54", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/salicylic_acid3/ergoarrows/rules.mk b/keyboards/salicylic_acid3/ergoarrows/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/salicylic_acid3/ergoarrows/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 = 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/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/nknl7en/info.json rename to keyboards/salicylic_acid3/nknl7en/keyboard.json index b5ac551bc9c..4d6b494b9fb 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEA56", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/nknl7en/rules.mk b/keyboards/salicylic_acid3/nknl7en/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/salicylic_acid3/nknl7en/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 = 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/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/keyboard.json similarity index 96% rename from keyboards/salicylic_acid3/nknl7jp/info.json rename to keyboards/salicylic_acid3/nknl7jp/keyboard.json index 2501f84d9f9..0f260cdfdd7 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xEA55", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5", "D2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/salicylic_acid3/nknl7jp/rules.mk b/keyboards/salicylic_acid3/nknl7jp/rules.mk deleted file mode 100644 index 951dd07d6e0..00000000000 --- a/keyboards/salicylic_acid3/nknl7jp/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 = 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/scatter42/info.json b/keyboards/scatter42/keyboard.json similarity index 94% rename from keyboards/scatter42/info.json rename to keyboards/scatter42/keyboard.json index c0f8df47bee..7ccf9cb9fcf 100644 --- a/keyboards/scatter42/info.json +++ b/keyboards/scatter42/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x3B47", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/scatter42/rules.mk b/keyboards/scatter42/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/scatter42/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/keyboard.json similarity index 95% rename from keyboards/sparrow62/info.json rename to keyboards/sparrow62/keyboard.json index d7d0d8b84d6..e551bb48517 100644 --- a/keyboards/sparrow62/info.json +++ b/keyboards/sparrow62/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x7461", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/sparrow62/rules.mk b/keyboards/sparrow62/rules.mk deleted file mode 100644 index ab2c49da70e..00000000000 --- a/keyboards/sparrow62/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/keyboard.json similarity index 96% rename from keyboards/takashiski/otaku_split/rev0/info.json rename to keyboards/takashiski/otaku_split/rev0/keyboard.json index c65a429f69d..db577c22606 100644 --- a/keyboards/takashiski/otaku_split/rev0/info.json +++ b/keyboards/takashiski/otaku_split/rev0/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["B5", "B4", "E6", "D7", "C6"] diff --git a/keyboards/takashiski/otaku_split/rev0/rules.mk b/keyboards/takashiski/otaku_split/rev0/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/takashiski/otaku_split/rev0/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/keyboard.json similarity index 96% rename from keyboards/takashiski/otaku_split/rev1/info.json rename to keyboards/takashiski/otaku_split/rev1/keyboard.json index 251e2c36b90..0c83593eea6 100644 --- a/keyboards/takashiski/otaku_split/rev1/info.json +++ b/keyboards/takashiski/otaku_split/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/takashiski/otaku_split/rev1/rules.mk b/keyboards/takashiski/otaku_split/rev1/rules.mk deleted file mode 100644 index fce764c22d4..00000000000 --- a/keyboards/takashiski/otaku_split/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/keyboard.json similarity index 95% rename from keyboards/unikeyboard/diverge3/info.json rename to keyboards/unikeyboard/diverge3/keyboard.json index d85d76b785e..a6dd684be6d 100644 --- a/keyboards/unikeyboard/diverge3/info.json +++ b/keyboards/unikeyboard/diverge3/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x1257", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] diff --git a/keyboards/unikeyboard/diverge3/rules.mk b/keyboards/unikeyboard/diverge3/rules.mk deleted file mode 100644 index fd50645e4a1..00000000000 --- a/keyboards/unikeyboard/diverge3/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/keyboard.json similarity index 94% rename from keyboards/unikeyboard/divergetm2/info.json rename to keyboards/unikeyboard/divergetm2/keyboard.json index d68c4da94b5..3c1420c39ad 100644 --- a/keyboards/unikeyboard/divergetm2/info.json +++ b/keyboards/unikeyboard/divergetm2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1256", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/unikeyboard/divergetm2/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk deleted file mode 100644 index e39bab4422a..00000000000 --- a/keyboards/unikeyboard/divergetm2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/keyboard.json similarity index 99% rename from keyboards/viktus/sp_mini/info.json rename to keyboards/viktus/sp_mini/keyboard.json index c6309422411..25aa4c94942 100644 --- a/keyboards/viktus/sp_mini/info.json +++ b/keyboards/viktus/sp_mini/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x534D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null], "rows": ["F0", "B5", "B4", "D7", "D6"] diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk deleted file mode 100644 index e3c4a42def8..00000000000 --- a/keyboards/viktus/sp_mini/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes From 96025250d101d6819e81c989a0d46e3ee14a906b Mon Sep 17 00:00:00 2001 From: zvecr Date: Sat, 13 Apr 2024 08:49:31 +0100 Subject: [PATCH 06/23] Fix dailycraft/wings42/rev2 --- keyboards/dailycraft/wings42/rev2/keyboard.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/keyboards/dailycraft/wings42/rev2/keyboard.json b/keyboards/dailycraft/wings42/rev2/keyboard.json index dcb3a0268de..13f283d92b3 100644 --- a/keyboards/dailycraft/wings42/rev2/keyboard.json +++ b/keyboards/dailycraft/wings42/rev2/keyboard.json @@ -17,9 +17,6 @@ "enabled": true, "soft_serial_pin": "D2" }, - "features": { - "encoder": true - }, "encoder": { "rotary": [ { "pin_a": "B5", "pin_b": "B4" }, @@ -30,8 +27,9 @@ "bootloader": "caterina", "features": { "bootmagic": true, - "mousekey": true, - "extrakey": true + "encoder": true, + "extrakey": true, + "mousekey": true }, "layout_aliases": { "LAYOUT_split_3x6_3_2": "LAYOUT_split_3x6_3" From 9de523810309b7737c42bbcd3989ff431351d2d3 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 13 Apr 2024 16:16:06 -0700 Subject: [PATCH 07/23] Data-Driven Keyboard Conversions: E (#23512) --- keyboards/eco/info.json | 10 ---------- keyboards/eco/rev1/{info.json => keyboard.json} | 10 ++++++++++ keyboards/eco/rev1/rules.mk | 1 - keyboards/eco/rev2/{info.json => keyboard.json} | 10 ++++++++++ keyboards/eco/rev2/rules.mk | 1 - keyboards/edi/hardlight/mk2/info.json | 11 +++++++++++ keyboards/edi/hardlight/mk2/rules.mk | 16 ---------------- keyboards/edinburgh41/info.json | 8 ++++++++ keyboards/edinburgh41/rules.mk | 14 -------------- keyboards/efreet/info.json | 7 +++++++ keyboards/efreet/rules.mk | 13 ------------- .../elephant42/{info.json => keyboard.json} | 10 ++++++++++ keyboards/elephant42/rules.mk | 15 --------------- keyboards/emery65/info.json | 6 ++++++ keyboards/emery65/rules.mk | 13 ------------- .../era/linx3/n86/{info.json => keyboard.json} | 0 keyboards/era/linx3/n86/rules.mk | 1 - .../era/linx3/n8x/{info.json => keyboard.json} | 0 keyboards/era/linx3/n8x/rules.mk | 1 - keyboards/ergodox_ez/glow/info.json | 6 ------ keyboards/ergodox_ez/glow/keyboard.json | 13 +++++++++++++ keyboards/ergodox_ez/glow/rules.mk | 1 - keyboards/ergodox_ez/rules.mk | 13 ------------- keyboards/ergodox_ez/shine/info.json | 7 +++++++ keyboards/ergodox_ez/shine/rules.mk | 1 - keyboards/ergodox_stm32/info.json | 7 +++++++ keyboards/ergodox_stm32/rules.mk | 9 +-------- keyboards/ergoslab/rev1/keyboard.json | 7 +++++++ keyboards/ergoslab/rules.mk | 13 ------------- .../ergotravel/rev1/{info.json => keyboard.json} | 7 +++++++ keyboards/ergotravel/rev1/rules.mk | 1 - keyboards/ergotravel/rules.mk | 13 ------------- keyboards/ericrlau/numdiscipline/rev1/info.json | 5 +++++ keyboards/ericrlau/numdiscipline/rev1/rules.mk | 13 ------------- .../atom47/rev2/{info.json => keyboard.json} | 6 ++++++ keyboards/evyd13/atom47/rev2/rules.mk | 3 --- .../atom47/rev3/{info.json => keyboard.json} | 6 ++++++ keyboards/evyd13/atom47/rev3/rules.mk | 1 - .../atom47/rev4/{info.json => keyboard.json} | 6 ++++++ keyboards/evyd13/atom47/rev4/rules.mk | 4 ---- .../atom47/rev5/{info.json => keyboard.json} | 6 ++++++ keyboards/evyd13/atom47/rev5/rules.mk | 1 - keyboards/evyd13/atom47/rules.mk | 13 ------------- keyboards/evyd13/eon40/info.json | 8 ++++++++ keyboards/evyd13/eon40/rules.mk | 14 -------------- keyboards/evyd13/nt660/info.json | 5 +++++ keyboards/evyd13/nt660/rules.mk | 13 ------------- keyboards/evyd13/pockettype/info.json | 5 +++++ keyboards/evyd13/pockettype/rules.mk | 13 ------------- keyboards/evyd13/wasdat_code/info.json | 7 +++++++ keyboards/evyd13/wasdat_code/rules.mk | 13 ------------- keyboards/exclusive/e85/hotswap/keyboard.json | 11 +++++++++++ keyboards/exclusive/e85/rules.mk | 14 -------------- keyboards/exclusive/e85/soldered/keyboard.json | 11 +++++++++++ 54 files changed, 180 insertions(+), 243 deletions(-) rename keyboards/eco/rev1/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/eco/rev1/rules.mk rename keyboards/eco/rev2/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/eco/rev2/rules.mk rename keyboards/elephant42/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/elephant42/rules.mk rename keyboards/era/linx3/n86/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/linx3/n86/rules.mk rename keyboards/era/linx3/n8x/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/era/linx3/n8x/rules.mk delete mode 100644 keyboards/ergodox_ez/glow/info.json create mode 100644 keyboards/ergodox_ez/glow/keyboard.json delete mode 100644 keyboards/ergodox_ez/glow/rules.mk rename keyboards/ergotravel/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/ergotravel/rev1/rules.mk rename keyboards/evyd13/atom47/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/evyd13/atom47/rev2/rules.mk rename keyboards/evyd13/atom47/rev3/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/atom47/rev3/rules.mk rename keyboards/evyd13/atom47/rev4/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/evyd13/atom47/rev4/rules.mk rename keyboards/evyd13/atom47/rev5/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/evyd13/atom47/rev5/rules.mk diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json index 74c66fdcb91..6a1b2adda1b 100644 --- a/keyboards/eco/info.json +++ b/keyboards/eco/info.json @@ -3,16 +3,6 @@ "manufacturer": "Bishop Keyboards", "url": "", "maintainer": "qmk", - "features": { - "backlight": true, - "bootmagic": false, - "command": true, - "console": false, - "extrakey": true, - "midi": true, - "mousekey": false, - "nkro": false - }, "usb": { "vid": "0x1337", "pid": "0x6006" diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/keyboard.json similarity index 93% rename from keyboards/eco/rev1/info.json rename to keyboards/eco/rev1/keyboard.json index f2a7842ce40..1b3cb5f8dfb 100644 --- a/keyboards/eco/rev1/info.json +++ b/keyboards/eco/rev1/keyboard.json @@ -7,6 +7,16 @@ "rows": ["B1", "B6", "B2", "B3"] }, "diode_direction": "COL2ROW", + "features": { + "backlight": false, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/eco/rev1/rules.mk b/keyboards/eco/rev1/rules.mk deleted file mode 100644 index f845616741c..00000000000 --- a/keyboards/eco/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/keyboard.json similarity index 93% rename from keyboards/eco/rev2/info.json rename to keyboards/eco/rev2/keyboard.json index 8148e78f859..8effdd85e5b 100644 --- a/keyboards/eco/rev2/info.json +++ b/keyboards/eco/rev2/keyboard.json @@ -7,6 +7,16 @@ "rows": ["D7", "B5", "B4", "E6"] }, "diode_direction": "COL2ROW", + "features": { + "backlight": false, + "bootmagic": false, + "command": true, + "console": false, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/eco/rev2/rules.mk b/keyboards/eco/rev2/rules.mk deleted file mode 100644 index f845616741c..00000000000 --- a/keyboards/eco/rev2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json index 2be212702ac..cb337b71c89 100644 --- a/keyboards/edi/hardlight/mk2/info.json +++ b/keyboards/edi/hardlight/mk2/info.json @@ -32,6 +32,17 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "rgblight": true, + "velocikey": true, + "key_lock": true + }, "community_layouts": ["ortho_4x16"], "layouts": { "LAYOUT_ortho_4x16": { diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk index b7b67ba5b2b..0ab54aaaf71 100644 --- a/keyboards/edi/hardlight/mk2/rules.mk +++ b/keyboards/edi/hardlight/mk2/rules.mk @@ -1,18 +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 = 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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -VELOCIKEY_ENABLE = yes -KEY_LOCK_ENABLE = yes - diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json index 745710f92f3..374f10b2b77 100644 --- a/keyboards/edinburgh41/info.json +++ b/keyboards/edinburgh41/info.json @@ -4,6 +4,14 @@ "maintainer": "schwarzer-geiger", "bootloader": "atmel-dfu", "processor": "atmega32u4", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "pointing_device": true + }, "url": "https://github.com/schwarzer-geiger/Edinburgh41", "usb": { "device_version": "1.0.0", diff --git a/keyboards/edinburgh41/rules.mk b/keyboards/edinburgh41/rules.mk index bf33c793b6b..c76a8bf8a18 100644 --- a/keyboards/edinburgh41/rules.mk +++ b/keyboards/edinburgh41/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = analog_joystick diff --git a/keyboards/efreet/info.json b/keyboards/efreet/info.json index b7749ed3419..4a53df1294e 100644 --- a/keyboards/efreet/info.json +++ b/keyboards/efreet/info.json @@ -20,6 +20,13 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/efreet/rules.mk b/keyboards/efreet/rules.mk index f82a86f3e3a..09057bea54b 100644 --- a/keyboards/efreet/rules.mk +++ b/keyboards/efreet/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/keyboard.json similarity index 95% rename from keyboards/elephant42/info.json rename to keyboards/elephant42/keyboard.json index eb53fda96d8..e71f1438130 100644 --- a/keyboards/elephant42/info.json +++ b/keyboards/elephant42/keyboard.json @@ -54,6 +54,16 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "rgb_matrix": true, + "oled": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/elephant42/rules.mk b/keyboards/elephant42/rules.mk deleted file mode 100644 index 9091c741718..00000000000 --- a/keyboards/elephant42/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/emery65/info.json b/keyboards/emery65/info.json index 74d06b52ad6..c80bcf80425 100644 --- a/keyboards/emery65/info.json +++ b/keyboards/emery65/info.json @@ -19,6 +19,12 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" }, diff --git a/keyboards/emery65/rules.mk b/keyboards/emery65/rules.mk index 7c0709f41e6..0ab54aaaf71 100644 --- a/keyboards/emery65/rules.mk +++ b/keyboards/emery65/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/era/linx3/n86/info.json b/keyboards/era/linx3/n86/keyboard.json similarity index 100% rename from keyboards/era/linx3/n86/info.json rename to keyboards/era/linx3/n86/keyboard.json diff --git a/keyboards/era/linx3/n86/rules.mk b/keyboards/era/linx3/n86/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/era/linx3/n86/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/info.json b/keyboards/era/linx3/n8x/keyboard.json similarity index 100% rename from keyboards/era/linx3/n8x/info.json rename to keyboards/era/linx3/n8x/keyboard.json diff --git a/keyboards/era/linx3/n8x/rules.mk b/keyboards/era/linx3/n8x/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/era/linx3/n8x/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/ergodox_ez/glow/info.json b/keyboards/ergodox_ez/glow/info.json deleted file mode 100644 index dcbb1999ca9..00000000000 --- a/keyboards/ergodox_ez/glow/info.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "keyboard_name": "ErgoDox EZ Glow", - "usb": { - "pid": "0x4976" - } -} diff --git a/keyboards/ergodox_ez/glow/keyboard.json b/keyboards/ergodox_ez/glow/keyboard.json new file mode 100644 index 00000000000..43f0ee0b490 --- /dev/null +++ b/keyboards/ergodox_ez/glow/keyboard.json @@ -0,0 +1,13 @@ +{ + "keyboard_name": "ErgoDox EZ Glow", + "usb": { + "pid": "0x4976" + }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + } +} diff --git a/keyboards/ergodox_ez/glow/rules.mk b/keyboards/ergodox_ez/glow/rules.mk deleted file mode 100644 index aad92997d0f..00000000000 --- a/keyboards/ergodox_ez/glow/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk index 68f785f3cc0..187d9dd8e2e 100644 --- a/keyboards/ergodox_ez/rules.mk +++ b/keyboards/ergodox_ez/rules.mk @@ -3,20 +3,7 @@ # details), include the following define: # OPT_DEFS += -DLEFT_LEDS -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration CUSTOM_MATRIX = lite # Custom matrix file for the ErgoDox EZ -NKRO_ENABLE = yes # Enable N-Key Rollover -UNICODE_ENABLE = no # Unicode -SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard - -RGB_MATRIX_ENABLE = no # enable later # project specific files SRC += matrix.c diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/info.json index 181ac52e6ce..bc0f218d7ec 100644 --- a/keyboards/ergodox_ez/shine/info.json +++ b/keyboards/ergodox_ez/shine/info.json @@ -5,5 +5,12 @@ }, "rgblight": { "driver": "custom" + }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true } } diff --git a/keyboards/ergodox_ez/shine/rules.mk b/keyboards/ergodox_ez/shine/rules.mk index 4ab494d1aae..827f58bd6ae 100644 --- a/keyboards/ergodox_ez/shine/rules.mk +++ b/keyboards/ergodox_ez/shine/rules.mk @@ -1,3 +1,2 @@ -RGBLIGHT_ENABLE = yes WS2812_DRIVER_REQUIRED = yes SRC += rgblight_custom.c diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/info.json index 305adc9e125..24e90ad7d71 100644 --- a/keyboards/ergodox_stm32/info.json +++ b/keyboards/ergodox_stm32/info.json @@ -8,6 +8,13 @@ "pid": "0x1308", "device_version": "1.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "unicode": true + }, "layouts": { "LAYOUT_ergodox": { "layout": [ diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk index 5481eef1a2e..21b474509d6 100644 --- a/keyboards/ergodox_stm32/rules.mk +++ b/keyboards/ergodox_stm32/rules.mk @@ -6,14 +6,7 @@ BOARD = ST_NUCLEO64_F103RB # Bootloader selection BOOTLOADER = custom -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 -CUSTOM_MATRIX = yes # Custom matrix file -UNICODE_ENABLE = yes # Unicode +CUSTOM_MATRIX = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/ergoslab/rev1/keyboard.json b/keyboards/ergoslab/rev1/keyboard.json index 82e4b41b6df..ef40c1d960d 100644 --- a/keyboards/ergoslab/rev1/keyboard.json +++ b/keyboards/ergoslab/rev1/keyboard.json @@ -25,6 +25,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_ergoslab": "LAYOUT" }, diff --git a/keyboards/ergoslab/rules.mk b/keyboards/ergoslab/rules.mk index 5255b41b06f..8eb40c77d5a 100644 --- a/keyboards/ergoslab/rules.mk +++ b/keyboards/ergoslab/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = ergoslab/rev1 diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/keyboard.json similarity index 96% rename from keyboards/ergotravel/rev1/info.json rename to keyboards/ergotravel/rev1/keyboard.json index 43d3d01a925..14c645d2f0c 100644 --- a/keyboards/ergotravel/rev1/info.json +++ b/keyboards/ergotravel/rev1/keyboard.json @@ -25,6 +25,13 @@ }, "bootloader": "caterina", "processor": "atmega32u4", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ergotravel/rev1/rules.mk b/keyboards/ergotravel/rev1/rules.mk deleted file mode 100644 index 7b30c0beff2..00000000000 --- a/keyboards/ergotravel/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no diff --git a/keyboards/ergotravel/rules.mk b/keyboards/ergotravel/rules.mk index f52203f7059..3f30277bb56 100644 --- a/keyboards/ergotravel/rules.mk +++ b/keyboards/ergotravel/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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - DEFAULT_FOLDER = ergotravel/rev1 diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/info.json index 36a39c1abe2..6fd9c377f68 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/info.json +++ b/keyboards/ericrlau/numdiscipline/rev1/info.json @@ -16,6 +16,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ericrlau/numdiscipline/rev1/rules.mk b/keyboards/ericrlau/numdiscipline/rev1/rules.mk index 18550f0a64d..c2ee0bc86f9 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/rules.mk +++ b/keyboards/ericrlau/numdiscipline/rev1/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/keyboard.json similarity index 96% rename from keyboards/evyd13/atom47/rev2/info.json rename to keyboards/evyd13/atom47/rev2/keyboard.json index 8c5720d0c48..62927b70a36 100644 --- a/keyboards/evyd13/atom47/rev2/info.json +++ b/keyboards/evyd13/atom47/rev2/keyboard.json @@ -34,6 +34,12 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/atom47/rev2/rules.mk b/keyboards/evyd13/atom47/rev2/rules.mk deleted file mode 100644 index 104711e4206..00000000000 --- a/keyboards/evyd13/atom47/rev2/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# Build Options -RGBLIGHT_ENABLE = no -BACKLIGHT_ENABLE = yes diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/keyboard.json similarity index 98% rename from keyboards/evyd13/atom47/rev3/info.json rename to keyboards/evyd13/atom47/rev3/keyboard.json index fc4046d3fc3..009c3ef5345 100644 --- a/keyboards/evyd13/atom47/rev3/info.json +++ b/keyboards/evyd13/atom47/rev3/keyboard.json @@ -47,6 +47,12 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "backlight": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/atom47/rev3/rules.mk b/keyboards/evyd13/atom47/rev3/rules.mk deleted file mode 100644 index 54a2685bf63..00000000000 --- a/keyboards/evyd13/atom47/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/keyboard.json similarity index 97% rename from keyboards/evyd13/atom47/rev4/info.json rename to keyboards/evyd13/atom47/rev4/keyboard.json index b2b4bf9ef23..cea416e1a68 100644 --- a/keyboards/evyd13/atom47/rev4/info.json +++ b/keyboards/evyd13/atom47/rev4/keyboard.json @@ -29,6 +29,12 @@ }, "processor": "atmega32u2", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "encoder": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/atom47/rev4/rules.mk b/keyboards/evyd13/atom47/rev4/rules.mk deleted file mode 100644 index 1eb7c8bd08b..00000000000 --- a/keyboards/evyd13/atom47/rev4/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -ENCODER_ENABLE = yes -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no \ No newline at end of file diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/keyboard.json similarity index 97% rename from keyboards/evyd13/atom47/rev5/info.json rename to keyboards/evyd13/atom47/rev5/keyboard.json index e82a7797dee..c002dcb18c0 100644 --- a/keyboards/evyd13/atom47/rev5/info.json +++ b/keyboards/evyd13/atom47/rev5/keyboard.json @@ -49,6 +49,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_split_space" }, diff --git a/keyboards/evyd13/atom47/rev5/rules.mk b/keyboards/evyd13/atom47/rev5/rules.mk deleted file mode 100644 index aad92997d0f..00000000000 --- a/keyboards/evyd13/atom47/rev5/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/evyd13/atom47/rules.mk b/keyboards/evyd13/atom47/rules.mk index ab8264de7c2..9d5b7530777 100644 --- a/keyboards/evyd13/atom47/rules.mk +++ b/keyboards/evyd13/atom47/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = evyd13/atom47/rev4 diff --git a/keyboards/evyd13/eon40/info.json b/keyboards/evyd13/eon40/info.json index ce989e1d2a5..59511f117c0 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/info.json @@ -26,6 +26,14 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/eon40/rules.mk b/keyboards/evyd13/eon40/rules.mk index ece680a57a3..16051206467 100644 --- a/keyboards/evyd13/eon40/rules.mk +++ b/keyboards/evyd13/eon40/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/evyd13/nt660/info.json b/keyboards/evyd13/nt660/info.json index c222aba7005..ea51efaa300 100644 --- a/keyboards/evyd13/nt660/info.json +++ b/keyboards/evyd13/nt660/info.json @@ -23,6 +23,11 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "community_layouts": ["66_ansi", "66_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/evyd13/nt660/rules.mk b/keyboards/evyd13/nt660/rules.mk index f8c29ddc982..16051206467 100644 --- a/keyboards/evyd13/nt660/rules.mk +++ b/keyboards/evyd13/nt660/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/info.json index eda670af118..bcca3dc9364 100644 --- a/keyboards/evyd13/pockettype/info.json +++ b/keyboards/evyd13/pockettype/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/pockettype/rules.mk b/keyboards/evyd13/pockettype/rules.mk index f8c29ddc982..16051206467 100644 --- a/keyboards/evyd13/pockettype/rules.mk +++ b/keyboards/evyd13/pockettype/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json index 9fb14283ae9..8c1bb52b6bf 100644 --- a/keyboards/evyd13/wasdat_code/info.json +++ b/keyboards/evyd13/wasdat_code/info.json @@ -32,6 +32,13 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "backlight": true + }, "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"], "layout_aliases": { "LAYOUT_all": "LAYOUT_fullsize_iso" diff --git a/keyboards/evyd13/wasdat_code/rules.mk b/keyboards/evyd13/wasdat_code/rules.mk index 00967d18474..6beea3e392f 100644 --- a/keyboards/evyd13/wasdat_code/rules.mk +++ b/keyboards/evyd13/wasdat_code/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite VPATH += drivers/gpio SRC += matrix.c sn74x138.c diff --git a/keyboards/exclusive/e85/hotswap/keyboard.json b/keyboards/exclusive/e85/hotswap/keyboard.json index 779a717ec55..c64509496aa 100644 --- a/keyboards/exclusive/e85/hotswap/keyboard.json +++ b/keyboards/exclusive/e85/hotswap/keyboard.json @@ -41,6 +41,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_ansi_standard": { "layout": [ diff --git a/keyboards/exclusive/e85/rules.mk b/keyboards/exclusive/e85/rules.mk index 4251159d944..8eef46d0ab4 100644 --- a/keyboards/exclusive/e85/rules.mk +++ b/keyboards/exclusive/e85/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - DEFAULT_FOLDER = exclusive/e85/hotswap diff --git a/keyboards/exclusive/e85/soldered/keyboard.json b/keyboards/exclusive/e85/soldered/keyboard.json index d34440389a6..5f7458e851b 100644 --- a/keyboards/exclusive/e85/soldered/keyboard.json +++ b/keyboards/exclusive/e85/soldered/keyboard.json @@ -41,6 +41,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "rgblight": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_all": { "layout": [ From 1a831a01b7d2dd1f9746d3aac7280eedc0012f90 Mon Sep 17 00:00:00 2001 From: Logan Foster <44828794+Lrfoster03@users.noreply.github.com> Date: Sat, 13 Apr 2024 22:12:14 -0700 Subject: [PATCH 08/23] Adjusted Compensator on-state and keymaps (#23509) --- keyboards/compensator/info.json | 3 +-- keyboards/compensator/keymaps/default/keymap.c | 2 +- keyboards/compensator/keymaps/via/keymap.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/compensator/info.json b/keyboards/compensator/info.json index ceaa1763338..fbba0d750e8 100644 --- a/keyboards/compensator/info.json +++ b/keyboards/compensator/info.json @@ -28,8 +28,7 @@ "layer_count": 3 }, "indicators": { - "caps_lock": "E6", - "on_state": 0 + "caps_lock": "E6" }, "layouts": { "LAYOUT": { diff --git a/keyboards/compensator/keymaps/default/keymap.c b/keyboards/compensator/keymaps/default/keymap.c index 5e39c20e72f..0bdf18496a8 100644 --- a/keyboards/compensator/keymaps/default/keymap.c +++ b/keyboards/compensator/keymaps/default/keymap.c @@ -21,7 +21,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/ - KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2, + KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2, KC_F3, KC_F4, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_F3, KC_F4, KC_F5, KC_F6, KC_PENT, KC_P1, KC_P2, KC_P3, KC_NO, KC_UP, KC_NO, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_NO, KC_UP, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_F5, KC_F6, KC_F7, KC_F8, KC_PMNS, KC_PDOT, KC_P0, KC_P00, KC_LEFT, KC_DOWN, KC_RIGHT, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P00, KC_P0, KC_PDOT, KC_PMNS, KC_F7, KC_F8 diff --git a/keyboards/compensator/keymaps/via/keymap.c b/keyboards/compensator/keymaps/via/keymap.c index d9124a96aff..a7285b32577 100644 --- a/keyboards/compensator/keymaps/via/keymap.c +++ b/keyboards/compensator/keymaps/via/keymap.c @@ -21,7 +21,7 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/ - KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2, + KC_F1, KC_F2, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_F1, KC_F2, KC_F3, KC_F4, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_F3, KC_F4, KC_F5, KC_F6, KC_PENT, KC_P1, KC_P2, KC_P3, KC_NO, KC_UP, KC_NO, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_NO, KC_UP, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_F5, KC_F6, KC_F7, KC_F8, KC_PMNS, KC_PDOT, KC_P0, KC_P00, KC_LEFT, KC_DOWN, KC_RIGHT, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_P00, KC_P0, KC_PDOT, KC_PMNS, KC_F7, KC_F8 From 9baafef968ea4b1439ed9cb58479e66eec1f80d7 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Sun, 14 Apr 2024 09:00:19 -0400 Subject: [PATCH 09/23] Swap PID and VID on is0gr in QMK (#23458) --- keyboards/cannonkeys/is0gr/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json index 49aaaddd525..3f5e92a99c9 100644 --- a/keyboards/cannonkeys/is0gr/info.json +++ b/keyboards/cannonkeys/is0gr/info.json @@ -18,8 +18,8 @@ "url": "https://cannonkeys.com", "usb": { "device_version": "0.0.1", - "pid": "0x0028", - "vid": "0xCA04" + "pid": "0xCA04", + "vid": "0x0028" }, "community_layouts": ["ortho_1x1"], "layouts": { From 22b3cf4e9102aa6d746f9ac2b5ee5b529e884010 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 14 Apr 2024 18:28:15 +0100 Subject: [PATCH 10/23] Migrate build target markers to keyboard.json - DE (#23515) --- .../dasky/reverb/{info.json => keyboard.json} | 0 .../dc01/arrow/{info.json => keyboard.json} | 0 .../dc01/left/{info.json => keyboard.json} | 0 .../dc01/numpad/{info.json => keyboard.json} | 0 .../dc01/right/{info.json => keyboard.json} | 0 .../redherring/{info.json => keyboard.json} | 0 .../deng/thirty/{info.json => keyboard.json} | 0 .../dichotomy/{info.json => keyboard.json} | 0 .../plaid/{info.json => keyboard.json} | 0 .../tartan/{info.json => keyboard.json} | 0 .../kb16/rev1/{info.json => keyboard.json} | 0 .../kb16/rev2/{info.json => keyboard.json} | 0 .../doio/kb38/{info.json => keyboard.json} | 0 keyboards/dp60/{info.json => keyboard.json} | 0 keyboards/draytronics/scarlet/config.h | 37 ------------------ .../scarlet/{info.json => keyboard.json} | 6 +++ .../drop/alt/v2/{info.json => keyboard.json} | 0 .../drop/cstm65/{info.json => keyboard.json} | 0 .../drop/cstm80/{info.json => keyboard.json} | 0 .../drop/ctrl/v2/{info.json => keyboard.json} | 0 .../drop/sense75/{info.json => keyboard.json} | 0 .../shift/v2/{info.json => keyboard.json} | 0 .../v2/{info.json => keyboard.json} | 0 .../duck/jetfire/{info.json => keyboard.json} | 0 .../lightsaver/{info.json => keyboard.json} | 0 .../octagon/v1/{info.json => keyboard.json} | 0 .../octagon/v2/{info.json => keyboard.json} | 0 .../orion/v3/{info.json => keyboard.json} | 0 .../duck/tcv3/{info.json => keyboard.json} | 0 .../1861st/{info.json => keyboard.json} | 0 .../1967st/{info.json => keyboard.json} | 0 .../k310/base/{info.json => keyboard.json} | 0 .../dz60rgb/v2_1/{info.json => keyboard.json} | 0 .../v2_1/{info.json => keyboard.json} | 0 .../v2_1/{info.json => keyboard.json} | 0 .../dz65rgb/v3/{info.json => keyboard.json} | 0 keyboards/edi/hardlight/mk1/config.h | 28 ------------- keyboards/edi/hardlight/mk1/keyboard.json | 6 +++ keyboards/edi/hardlight/mk2/config.h | 5 --- .../mk2/{info.json => keyboard.json} | 6 +++ .../edinburgh41/{info.json => keyboard.json} | 0 keyboards/efreet/config.h | 39 ------------------- keyboards/efreet/{info.json => keyboard.json} | 6 +++ .../elcantorhs/{info.json => keyboard.json} | 0 .../emery65/{info.json => keyboard.json} | 0 .../shine/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 4 +- keyboards/ergodox_stm32/rules.mk | 6 +-- .../ericrlau/numdiscipline/rev1/config.h | 39 ------------------- .../rev1/{info.json => keyboard.json} | 6 +++ keyboards/evyd13/eon40/config.h | 38 ------------------ .../evyd13/eon40/{info.json => keyboard.json} | 6 +++ keyboards/evyd13/nt660/config.h | 39 ------------------- .../evyd13/nt660/{info.json => keyboard.json} | 6 +++ keyboards/evyd13/pockettype/config.h | 38 ------------------ .../pockettype/{info.json => keyboard.json} | 6 +++ .../wasdat/{info.json => keyboard.json} | 0 .../wasdat_code/{info.json => keyboard.json} | 0 .../teensy_32/{info.json => keyboard.json} | 0 .../teensy_lc/{info.json => keyboard.json} | 0 60 files changed, 52 insertions(+), 269 deletions(-) rename keyboards/dasky/reverb/{info.json => keyboard.json} (100%) rename keyboards/dc01/arrow/{info.json => keyboard.json} (100%) rename keyboards/dc01/left/{info.json => keyboard.json} (100%) rename keyboards/dc01/numpad/{info.json => keyboard.json} (100%) rename keyboards/dc01/right/{info.json => keyboard.json} (100%) rename keyboards/dcpedit/redherring/{info.json => keyboard.json} (100%) rename keyboards/deng/thirty/{info.json => keyboard.json} (100%) rename keyboards/dichotomy/{info.json => keyboard.json} (100%) rename keyboards/dm9records/plaid/{info.json => keyboard.json} (100%) rename keyboards/dm9records/tartan/{info.json => keyboard.json} (100%) rename keyboards/doio/kb16/rev1/{info.json => keyboard.json} (100%) rename keyboards/doio/kb16/rev2/{info.json => keyboard.json} (100%) rename keyboards/doio/kb38/{info.json => keyboard.json} (100%) rename keyboards/dp60/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/draytronics/scarlet/config.h rename keyboards/draytronics/scarlet/{info.json => keyboard.json} (93%) rename keyboards/drop/alt/v2/{info.json => keyboard.json} (100%) rename keyboards/drop/cstm65/{info.json => keyboard.json} (100%) rename keyboards/drop/cstm80/{info.json => keyboard.json} (100%) rename keyboards/drop/ctrl/v2/{info.json => keyboard.json} (100%) rename keyboards/drop/sense75/{info.json => keyboard.json} (100%) rename keyboards/drop/shift/v2/{info.json => keyboard.json} (100%) rename keyboards/duck/eagle_viper/v2/{info.json => keyboard.json} (100%) rename keyboards/duck/jetfire/{info.json => keyboard.json} (100%) rename keyboards/duck/lightsaver/{info.json => keyboard.json} (100%) rename keyboards/duck/octagon/v1/{info.json => keyboard.json} (100%) rename keyboards/duck/octagon/v2/{info.json => keyboard.json} (100%) rename keyboards/duck/orion/v3/{info.json => keyboard.json} (100%) rename keyboards/duck/tcv3/{info.json => keyboard.json} (100%) rename keyboards/ducky/one2mini/1861st/{info.json => keyboard.json} (100%) rename keyboards/ducky/one2sf/1967st/{info.json => keyboard.json} (100%) rename keyboards/durgod/k310/base/{info.json => keyboard.json} (100%) rename keyboards/dztech/dz60rgb/v2_1/{info.json => keyboard.json} (100%) rename keyboards/dztech/dz60rgb_ansi/v2_1/{info.json => keyboard.json} (100%) rename keyboards/dztech/dz60rgb_wkl/v2_1/{info.json => keyboard.json} (100%) rename keyboards/dztech/dz65rgb/v3/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/edi/hardlight/mk1/config.h rename keyboards/edi/hardlight/mk2/{info.json => keyboard.json} (97%) rename keyboards/edinburgh41/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/efreet/config.h rename keyboards/efreet/{info.json => keyboard.json} (98%) rename keyboards/elcantorhs/{info.json => keyboard.json} (100%) rename keyboards/emery65/{info.json => keyboard.json} (100%) rename keyboards/ergodox_ez/shine/{info.json => keyboard.json} (100%) rename keyboards/ergodox_stm32/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ericrlau/numdiscipline/rev1/config.h rename keyboards/ericrlau/numdiscipline/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/eon40/config.h rename keyboards/evyd13/eon40/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/evyd13/nt660/config.h rename keyboards/evyd13/nt660/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/evyd13/pockettype/config.h rename keyboards/evyd13/pockettype/{info.json => keyboard.json} (97%) rename keyboards/evyd13/wasdat/{info.json => keyboard.json} (100%) rename keyboards/evyd13/wasdat_code/{info.json => keyboard.json} (100%) rename keyboards/ez_maker/directpins/teensy_32/{info.json => keyboard.json} (100%) rename keyboards/ez_maker/directpins/teensy_lc/{info.json => keyboard.json} (100%) diff --git a/keyboards/dasky/reverb/info.json b/keyboards/dasky/reverb/keyboard.json similarity index 100% rename from keyboards/dasky/reverb/info.json rename to keyboards/dasky/reverb/keyboard.json diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/keyboard.json similarity index 100% rename from keyboards/dc01/arrow/info.json rename to keyboards/dc01/arrow/keyboard.json diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/keyboard.json similarity index 100% rename from keyboards/dc01/left/info.json rename to keyboards/dc01/left/keyboard.json diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/keyboard.json similarity index 100% rename from keyboards/dc01/numpad/info.json rename to keyboards/dc01/numpad/keyboard.json diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/keyboard.json similarity index 100% rename from keyboards/dc01/right/info.json rename to keyboards/dc01/right/keyboard.json diff --git a/keyboards/dcpedit/redherring/info.json b/keyboards/dcpedit/redherring/keyboard.json similarity index 100% rename from keyboards/dcpedit/redherring/info.json rename to keyboards/dcpedit/redherring/keyboard.json diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/keyboard.json similarity index 100% rename from keyboards/deng/thirty/info.json rename to keyboards/deng/thirty/keyboard.json diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/keyboard.json similarity index 100% rename from keyboards/dichotomy/info.json rename to keyboards/dichotomy/keyboard.json diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/keyboard.json similarity index 100% rename from keyboards/dm9records/plaid/info.json rename to keyboards/dm9records/plaid/keyboard.json diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/keyboard.json similarity index 100% rename from keyboards/dm9records/tartan/info.json rename to keyboards/dm9records/tartan/keyboard.json diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/keyboard.json similarity index 100% rename from keyboards/doio/kb16/rev1/info.json rename to keyboards/doio/kb16/rev1/keyboard.json diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/keyboard.json similarity index 100% rename from keyboards/doio/kb16/rev2/info.json rename to keyboards/doio/kb16/rev2/keyboard.json diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/keyboard.json similarity index 100% rename from keyboards/doio/kb38/info.json rename to keyboards/doio/kb38/keyboard.json diff --git a/keyboards/dp60/info.json b/keyboards/dp60/keyboard.json similarity index 100% rename from keyboards/dp60/info.json rename to keyboards/dp60/keyboard.json diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h deleted file mode 100644 index 4ae200c6a66..00000000000 --- a/keyboards/draytronics/scarlet/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/*Copyright 2020 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -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/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/keyboard.json similarity index 93% rename from keyboards/draytronics/scarlet/info.json rename to keyboards/draytronics/scarlet/keyboard.json index b70c7bfae65..0eabd378da2 100644 --- a/keyboards/draytronics/scarlet/info.json +++ b/keyboards/draytronics/scarlet/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { diff --git a/keyboards/drop/alt/v2/info.json b/keyboards/drop/alt/v2/keyboard.json similarity index 100% rename from keyboards/drop/alt/v2/info.json rename to keyboards/drop/alt/v2/keyboard.json diff --git a/keyboards/drop/cstm65/info.json b/keyboards/drop/cstm65/keyboard.json similarity index 100% rename from keyboards/drop/cstm65/info.json rename to keyboards/drop/cstm65/keyboard.json diff --git a/keyboards/drop/cstm80/info.json b/keyboards/drop/cstm80/keyboard.json similarity index 100% rename from keyboards/drop/cstm80/info.json rename to keyboards/drop/cstm80/keyboard.json diff --git a/keyboards/drop/ctrl/v2/info.json b/keyboards/drop/ctrl/v2/keyboard.json similarity index 100% rename from keyboards/drop/ctrl/v2/info.json rename to keyboards/drop/ctrl/v2/keyboard.json diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/keyboard.json similarity index 100% rename from keyboards/drop/sense75/info.json rename to keyboards/drop/sense75/keyboard.json diff --git a/keyboards/drop/shift/v2/info.json b/keyboards/drop/shift/v2/keyboard.json similarity index 100% rename from keyboards/drop/shift/v2/info.json rename to keyboards/drop/shift/v2/keyboard.json diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/keyboard.json similarity index 100% rename from keyboards/duck/eagle_viper/v2/info.json rename to keyboards/duck/eagle_viper/v2/keyboard.json diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/keyboard.json similarity index 100% rename from keyboards/duck/jetfire/info.json rename to keyboards/duck/jetfire/keyboard.json diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/keyboard.json similarity index 100% rename from keyboards/duck/lightsaver/info.json rename to keyboards/duck/lightsaver/keyboard.json diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/keyboard.json similarity index 100% rename from keyboards/duck/octagon/v1/info.json rename to keyboards/duck/octagon/v1/keyboard.json diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/keyboard.json similarity index 100% rename from keyboards/duck/octagon/v2/info.json rename to keyboards/duck/octagon/v2/keyboard.json diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/keyboard.json similarity index 100% rename from keyboards/duck/orion/v3/info.json rename to keyboards/duck/orion/v3/keyboard.json diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/keyboard.json similarity index 100% rename from keyboards/duck/tcv3/info.json rename to keyboards/duck/tcv3/keyboard.json diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/keyboard.json similarity index 100% rename from keyboards/ducky/one2mini/1861st/info.json rename to keyboards/ducky/one2mini/1861st/keyboard.json diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/keyboard.json similarity index 100% rename from keyboards/ducky/one2sf/1967st/info.json rename to keyboards/ducky/one2sf/1967st/keyboard.json diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/keyboard.json similarity index 100% rename from keyboards/durgod/k310/base/info.json rename to keyboards/durgod/k310/base/keyboard.json diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/keyboard.json similarity index 100% rename from keyboards/dztech/dz60rgb/v2_1/info.json rename to keyboards/dztech/dz60rgb/v2_1/keyboard.json diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json similarity index 100% rename from keyboards/dztech/dz60rgb_ansi/v2_1/info.json rename to keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json similarity index 100% rename from keyboards/dztech/dz60rgb_wkl/v2_1/info.json rename to keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/keyboard.json similarity index 100% rename from keyboards/dztech/dz65rgb/v3/info.json rename to keyboards/dztech/dz65rgb/v3/keyboard.json diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h deleted file mode 100644 index 89b008296bc..00000000000 --- a/keyboards/edi/hardlight/mk1/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -©2021 Everywhere Defense Industries / Fate Everywhere - -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 3 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 - -/* - * Enable Audio Subsystem with two voices - */ -// #define AUDIO_PIN C6 diff --git a/keyboards/edi/hardlight/mk1/keyboard.json b/keyboards/edi/hardlight/mk1/keyboard.json index 7f33c262278..3cb07cb2f18 100644 --- a/keyboards/edi/hardlight/mk1/keyboard.json +++ b/keyboards/edi/hardlight/mk1/keyboard.json @@ -16,6 +16,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"], "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"] diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h index 52636c6484e..bd604db6846 100644 --- a/keyboards/edi/hardlight/mk2/config.h +++ b/keyboards/edi/hardlight/mk2/config.h @@ -17,11 +17,6 @@ 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 - #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5 /* PWM RGB Underglow Defines */ diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/keyboard.json similarity index 97% rename from keyboards/edi/hardlight/mk2/info.json rename to keyboards/edi/hardlight/mk2/keyboard.json index cb337b71c89..a1f47aabf5a 100644 --- a/keyboards/edi/hardlight/mk2/info.json +++ b/keyboards/edi/hardlight/mk2/keyboard.json @@ -43,6 +43,12 @@ "velocikey": true, "key_lock": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x16"], "layouts": { "LAYOUT_ortho_4x16": { diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/keyboard.json similarity index 100% rename from keyboards/edinburgh41/info.json rename to keyboards/edinburgh41/keyboard.json diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h deleted file mode 100644 index 46a265902c4..00000000000 --- a/keyboards/efreet/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Amber Holly - -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/efreet/info.json b/keyboards/efreet/keyboard.json similarity index 98% rename from keyboards/efreet/info.json rename to keyboards/efreet/keyboard.json index 4a53df1294e..7dac78cc397 100644 --- a/keyboards/efreet/info.json +++ b/keyboards/efreet/keyboard.json @@ -27,6 +27,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_planck_mit": { diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/keyboard.json similarity index 100% rename from keyboards/elcantorhs/info.json rename to keyboards/elcantorhs/keyboard.json diff --git a/keyboards/emery65/info.json b/keyboards/emery65/keyboard.json similarity index 100% rename from keyboards/emery65/info.json rename to keyboards/emery65/keyboard.json diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/keyboard.json similarity index 100% rename from keyboards/ergodox_ez/shine/info.json rename to keyboards/ergodox_ez/shine/keyboard.json diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/keyboard.json similarity index 99% rename from keyboards/ergodox_stm32/info.json rename to keyboards/ergodox_stm32/keyboard.json index 24e90ad7d71..9315a3971f5 100644 --- a/keyboards/ergodox_stm32/info.json +++ b/keyboards/ergodox_stm32/keyboard.json @@ -15,7 +15,9 @@ "nkro": true, "unicode": true }, -"layouts": { + "processor": "STM32F103", + "bootloader": "custom", + "layouts": { "LAYOUT_ergodox": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5}, diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk index 21b474509d6..a4e9df8c6a9 100644 --- a/keyboards/ergodox_stm32/rules.mk +++ b/keyboards/ergodox_stm32/rules.mk @@ -1,11 +1,7 @@ -# MCU name -MCU = STM32F103 +# custom bootloader MCU_LDSCRIPT = stm32f103_bootloader BOARD = ST_NUCLEO64_F103RB -# Bootloader selection -BOOTLOADER = custom - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h deleted file mode 100644 index 055e8afe380..00000000000 --- a/keyboards/ericrlau/numdiscipline/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Eric Lau - -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/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json similarity index 99% rename from keyboards/ericrlau/numdiscipline/rev1/info.json rename to keyboards/ericrlau/numdiscipline/rev1/keyboard.json index 6fd9c377f68..5e9f3937324 100644 --- a/keyboards/ericrlau/numdiscipline/rev1/info.json +++ b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json @@ -21,6 +21,12 @@ "mousekey": true, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/eon40/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/eon40/info.json b/keyboards/evyd13/eon40/keyboard.json similarity index 98% rename from keyboards/evyd13/eon40/info.json rename to keyboards/evyd13/eon40/keyboard.json index 59511f117c0..e957b109ff2 100644 --- a/keyboards/evyd13/eon40/info.json +++ b/keyboards/evyd13/eon40/keyboard.json @@ -34,6 +34,12 @@ "command": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h deleted file mode 100644 index f64827d05f1..00000000000 --- a/keyboards/evyd13/nt660/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Evy Dekkers - -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/evyd13/nt660/info.json b/keyboards/evyd13/nt660/keyboard.json similarity index 99% rename from keyboards/evyd13/nt660/info.json rename to keyboards/evyd13/nt660/keyboard.json index ea51efaa300..142e9f2920d 100644 --- a/keyboards/evyd13/nt660/info.json +++ b/keyboards/evyd13/nt660/keyboard.json @@ -28,6 +28,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["66_ansi", "66_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h deleted file mode 100644 index 230ff5e311e..00000000000 --- a/keyboards/evyd13/pockettype/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Evy Dekkers - * - * 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/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/keyboard.json similarity index 97% rename from keyboards/evyd13/pockettype/info.json rename to keyboards/evyd13/pockettype/keyboard.json index bcca3dc9364..358e89020a6 100644 --- a/keyboards/evyd13/pockettype/info.json +++ b/keyboards/evyd13/pockettype/keyboard.json @@ -20,6 +20,12 @@ "mousekey": false, "extrakey": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/keyboard.json similarity index 100% rename from keyboards/evyd13/wasdat/info.json rename to keyboards/evyd13/wasdat/keyboard.json diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/keyboard.json similarity index 100% rename from keyboards/evyd13/wasdat_code/info.json rename to keyboards/evyd13/wasdat_code/keyboard.json diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/keyboard.json similarity index 100% rename from keyboards/ez_maker/directpins/teensy_32/info.json rename to keyboards/ez_maker/directpins/teensy_32/keyboard.json diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/keyboard.json similarity index 100% rename from keyboards/ez_maker/directpins/teensy_lc/info.json rename to keyboards/ez_maker/directpins/teensy_lc/keyboard.json From bc8ff28a5841c8b12261bf7e085aaa67757ec5a2 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 14 Apr 2024 10:31:26 -0700 Subject: [PATCH 11/23] Data-Driven Keyboard Conversions: F (#23516) --- keyboards/fallacy/info.json | 8 ++++++++ keyboards/fallacy/rules.mk | 13 ------------- keyboards/fc660c/info.json | 8 ++++++++ keyboards/fc660c/rules.mk | 10 ---------- keyboards/fc980c/info.json | 8 ++++++++ keyboards/fc980c/rules.mk | 10 ---------- .../blue_team_pad/{info.json => keyboard.json} | 3 ++- keyboards/fearherbs1/blue_team_pad/rules.mk | 1 - keyboards/ferris/0_1/info.json | 12 +++++++++++- keyboards/ferris/0_1/rules.mk | 15 --------------- keyboards/ferris/0_2/bling/info.json | 3 +++ keyboards/ferris/0_2/bling/rules.mk | 1 - keyboards/ferris/0_2/info.json | 9 ++++++++- keyboards/ferris/0_2/rules.mk | 15 --------------- keyboards/fjlabs/7vhotswap/info.json | 8 ++++++++ keyboards/fjlabs/7vhotswap/rules.mk | 13 ------------- keyboards/fjlabs/ad65/info.json | 7 +++++++ keyboards/fjlabs/ad65/rules.mk | 13 ------------- keyboards/fjlabs/avalon/info.json | 8 ++++++++ keyboards/fjlabs/avalon/rules.mk | 13 ------------- keyboards/fjlabs/bks65/info.json | 8 ++++++++ keyboards/fjlabs/bks65/rules.mk | 13 ------------- keyboards/fjlabs/bks65solder/info.json | 8 ++++++++ keyboards/fjlabs/bks65solder/rules.mk | 13 ------------- keyboards/fjlabs/bolsa65/info.json | 7 +++++++ keyboards/fjlabs/bolsa65/rules.mk | 13 ------------- keyboards/fjlabs/kf87/info.json | 8 ++++++++ keyboards/fjlabs/kf87/rules.mk | 13 ------------- keyboards/fjlabs/kyuu/info.json | 8 ++++++++ keyboards/fjlabs/kyuu/rules.mk | 12 ------------ keyboards/fjlabs/ldk65/info.json | 7 +++++++ keyboards/fjlabs/ldk65/rules.mk | 13 ------------- keyboards/fjlabs/midway60/info.json | 7 +++++++ keyboards/fjlabs/midway60/rules.mk | 13 ------------- keyboards/fjlabs/mk61rgbansi/info.json | 8 ++++++++ keyboards/fjlabs/mk61rgbansi/rules.mk | 13 ------------- keyboards/fjlabs/peaker/info.json | 7 +++++++ keyboards/fjlabs/peaker/rules.mk | 13 ------------- keyboards/fjlabs/polaris/info.json | 7 +++++++ keyboards/fjlabs/polaris/rules.mk | 13 ------------- keyboards/fjlabs/ready100/info.json | 8 ++++++++ keyboards/fjlabs/ready100/rules.mk | 13 ------------- keyboards/fjlabs/sinanju/info.json | 7 +++++++ keyboards/fjlabs/sinanju/rules.mk | 13 ------------- keyboards/fjlabs/sinanjuwk/info.json | 7 +++++++ keyboards/fjlabs/sinanjuwk/rules.mk | 13 ------------- keyboards/fjlabs/solanis/info.json | 8 ++++++++ keyboards/fjlabs/solanis/rules.mk | 13 ------------- keyboards/fjlabs/swordfish/info.json | 8 ++++++++ keyboards/fjlabs/swordfish/rules.mk | 13 ------------- keyboards/fjlabs/tf60ansi/info.json | 8 ++++++++ keyboards/fjlabs/tf60ansi/rules.mk | 13 ------------- keyboards/fjlabs/tf60v2/info.json | 8 ++++++++ keyboards/fjlabs/tf60v2/rules.mk | 13 ------------- keyboards/fjlabs/tf65rgbv2/info.json | 8 ++++++++ keyboards/fjlabs/tf65rgbv2/rules.mk | 13 ------------- keyboards/fluorite/{info.json => keyboard.json} | 5 +++++ keyboards/fluorite/rules.mk | 12 ------------ keyboards/fortitude60/rev1/keyboard.json | 5 +++++ keyboards/fortitude60/rules.mk | 13 ------------- keyboards/fractal/info.json | 6 ++++++ keyboards/fractal/rules.mk | 12 ------------ keyboards/frobiac/blackbowl/info.json | 4 +++- keyboards/frobiac/blackbowl/rules.mk | 2 -- .../walnut/{info.json => keyboard.json} | 3 ++- keyboards/frooastboard/walnut/rules.mk | 4 ---- 66 files changed, 229 insertions(+), 385 deletions(-) rename keyboards/fearherbs1/blue_team_pad/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/fearherbs1/blue_team_pad/rules.mk rename keyboards/fluorite/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/fluorite/rules.mk rename keyboards/frooastboard/walnut/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/frooastboard/walnut/rules.mk diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json index 9489463a4cd..fbeca239d9f 100644 --- a/keyboards/fallacy/info.json +++ b/keyboards/fallacy/info.json @@ -32,6 +32,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["alice", "alice_split_bs"], "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs", diff --git a/keyboards/fallacy/rules.mk b/keyboards/fallacy/rules.mk index ee1a36c9108..4b016ac9ad5 100755 --- a/keyboards/fallacy/rules.mk +++ b/keyboards/fallacy/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 - # project specific files SRC += indicators.c \ drivers/led/issi/is31fl3731-mono.c diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json index e65ed35dae7..6c573fef88b 100644 --- a/keyboards/fc660c/info.json +++ b/keyboards/fc660c/info.json @@ -17,6 +17,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/fc660c/rules.mk b/keyboards/fc660c/rules.mk index 03a674d668c..46c4fa1efe4 100644 --- a/keyboards/fc660c/rules.mk +++ b/keyboards/fc660c/rules.mk @@ -1,13 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover - # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json index 5060885c695..9944dd3899d 100644 --- a/keyboards/fc980c/info.json +++ b/keyboards/fc980c/info.json @@ -18,6 +18,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT": { diff --git a/keyboards/fc980c/rules.mk b/keyboards/fc980c/rules.mk index 03a674d668c..46c4fa1efe4 100644 --- a/keyboards/fc980c/rules.mk +++ b/keyboards/fc980c/rules.mk @@ -1,13 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover - # Optimize size but this may cause error "relocation truncated to fit" #EXTRALDFLAGS = -Wl,--relax diff --git a/keyboards/fearherbs1/blue_team_pad/info.json b/keyboards/fearherbs1/blue_team_pad/keyboard.json similarity index 97% rename from keyboards/fearherbs1/blue_team_pad/info.json rename to keyboards/fearherbs1/blue_team_pad/keyboard.json index 3a06f9c0660..b47b049b45e 100644 --- a/keyboards/fearherbs1/blue_team_pad/info.json +++ b/keyboards/fearherbs1/blue_team_pad/keyboard.json @@ -17,7 +17,8 @@ "extrakey": true, "console": true, "command": false, - "nkro": true + "nkro": true, + "oled": true }, "diode_direction": "COL2ROW", "matrix_pins": { diff --git a/keyboards/fearherbs1/blue_team_pad/rules.mk b/keyboards/fearherbs1/blue_team_pad/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/fearherbs1/blue_team_pad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json index 5a65369f61c..a7f7c08bec1 100644 --- a/keyboards/ferris/0_1/info.json +++ b/keyboards/ferris/0_1/info.json @@ -4,10 +4,20 @@ "usb": { "vid": "0xC2AB", "pid": "0x0000", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "unicode": true + }, + "build": { + "lto": true + }, "community_layouts": ["split_3x5_2"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_2" diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk index f971aa9a48b..c04c3c92ed3 100644 --- a/keyboards/ferris/0_1/rules.mk +++ b/keyboards/ferris/0_1/rules.mk @@ -1,19 +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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite -NO_USB_STARTUP_CHECK = yes -LTO_ENABLE = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json index 06a826450b4..22ef500d6da 100644 --- a/keyboards/ferris/0_2/bling/info.json +++ b/keyboards/ferris/0_2/bling/info.json @@ -50,5 +50,8 @@ "solid_multisplash": true }, "driver": "is31fl3731" + }, + "features": { + "rgb_matrix": true } } diff --git a/keyboards/ferris/0_2/bling/rules.mk b/keyboards/ferris/0_2/bling/rules.mk index aad92997d0f..e69de29bb2d 100644 --- a/keyboards/ferris/0_2/bling/rules.mk +++ b/keyboards/ferris/0_2/bling/rules.mk @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json index c6584ecf01a..d1108b51c49 100644 --- a/keyboards/ferris/0_2/info.json +++ b/keyboards/ferris/0_2/info.json @@ -2,10 +2,17 @@ "manufacturer": "Cuddly Keyboards Ltd.", "usb": { "vid": "0xC2AB", - "device_version": "0.0.2" + "device_version": "0.0.2", + "no_startup_check": true }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "unicode": true + }, "community_layouts": ["split_3x5_2"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x5_2" diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk index 6f67e3dece3..11b9d33a699 100644 --- a/keyboards/ferris/0_2/rules.mk +++ b/keyboards/ferris/0_2/rules.mk @@ -1,19 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite -NO_USB_STARTUP_CHECK = yes -LTO_ENABLE = no SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json index 8244960e45a..220cf28831f 100644 --- a/keyboards/fjlabs/7vhotswap/info.json +++ b/keyboards/fjlabs/7vhotswap/info.json @@ -33,6 +33,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_75_all": { "layout": [ diff --git a/keyboards/fjlabs/7vhotswap/rules.mk b/keyboards/fjlabs/7vhotswap/rules.mk index 8bb5a64bff4..3437a35bdf1 100644 --- a/keyboards/fjlabs/7vhotswap/rules.mk +++ b/keyboards/fjlabs/7vhotswap/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/ad65/info.json b/keyboards/fjlabs/ad65/info.json index 041d8a1d2fe..19adad79325 100644 --- a/keyboards/fjlabs/ad65/info.json +++ b/keyboards/fjlabs/ad65/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/fjlabs/ad65/rules.mk b/keyboards/fjlabs/ad65/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/ad65/rules.mk +++ b/keyboards/fjlabs/ad65/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/avalon/info.json b/keyboards/fjlabs/avalon/info.json index 77b5fbe9566..2407c3ec26b 100644 --- a/keyboards/fjlabs/avalon/info.json +++ b/keyboards/fjlabs/avalon/info.json @@ -41,6 +41,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/fjlabs/avalon/rules.mk b/keyboards/fjlabs/avalon/rules.mk index dca4b0aabb4..3437a35bdf1 100644 --- a/keyboards/fjlabs/avalon/rules.mk +++ b/keyboards/fjlabs/avalon/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/bks65/info.json b/keyboards/fjlabs/bks65/info.json index 5e0d9d5fb9b..5be09bfe0d0 100644 --- a/keyboards/fjlabs/bks65/info.json +++ b/keyboards/fjlabs/bks65/info.json @@ -36,6 +36,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/bks65/rules.mk b/keyboards/fjlabs/bks65/rules.mk index dca4b0aabb4..3437a35bdf1 100644 --- a/keyboards/fjlabs/bks65/rules.mk +++ b/keyboards/fjlabs/bks65/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/bks65solder/info.json b/keyboards/fjlabs/bks65solder/info.json index dae926d08c9..609dc4cdbc0 100644 --- a/keyboards/fjlabs/bks65solder/info.json +++ b/keyboards/fjlabs/bks65solder/info.json @@ -33,6 +33,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/fjlabs/bks65solder/rules.mk b/keyboards/fjlabs/bks65solder/rules.mk index dca4b0aabb4..3437a35bdf1 100644 --- a/keyboards/fjlabs/bks65solder/rules.mk +++ b/keyboards/fjlabs/bks65solder/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/bolsa65/info.json b/keyboards/fjlabs/bolsa65/info.json index 2f53b237d24..9deb09fef29 100644 --- a/keyboards/fjlabs/bolsa65/info.json +++ b/keyboards/fjlabs/bolsa65/info.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { diff --git a/keyboards/fjlabs/bolsa65/rules.mk b/keyboards/fjlabs/bolsa65/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/bolsa65/rules.mk +++ b/keyboards/fjlabs/bolsa65/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/kf87/info.json b/keyboards/fjlabs/kf87/info.json index cd2f6a7ac2f..e4f48acc8ec 100644 --- a/keyboards/fjlabs/kf87/info.json +++ b/keyboards/fjlabs/kf87/info.json @@ -38,6 +38,14 @@ }, "processor": "at90usb646", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/fjlabs/kf87/rules.mk b/keyboards/fjlabs/kf87/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/kf87/rules.mk +++ b/keyboards/fjlabs/kf87/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json index ed02d7d3b42..a16e2835cf2 100644 --- a/keyboards/fjlabs/kyuu/info.json +++ b/keyboards/fjlabs/kyuu/info.json @@ -37,6 +37,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_65_ansi_blocker_badge": { "layout": [ diff --git a/keyboards/fjlabs/kyuu/rules.mk b/keyboards/fjlabs/kyuu/rules.mk index a140b3b2525..3437a35bdf1 100644 --- a/keyboards/fjlabs/kyuu/rules.mk +++ b/keyboards/fjlabs/kyuu/rules.mk @@ -1,14 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 \ No newline at end of file diff --git a/keyboards/fjlabs/ldk65/info.json b/keyboards/fjlabs/ldk65/info.json index e8616b291be..a9d997c67e0 100644 --- a/keyboards/fjlabs/ldk65/info.json +++ b/keyboards/fjlabs/ldk65/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/ldk65/rules.mk b/keyboards/fjlabs/ldk65/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/ldk65/rules.mk +++ b/keyboards/fjlabs/ldk65/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/midway60/info.json b/keyboards/fjlabs/midway60/info.json index db91dbb021c..0f5b1e13bca 100644 --- a/keyboards/fjlabs/midway60/info.json +++ b/keyboards/fjlabs/midway60/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": [ "60_ansi", "60_ansi_split_bs_rshift", diff --git a/keyboards/fjlabs/midway60/rules.mk b/keyboards/fjlabs/midway60/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/midway60/rules.mk +++ b/keyboards/fjlabs/midway60/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json index 8c42aa97b64..de26f98ebe6 100644 --- a/keyboards/fjlabs/mk61rgbansi/info.json +++ b/keyboards/fjlabs/mk61rgbansi/info.json @@ -38,6 +38,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/fjlabs/mk61rgbansi/rules.mk b/keyboards/fjlabs/mk61rgbansi/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/mk61rgbansi/rules.mk +++ b/keyboards/fjlabs/mk61rgbansi/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/peaker/info.json b/keyboards/fjlabs/peaker/info.json index 2d9e806101e..73f4f754c31 100644 --- a/keyboards/fjlabs/peaker/info.json +++ b/keyboards/fjlabs/peaker/info.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "at90usb646", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_tkl_all": { "layout": [ diff --git a/keyboards/fjlabs/peaker/rules.mk b/keyboards/fjlabs/peaker/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/peaker/rules.mk +++ b/keyboards/fjlabs/peaker/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/polaris/info.json b/keyboards/fjlabs/polaris/info.json index 6757372bf9f..c4f3caf2879 100644 --- a/keyboards/fjlabs/polaris/info.json +++ b/keyboards/fjlabs/polaris/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": [ "60_ansi", "60_ansi_split_bs_rshift", diff --git a/keyboards/fjlabs/polaris/rules.mk b/keyboards/fjlabs/polaris/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/polaris/rules.mk +++ b/keyboards/fjlabs/polaris/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/ready100/info.json b/keyboards/fjlabs/ready100/info.json index dd717bb68a8..b5940b9c527 100644 --- a/keyboards/fjlabs/ready100/info.json +++ b/keyboards/fjlabs/ready100/info.json @@ -34,6 +34,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_64key": "LAYOUT_64_ansi" }, diff --git a/keyboards/fjlabs/ready100/rules.mk b/keyboards/fjlabs/ready100/rules.mk index dca4b0aabb4..3437a35bdf1 100644 --- a/keyboards/fjlabs/ready100/rules.mk +++ b/keyboards/fjlabs/ready100/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/sinanju/info.json b/keyboards/fjlabs/sinanju/info.json index f71ad6fca21..ef9cf0e872b 100644 --- a/keyboards/fjlabs/sinanju/info.json +++ b/keyboards/fjlabs/sinanju/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_60_ansi_wkl": { "layout": [ diff --git a/keyboards/fjlabs/sinanju/rules.mk b/keyboards/fjlabs/sinanju/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/sinanju/rules.mk +++ b/keyboards/fjlabs/sinanju/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/sinanjuwk/info.json b/keyboards/fjlabs/sinanjuwk/info.json index 9f34f4aa528..e825ae335e7 100644 --- a/keyboards/fjlabs/sinanjuwk/info.json +++ b/keyboards/fjlabs/sinanjuwk/info.json @@ -18,6 +18,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" }, diff --git a/keyboards/fjlabs/sinanjuwk/rules.mk b/keyboards/fjlabs/sinanjuwk/rules.mk index f117516ecce..3437a35bdf1 100644 --- a/keyboards/fjlabs/sinanjuwk/rules.mk +++ b/keyboards/fjlabs/sinanjuwk/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/solanis/info.json b/keyboards/fjlabs/solanis/info.json index ecc495d59a9..12103d10586 100644 --- a/keyboards/fjlabs/solanis/info.json +++ b/keyboards/fjlabs/solanis/info.json @@ -34,6 +34,14 @@ }, "processor": "at90usb646", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": [ "tkl_ansi", "tkl_ansi_split_bs_rshift", diff --git a/keyboards/fjlabs/solanis/rules.mk b/keyboards/fjlabs/solanis/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/solanis/rules.mk +++ b/keyboards/fjlabs/solanis/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/swordfish/info.json b/keyboards/fjlabs/swordfish/info.json index 822d9662d42..331bae459c0 100644 --- a/keyboards/fjlabs/swordfish/info.json +++ b/keyboards/fjlabs/swordfish/info.json @@ -33,6 +33,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "layouts": { "LAYOUT_2u_bs": { "layout": [ diff --git a/keyboards/fjlabs/swordfish/rules.mk b/keyboards/fjlabs/swordfish/rules.mk index 8bb5a64bff4..3437a35bdf1 100644 --- a/keyboards/fjlabs/swordfish/rules.mk +++ b/keyboards/fjlabs/swordfish/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json index f161284ae01..69ff0690a18 100644 --- a/keyboards/fjlabs/tf60ansi/info.json +++ b/keyboards/fjlabs/tf60ansi/info.json @@ -38,6 +38,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/fjlabs/tf60ansi/rules.mk b/keyboards/fjlabs/tf60ansi/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/tf60ansi/rules.mk +++ b/keyboards/fjlabs/tf60ansi/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/tf60v2/info.json b/keyboards/fjlabs/tf60v2/info.json index e3051c0da7b..337a06843f1 100644 --- a/keyboards/fjlabs/tf60v2/info.json +++ b/keyboards/fjlabs/tf60v2/info.json @@ -38,6 +38,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["60_ansi_arrow"], "layouts": { "LAYOUT_60_ansi_arrow": { diff --git a/keyboards/fjlabs/tf60v2/rules.mk b/keyboards/fjlabs/tf60v2/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/tf60v2/rules.mk +++ b/keyboards/fjlabs/tf60v2/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fjlabs/tf65rgbv2/info.json b/keyboards/fjlabs/tf65rgbv2/info.json index ab105ff4a9f..dd567c63b85 100644 --- a/keyboards/fjlabs/tf65rgbv2/info.json +++ b/keyboards/fjlabs/tf65rgbv2/info.json @@ -38,6 +38,14 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true + }, "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { diff --git a/keyboards/fjlabs/tf65rgbv2/rules.mk b/keyboards/fjlabs/tf65rgbv2/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/fjlabs/tf65rgbv2/rules.mk +++ b/keyboards/fjlabs/tf65rgbv2/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/fluorite/info.json b/keyboards/fluorite/keyboard.json similarity index 98% rename from keyboards/fluorite/info.json rename to keyboards/fluorite/keyboard.json index f28694389e9..ca23f773b0e 100644 --- a/keyboards/fluorite/info.json +++ b/keyboards/fluorite/keyboard.json @@ -19,6 +19,11 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/fluorite/rules.mk b/keyboards/fluorite/rules.mk deleted file mode 100644 index ad81ce036a2..00000000000 --- a/keyboards/fluorite/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 = 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 diff --git a/keyboards/fortitude60/rev1/keyboard.json b/keyboards/fortitude60/rev1/keyboard.json index ff8756bb684..f651c784247 100644 --- a/keyboards/fortitude60/rev1/keyboard.json +++ b/keyboards/fortitude60/rev1/keyboard.json @@ -29,6 +29,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/fortitude60/rules.mk b/keyboards/fortitude60/rules.mk index 181f73ba110..ef158b8cf08 100644 --- a/keyboards/fortitude60/rules.mk +++ b/keyboards/fortitude60/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 = 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 = fortitude60/rev1 diff --git a/keyboards/fractal/info.json b/keyboards/fractal/info.json index 0d2ce4aecac..4086ff969fe 100644 --- a/keyboards/fractal/info.json +++ b/keyboards/fractal/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "community_layouts": ["ortho_5x12"], "layouts": { "LAYOUT_ortho_5x12": { diff --git a/keyboards/fractal/rules.mk b/keyboards/fractal/rules.mk index ee623488daa..16051206467 100755 --- a/keyboards/fractal/rules.mk +++ b/keyboards/fractal/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json index 2e99c5806b2..8a4aed19484 100644 --- a/keyboards/frobiac/blackbowl/info.json +++ b/keyboards/frobiac/blackbowl/info.json @@ -13,7 +13,9 @@ "dynamic_macro": true, "extrakey": true, "mousekey": true, - "nkro": false + "nkro": false, + "ps2": true, + "ps2_mouse": true }, "build": { "lto": true diff --git a/keyboards/frobiac/blackbowl/rules.mk b/keyboards/frobiac/blackbowl/rules.mk index 4e81c7280cd..3b95c118432 100644 --- a/keyboards/frobiac/blackbowl/rules.mk +++ b/keyboards/frobiac/blackbowl/rules.mk @@ -4,6 +4,4 @@ CUSTOM_MATRIX = lite I2C_DRIVER_REQUIRED = yes SRC += matrix.c -PS2_MOUSE_ENABLE = yes -PS2_ENABLE = yes PS2_DRIVER = usart diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/keyboard.json similarity index 99% rename from keyboards/frooastboard/walnut/info.json rename to keyboards/frooastboard/walnut/keyboard.json index 4864e12fbcf..4387452d381 100644 --- a/keyboards/frooastboard/walnut/info.json +++ b/keyboards/frooastboard/walnut/keyboard.json @@ -12,7 +12,8 @@ "console": false, "extrakey": false, "mousekey": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "rgb_matrix": { "animations": { diff --git a/keyboards/frooastboard/walnut/rules.mk b/keyboards/frooastboard/walnut/rules.mk deleted file mode 100644 index c529890fb51..00000000000 --- a/keyboards/frooastboard/walnut/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix From 130a2a31a66f17969102f95045fa2dcfac84e01d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 14 Apr 2024 18:09:46 -0700 Subject: [PATCH 12/23] Data-Driven Keyboard Conversions: G (#23522) --- keyboards/gboards/ergotaco/info.json | 7 ++++++ keyboards/gboards/ergotaco/rules.mk | 3 --- keyboards/gboards/georgi/info.json | 11 +++++++++ keyboards/gboards/georgi/rules.mk | 16 +------------ keyboards/gboards/gergo/info.json | 7 ++++++ keyboards/gboards/gergo/rules.mk | 4 ---- keyboards/gboards/gergoplex/info.json | 7 ++++++ keyboards/gboards/gergoplex/rules.mk | 9 -------- .../giabalanai/{info.json => keyboard.json} | 8 ++++++- keyboards/giabalanai/rules.mk | 9 -------- keyboards/gl516/a52gl/info.json | 5 ++++ keyboards/gl516/a52gl/rules.mk | 15 +----------- keyboards/gl516/j73gl/info.json | 6 +++++ keyboards/gl516/j73gl/rules.mk | 15 +----------- keyboards/gl516/n51gl/info.json | 7 ++++++ keyboards/gl516/n51gl/rules.mk | 15 +----------- keyboards/glenpickle/chimera_ergo/info.json | 8 +++++++ keyboards/glenpickle/chimera_ergo/rules.mk | 12 ---------- keyboards/glenpickle/chimera_ls/info.json | 8 +++++++ keyboards/glenpickle/chimera_ls/rules.mk | 12 ---------- keyboards/glenpickle/chimera_ortho/info.json | 8 +++++++ keyboards/glenpickle/chimera_ortho/rules.mk | 12 ---------- .../glenpickle/chimera_ortho_plus/info.json | 9 ++++++++ .../glenpickle/chimera_ortho_plus/rules.mk | 13 ----------- keyboards/gmmk/numpad/info.json | 17 +++++++++++++- keyboards/gmmk/numpad/rules.mk | 20 ---------------- keyboards/gon/nerd60/info.json | 7 ++++++ keyboards/gon/nerd60/rules.mk | 13 ----------- keyboards/gon/nerdtkl/info.json | 7 ++++++ keyboards/gon/nerdtkl/rules.mk | 13 ----------- keyboards/gopolar/gg86/info.json | 14 ++++++++++- keyboards/gopolar/gg86/rules.mk | 23 ------------------- keyboards/gray_studio/cod67/info.json | 8 +++++++ keyboards/gray_studio/cod67/rules.mk | 13 ----------- 34 files changed, 145 insertions(+), 216 deletions(-) rename keyboards/giabalanai/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/giabalanai/rules.mk diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json index 80558ad6929..1d13c2458a7 100644 --- a/keyboards/gboards/ergotaco/info.json +++ b/keyboards/gboards/ergotaco/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/gboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk index 6fbefbd22d7..5d025b31ef2 100644 --- a/keyboards/gboards/ergotaco/rules.mk +++ b/keyboards/gboards/ergotaco/rules.mk @@ -1,7 +1,4 @@ CUSTOM_MATRIX = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = yes -COMMAND_ENABLE = yes # A bunch of stuff that you shouldn't touch unless you # know what you're doing. diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 51737f75af8..066797a2415 100644 --- a/keyboards/gboards/georgi/info.json +++ b/keyboards/gboards/georgi/info.json @@ -11,6 +11,17 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "nkro": true, + "steno": true + }, + "build": { + "lto": true + }, "tapping": { "toggle": 2 }, diff --git a/keyboards/gboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk index 5b63e269fa5..42be966784a 100644 --- a/keyboards/gboards/georgi/rules.mk +++ b/keyboards/gboards/georgi/rules.mk @@ -1,18 +1,4 @@ -# 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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes -STENO_ENABLE = yes -LTO_ENABLE = yes SRC += matrix.c -I2C_DRIVER_REQUIRED = yes \ No newline at end of file +I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index bc53f2db5f0..e576ac8012e 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -16,6 +16,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true + }, "tapping": { "toggle": 1 }, diff --git a/keyboards/gboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk index d789b349da8..77c632bc1ca 100644 --- a/keyboards/gboards/gergo/rules.mk +++ b/keyboards/gboards/gergo/rules.mk @@ -2,10 +2,6 @@ # change yes to no to disable # CUSTOM_MATRIX = yes -EXTRAKEY_ENABLE = yes -CONSOLE_ENABLE = yes -COMMAND_ENABLE = yes -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json index c5f6be47509..cf1e4513923 100644 --- a/keyboards/gboards/gergoplex/info.json +++ b/keyboards/gboards/gergoplex/info.json @@ -13,6 +13,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { diff --git a/keyboards/gboards/gergoplex/rules.mk b/keyboards/gboards/gergoplex/rules.mk index 9846c64771e..6ae3f1122b1 100644 --- a/keyboards/gboards/gergoplex/rules.mk +++ b/keyboards/gboards/gergoplex/rules.mk @@ -1,15 +1,6 @@ # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 = yes SRC += matrix.c diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/keyboard.json similarity index 98% rename from keyboards/giabalanai/info.json rename to keyboards/giabalanai/keyboard.json index 953e0bebc37..ae5787cec6e 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/keyboard.json @@ -36,7 +36,13 @@ "bootmagic": false, "console": false, "mousekey": false, - "nkro": false + "nkro": false, + "command": false, + "backlight": false, + "rgb_matrix": false + }, + "build": { + "lto": true }, "encoder": { "rotary": [] diff --git a/keyboards/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk deleted file mode 100644 index 90ba252d264..00000000000 --- a/keyboards/giabalanai/rules.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Build Options -# change yes to no to disable -# -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -# RGB_MATRIX_ENABLE is not suitable for giabalanai keyboard on the right side (there are dulpicate keys). -RGB_MATRIX_ENABLE = no # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.) - -LTO_ENABLE = yes diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json index bc9b1cacfad..54fbce6bdad 100644 --- a/keyboards/gl516/a52gl/info.json +++ b/keyboards/gl516/a52gl/info.json @@ -10,6 +10,11 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/a52gl/rules.mk b/keyboards/gl516/a52gl/rules.mk index 109f8bc976d..179d02c3c68 100644 --- a/keyboards/gl516/a52gl/rules.mk +++ b/keyboards/gl516/a52gl/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite -SRC += matrix.c \ No newline at end of file +SRC += matrix.c diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json index fa78788e666..b252363f700 100644 --- a/keyboards/gl516/j73gl/info.json +++ b/keyboards/gl516/j73gl/info.json @@ -28,6 +28,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/j73gl/rules.mk b/keyboards/gl516/j73gl/rules.mk index 3ea771b6701..179d02c3c68 100644 --- a/keyboards/gl516/j73gl/rules.mk +++ b/keyboards/gl516/j73gl/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite -SRC += matrix.c \ No newline at end of file +SRC += matrix.c diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json index c5abdd45428..0e54ee52a45 100644 --- a/keyboards/gl516/n51gl/info.json +++ b/keyboards/gl516/n51gl/info.json @@ -33,6 +33,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgblight": true, + "encoder": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gl516/n51gl/rules.mk b/keyboards/gl516/n51gl/rules.mk index c5b4f3e3764..179d02c3c68 100644 --- a/keyboards/gl516/n51gl/rules.mk +++ b/keyboards/gl516/n51gl/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes CUSTOM_MATRIX = lite -SRC += matrix.c \ No newline at end of file +SRC += matrix.c diff --git a/keyboards/glenpickle/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/info.json index ea49dabbca4..038498fd10a 100644 --- a/keyboards/glenpickle/chimera_ergo/info.json +++ b/keyboards/glenpickle/chimera_ergo/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/glenpickle/chimera_ergo/rules.mk b/keyboards/glenpickle/chimera_ergo/rules.mk index f543b5fd9a2..18d234d62a0 100644 --- a/keyboards/glenpickle/chimera_ergo/rules.mk +++ b/keyboards/glenpickle/chimera_ergo/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/glenpickle/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json index 300b6be928e..b0d6a529124 100644 --- a/keyboards/glenpickle/chimera_ls/info.json +++ b/keyboards/glenpickle/chimera_ls/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/glenpickle/chimera_ls/rules.mk b/keyboards/glenpickle/chimera_ls/rules.mk index 706d6106538..812e3cef929 100644 --- a/keyboards/glenpickle/chimera_ls/rules.mk +++ b/keyboards/glenpickle/chimera_ls/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/glenpickle/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json index 4932d2f5a5a..b62616ce689 100644 --- a/keyboards/glenpickle/chimera_ortho/info.json +++ b/keyboards/glenpickle/chimera_ortho/info.json @@ -9,6 +9,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/glenpickle/chimera_ortho/rules.mk b/keyboards/glenpickle/chimera_ortho/rules.mk index f543b5fd9a2..18d234d62a0 100644 --- a/keyboards/glenpickle/chimera_ortho/rules.mk +++ b/keyboards/glenpickle/chimera_ortho/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/glenpickle/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json index 39d6c11eb22..bf0ae445483 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/info.json +++ b/keyboards/glenpickle/chimera_ortho_plus/info.json @@ -9,6 +9,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "unicode": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/glenpickle/chimera_ortho_plus/rules.mk b/keyboards/glenpickle/chimera_ortho_plus/rules.mk index 539a2d1004b..18d234d62a0 100644 --- a/keyboards/glenpickle/chimera_ortho_plus/rules.mk +++ b/keyboards/glenpickle/chimera_ortho_plus/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json index 63ae544ad32..70e2d3e6791 100644 --- a/keyboards/gmmk/numpad/info.json +++ b/keyboards/gmmk/numpad/info.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x320F", "pid": "0x5088", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "eeprom": { "driver": "wear_leveling", @@ -70,6 +73,18 @@ }, "processor": "WB32F3G71", "bootloader": "wb32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "encoder": true, + "midi": true + }, + "build": { + "lto": true + }, "diode_direction": "ROW2COL", "matrix_pins": { "rows": ["A3", "A4", "A5", "A6", "A7"], diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk index d289eb81a4d..752b0ce9d0b 100644 --- a/keyboards/gmmk/numpad/rules.mk +++ b/keyboards/gmmk/numpad/rules.mk @@ -1,23 +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 -ENCODER_ENABLE = yes -KEYBOARD_SHARED_EP = yes -MIDI_ENABLE = yes - -RGB_MATRIX_ENABLE = yes - -LTO_ENABLE = yes - ANALOG_DRIVER_REQUIRED = yes SRC += matrix.c diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json index 38152a32e6c..33ad716b4fd 100644 --- a/keyboards/gon/nerd60/info.json +++ b/keyboards/gon/nerd60/info.json @@ -21,6 +21,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/gon/nerd60/rules.mk b/keyboards/gon/nerd60/rules.mk index e0782ddcb51..3437a35bdf1 100644 --- a/keyboards/gon/nerd60/rules.mk +++ b/keyboards/gon/nerd60/rules.mk @@ -1,15 +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 = 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 diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json index 103c856bf0b..301cbaf19f1 100644 --- a/keyboards/gon/nerdtkl/info.json +++ b/keyboards/gon/nerdtkl/info.json @@ -21,6 +21,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_tkl": { "layout": [ diff --git a/keyboards/gon/nerdtkl/rules.mk b/keyboards/gon/nerdtkl/rules.mk index e0782ddcb51..3437a35bdf1 100644 --- a/keyboards/gon/nerdtkl/rules.mk +++ b/keyboards/gon/nerdtkl/rules.mk @@ -1,15 +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 = 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 diff --git a/keyboards/gopolar/gg86/info.json b/keyboards/gopolar/gg86/info.json index 13669a85420..b704582aa6c 100644 --- a/keyboards/gopolar/gg86/info.json +++ b/keyboards/gopolar/gg86/info.json @@ -7,7 +7,8 @@ "vid": "0x0007", "pid": "0x0007", "device_version": "0.0.1", - "force_nkro": true + "force_nkro": true, + "no_startup_check": true }, "ws2812": { "pin": "E2" @@ -64,6 +65,17 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "oled": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/gopolar/gg86/rules.mk b/keyboards/gopolar/gg86/rules.mk index acdf49b47da..7b380ccdfbe 100644 --- a/keyboards/gopolar/gg86/rules.mk +++ b/keyboards/gopolar/gg86/rules.mk @@ -1,24 +1 @@ SRC += lib/logo.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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -# Additional thing to reduce compiled size -LTO_ENABLE = yes -NO_USB_STARTUP_CHECK = yes - -# RGB Matrix enabled -RGB_MATRIX_ENABLE = yes - -# OLED enabled -OLED_ENABLE = yes diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json index 653885f963e..e3687ce9591 100644 --- a/keyboards/gray_studio/cod67/info.json +++ b/keyboards/gray_studio/cod67/info.json @@ -41,6 +41,14 @@ }, "processor": "atmega32u4", "bootloader": "lufa-ms", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gray_studio/cod67/rules.mk b/keyboards/gray_studio/cod67/rules.mk index c8d3337cb38..e22d5248895 100644 --- a/keyboards/gray_studio/cod67/rules.mk +++ b/keyboards/gray_studio/cod67/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable RGB underglow -AUDIO_ENABLE = no # Audio output 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 13/23] 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 14/23] 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 15/23] 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 16/23] 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 17/23] 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 From 45d60214f46c21ce83f7352b48cb31e3534621da Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 16 Apr 2024 15:55:40 -0700 Subject: [PATCH 18/23] [Keyboard] ZSA Voyager (#22181) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ryan Co-authored-by: László Bácsi Co-authored-by: Joel Challis --- keyboards/zsa/voyager/config.h | 14 + keyboards/zsa/voyager/halconf.h | 20 ++ keyboards/zsa/voyager/info.json | 219 ++++++++++++ .../zsa/voyager/keymaps/default/keymap.c | 29 ++ keyboards/zsa/voyager/ld/voyager.ld | 85 +++++ keyboards/zsa/voyager/matrix.c | 204 ++++++++++++ keyboards/zsa/voyager/mcuconf.h | 23 ++ keyboards/zsa/voyager/readme.md | 40 +++ keyboards/zsa/voyager/rules.mk | 10 + keyboards/zsa/voyager/voyager.c | 312 ++++++++++++++++++ keyboards/zsa/voyager/voyager.h | 35 ++ 11 files changed, 991 insertions(+) create mode 100644 keyboards/zsa/voyager/config.h create mode 100644 keyboards/zsa/voyager/halconf.h create mode 100644 keyboards/zsa/voyager/info.json create mode 100644 keyboards/zsa/voyager/keymaps/default/keymap.c create mode 100644 keyboards/zsa/voyager/ld/voyager.ld create mode 100644 keyboards/zsa/voyager/matrix.c create mode 100644 keyboards/zsa/voyager/mcuconf.h create mode 100644 keyboards/zsa/voyager/readme.md create mode 100644 keyboards/zsa/voyager/rules.mk create mode 100644 keyboards/zsa/voyager/voyager.c create mode 100644 keyboards/zsa/voyager/voyager.h diff --git a/keyboards/zsa/voyager/config.h b/keyboards/zsa/voyager/config.h new file mode 100644 index 00000000000..630c01fc809 --- /dev/null +++ b/keyboards/zsa/voyager/config.h @@ -0,0 +1,14 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND +#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC + +#define IS31FL3731_I2C_TIMEOUT 5 + +#define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL +#define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED +#define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX diff --git a/keyboards/zsa/voyager/halconf.h b/keyboards/zsa/voyager/halconf.h new file mode 100644 index 00000000000..d9f29a11cb1 --- /dev/null +++ b/keyboards/zsa/voyager/halconf.h @@ -0,0 +1,20 @@ +/* Copyright 2021 QMK + * + * 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 3 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 HAL_USE_I2C TRUE + +#include_next diff --git a/keyboards/zsa/voyager/info.json b/keyboards/zsa/voyager/info.json new file mode 100644 index 00000000000..14e7584f5cc --- /dev/null +++ b/keyboards/zsa/voyager/info.json @@ -0,0 +1,219 @@ +{ + "manufacturer": "ZSA Technology Labs", + "keyboard_name": "Voyager", + "maintainer": "ZSA Technology Labs", + "url": "zsa.io/voyager", + "processor": "STM32F303", + "bootloader": "custom", + "usb": { + "vid": "0x3297", + "pid": "0x1977", + "device_version": "0.0.1", + "shared_endpoint": { + "mouse": false + } + }, + "features": { + "bootmagic": true, + "caps_word": true, + "deferred_exec": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "swap_hands": true, + "rgb_matrix": true + }, + "bootmagic": { + "matrix": [0, 1] + }, + "diode_direction": "ROW2COL", + "matrix_size": { + "cols": 7, + "rows": 12 + }, + "mousekey": { + "delay": 0, + "interval": 20, + "max_speed": 7, + "time_to_max": 60, + "wheel_delay": 400 + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "rgb_matrix": { + "driver": "is31fl3731", + "led_flush_limit": 26, + "led_process_limit": 5, + "max_brightness": 175, + "sleep": true, + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "rainbow_moving_chevron": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "flower_blooming": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_fractal": true, + "pixel_flow": true, + "pixel_rain": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true, + "starlight": true, + "starlight_dual_sat": true, + "starlight_dual_hue": true, + "riverflow": true + }, + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 10, "flags": 1}, + {"matrix": [0, 2], "x": 17, "y": 10, "flags": 4}, + {"matrix": [0, 3], "x": 34, "y": 8, "flags": 4}, + {"matrix": [0, 4], "x": 52, "y": 5, "flags": 4}, + {"matrix": [0, 5], "x": 69, "y": 8, "flags": 4}, + {"matrix": [0, 6], "x": 86, "y": 10, "flags": 4}, + {"matrix": [1, 1], "x": 0, "y": 21, "flags": 1}, + {"matrix": [1, 2], "x": 17, "y": 21, "flags": 4}, + {"matrix": [1, 3], "x": 34, "y": 19, "flags": 4}, + {"matrix": [1, 4], "x": 52, "y": 17, "flags": 4}, + {"matrix": [1, 5], "x": 69, "y": 19, "flags": 4}, + {"matrix": [1, 6], "x": 86, "y": 21, "flags": 4}, + {"matrix": [2, 1], "x": 0, "y": 32, "flags": 1}, + {"matrix": [2, 2], "x": 17, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 34, "y": 30, "flags": 4}, + {"matrix": [2, 4], "x": 52, "y": 28, "flags": 4}, + {"matrix": [2, 5], "x": 69, "y": 30, "flags": 4}, + {"matrix": [2, 6], "x": 86, "y": 32, "flags": 4}, + {"matrix": [3, 1], "x": 0, "y": 43, "flags": 1}, + {"matrix": [3, 2], "x": 17, "y": 43, "flags": 4}, + {"matrix": [3, 3], "x": 34, "y": 41, "flags": 4}, + {"matrix": [3, 4], "x": 52, "y": 39, "flags": 4}, + {"matrix": [3, 5], "x": 69, "y": 41, "flags": 4}, + {"matrix": [4, 4], "x": 86, "y": 43, "flags": 4}, + {"matrix": [5, 0], "x": 86, "y": 53, "flags": 1}, + {"matrix": [5, 1], "x": 96, "y": 58, "flags": 1}, + {"matrix": [6, 0], "x": 138, "y": 10, "flags": 4}, + {"matrix": [6, 1], "x": 155, "y": 10, "flags": 4}, + {"matrix": [6, 2], "x": 172, "y": 8, "flags": 4}, + {"matrix": [6, 3], "x": 190, "y": 5, "flags": 4}, + {"matrix": [6, 4], "x": 207, "y": 8, "flags": 4}, + {"matrix": [6, 5], "x": 224, "y": 10, "flags": 1}, + {"matrix": [7, 0], "x": 138, "y": 21, "flags": 4}, + {"matrix": [7, 1], "x": 155, "y": 21, "flags": 4}, + {"matrix": [7, 2], "x": 172, "y": 19, "flags": 4}, + {"matrix": [7, 3], "x": 190, "y": 17, "flags": 4}, + {"matrix": [7, 4], "x": 207, "y": 19, "flags": 4}, + {"matrix": [7, 5], "x": 224, "y": 21, "flags": 1}, + {"matrix": [8, 0], "x": 138, "y": 32, "flags": 4}, + {"matrix": [8, 1], "x": 155, "y": 32, "flags": 4}, + {"matrix": [8, 2], "x": 172, "y": 30, "flags": 4}, + {"matrix": [8, 3], "x": 190, "y": 28, "flags": 4}, + {"matrix": [8, 4], "x": 207, "y": 30, "flags": 4}, + {"matrix": [8, 5], "x": 224, "y": 32, "flags": 1}, + {"matrix": [10, 2], "x": 138, "y": 43, "flags": 4}, + {"matrix": [9, 1], "x": 155, "y": 43, "flags": 4}, + {"matrix": [9, 2], "x": 172, "y": 41, "flags": 4}, + {"matrix": [9, 3], "x": 190, "y": 39, "flags": 4}, + {"matrix": [9, 4], "x": 207, "y": 41, "flags": 4}, + {"matrix": [9, 5], "x": 224, "y": 43, "flags": 1}, + {"matrix": [11, 5], "x": 128, "y": 58, "flags": 1}, + {"matrix": [11, 6], "x": 138, "y": 53, "flags": 1} + ] + }, + "layout_aliases": { + "LAYOUT_voyager": "LAYOUT" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "matrix": [0, 1], "x": 3, "y": 0}, + {"label": "k01", "matrix": [0, 2], "x": 12, "y": 0}, + {"label": "k02", "matrix": [0, 3], "x": 2, "y": 0.25}, + {"label": "k03", "matrix": [0, 4], "x": 4, "y": 0.25}, + {"label": "k04", "matrix": [0, 5], "x": 11, "y": 0.25}, + {"label": "k05", "matrix": [0, 6], "x": 13, "y": 0.25}, + {"label": "k26", "matrix": [6, 0], "x": 0, "y": 0.5}, + {"label": "k27", "matrix": [6, 1], "x": 1, "y": 0.5}, + {"label": "k28", "matrix": [6, 2], "x": 5, "y": 0.5}, + {"label": "k29", "matrix": [6, 3], "x": 10, "y": 0.5}, + {"label": "k30", "matrix": [6, 4], "x": 14, "y": 0.5}, + {"label": "k31", "matrix": [6, 5], "x": 15, "y": 0.5}, + {"label": "k06", "matrix": [1, 1], "x": 3, "y": 1}, + {"label": "k07", "matrix": [1, 2], "x": 12, "y": 1}, + {"label": "k08", "matrix": [1, 3], "x": 2, "y": 1.25}, + {"label": "k09", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "k10", "matrix": [1, 5], "x": 11, "y": 1.25}, + {"label": "k11", "matrix": [1, 6], "x": 13, "y": 1.25}, + {"label": "k32", "matrix": [7, 0], "x": 0, "y": 1.5}, + {"label": "k33", "matrix": [7, 1], "x": 1, "y": 1.5}, + {"label": "k34", "matrix": [7, 2], "x": 5, "y": 1.5}, + {"label": "k35", "matrix": [7, 3], "x": 10, "y": 1.5}, + {"label": "k36", "matrix": [7, 4], "x": 14, "y": 1.5}, + {"label": "k37", "matrix": [7, 5], "x": 15, "y": 1.5}, + {"label": "k12", "matrix": [2, 1], "x": 3, "y": 2}, + {"label": "k13", "matrix": [2, 2], "x": 12, "y": 2}, + {"label": "k14", "matrix": [2, 3], "x": 2, "y": 2.25}, + {"label": "k15", "matrix": [2, 4], "x": 4, "y": 2.25}, + {"label": "k16", "matrix": [2, 5], "x": 11, "y": 2.25}, + {"label": "k17", "matrix": [2, 6], "x": 13, "y": 2.25}, + {"label": "k38", "matrix": [8, 0], "x": 0, "y": 2.5}, + {"label": "k39", "matrix": [8, 1], "x": 1, "y": 2.5}, + {"label": "k40", "matrix": [8, 2], "x": 5, "y": 2.5}, + {"label": "k41", "matrix": [8, 3], "x": 10, "y": 2.5}, + {"label": "k42", "matrix": [8, 4], "x": 14, "y": 2.5}, + {"label": "k43", "matrix": [8, 5], "x": 15, "y": 2.5}, + {"label": "k18", "matrix": [3, 1], "x": 3, "y": 3}, + {"label": "k19", "matrix": [3, 2], "x": 12, "y": 3}, + {"label": "k20", "matrix": [3, 3], "x": 2, "y": 3.25}, + {"label": "k21", "matrix": [3, 4], "x": 4, "y": 3.25}, + {"label": "k22", "matrix": [3, 5], "x": 11, "y": 3.25}, + {"label": "k23", "matrix": [4, 4], "x": 13, "y": 3.25}, + {"label": "k44", "matrix": [10, 2], "x": 0, "y": 3.5}, + {"label": "k45", "matrix": [9, 1], "x": 1, "y": 3.5}, + {"label": "k46", "matrix": [9, 2], "x": 5, "y": 3.5}, + {"label": "k47", "matrix": [9, 3], "x": 10, "y": 3.5}, + {"label": "k48", "matrix": [9, 4], "x": 14, "y": 3.5}, + {"label": "k49", "matrix": [9, 5], "x": 15, "y": 3.5}, + {"label": "k24", "matrix": [5, 0], "x": 5, "y": 4.5}, + {"label": "k25", "matrix": [5, 1], "x": 6, "y": 4.75}, + {"label": "k50", "matrix": [11, 5], "x": 9, "y": 4.75}, + {"label": "k51", "matrix": [11, 6], "x": 10, "y": 4.5} + ] + } + } +} diff --git a/keyboards/zsa/voyager/keymaps/default/keymap.c b/keyboards/zsa/voyager/keymaps/default/keymap.c new file mode 100644 index 00000000000..e05794de756 --- /dev/null +++ b/keyboards/zsa/voyager/keymaps/default/keymap.c @@ -0,0 +1,29 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + CW_TOGG, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + SFT_T(KC_BSPC),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RSFT_T(KC_QUOT), + KC_LGUI, ALT_T(KC_Z),KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA,KC_DOT, RALT_T(KC_SLSH), KC_RCTL, + LT(1,KC_ENT), CTL_T(KC_TAB), SFT_T(KC_BSPC), LT(2,KC_SPC) + ), + [1] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_7, KC_8, KC_9, KC_MINS, KC_SLSH, KC_F12, + _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_4, KC_5, KC_6, KC_PLUS, KC_ASTR, KC_BSPC, + _______, _______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_DOT, KC_EQL, KC_ENT, + _______, _______, _______, KC_0 + ), + [2] = LAYOUT( + RGB_TOG, QK_KB, RGB_MOD, RGB_M_P, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_PGUP, KC_HOME, KC_UP, KC_END, _______, _______, + _______, KC_MPRV, KC_MNXT, KC_MSTP, KC_MPLY, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, C(S(KC_TAB)), C(KC_TAB), _______, _______, _______, + _______, _______, _______, _______ + ), +}; diff --git a/keyboards/zsa/voyager/ld/voyager.ld b/keyboards/zsa/voyager/ld/voyager.ld new file mode 100644 index 00000000000..0619983beb0 --- /dev/null +++ b/keyboards/zsa/voyager/ld/voyager.ld @@ -0,0 +1,85 @@ +/* + ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/* + * STM32F303xC memory setup. + */ +MEMORY +{ + flash0 (rx) : org = 0x08002000, len = 256k - 0x2000 + flash1 (rx) : org = 0x00000000, len = 0 + flash2 (rx) : org = 0x00000000, len = 0 + flash3 (rx) : org = 0x00000000, len = 0 + flash4 (rx) : org = 0x00000000, len = 0 + flash5 (rx) : org = 0x00000000, len = 0 + flash6 (rx) : org = 0x00000000, len = 0 + flash7 (rx) : org = 0x00000000, len = 0 + ram0 (wx) : org = 0x20000000, len = 40k + ram1 (wx) : org = 0x00000000, len = 0 + ram2 (wx) : org = 0x00000000, len = 0 + ram3 (wx) : org = 0x00000000, len = 0 + ram4 (wx) : org = 0x10000000, len = 8k + ram5 (wx) : org = 0x00000000, len = 0 + ram6 (wx) : org = 0x00000000, len = 0 + ram7 (wx) : org = 0x00000000, len = 0 +} + +/* For each data/text section two region are defined, a virtual region + and a load region (_LMA suffix).*/ + +/* Flash region to be used for exception vectors.*/ +REGION_ALIAS("VECTORS_FLASH", flash0); +REGION_ALIAS("VECTORS_FLASH_LMA", flash0); + +/* Flash region to be used for constructors and destructors.*/ +REGION_ALIAS("XTORS_FLASH", flash0); +REGION_ALIAS("XTORS_FLASH_LMA", flash0); + +/* Flash region to be used for code text.*/ +REGION_ALIAS("TEXT_FLASH", flash0); +REGION_ALIAS("TEXT_FLASH_LMA", flash0); + +/* Flash region to be used for read only data.*/ +REGION_ALIAS("RODATA_FLASH", flash0); +REGION_ALIAS("RODATA_FLASH_LMA", flash0); + +/* Flash region to be used for various.*/ +REGION_ALIAS("VARIOUS_FLASH", flash0); +REGION_ALIAS("VARIOUS_FLASH_LMA", flash0); + +/* Flash region to be used for RAM(n) initialization data.*/ +REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0); + +/* RAM region to be used for Main stack. This stack accommodates the processing + of all exceptions and interrupts.*/ +REGION_ALIAS("MAIN_STACK_RAM", ram0); + +/* RAM region to be used for the process stack. This is the stack used by + the main() function.*/ +REGION_ALIAS("PROCESS_STACK_RAM", ram0); + +/* RAM region to be used for data segment.*/ +REGION_ALIAS("DATA_RAM", ram0); +REGION_ALIAS("DATA_RAM_LMA", flash0); + +/* RAM region to be used for BSS segment.*/ +REGION_ALIAS("BSS_RAM", ram0); + +/* RAM region to be used for the default heap.*/ +REGION_ALIAS("HEAP_RAM", ram0); + +/* Generic rules inclusion.*/ +INCLUDE rules.ld \ No newline at end of file diff --git a/keyboards/zsa/voyager/matrix.c b/keyboards/zsa/voyager/matrix.c new file mode 100644 index 00000000000..614c3ffa041 --- /dev/null +++ b/keyboards/zsa/voyager/matrix.c @@ -0,0 +1,204 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include "voyager.h" +#include "mcp23018.h" + +#pragma GCC push_options +#pragma GCC optimize("-O3") + +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +static matrix_row_t raw_matrix_right[MATRIX_COLS]; + +#define MCP_ROWS_PER_HAND (MATRIX_ROWS / 2) +#ifndef VOYAGER_I2C_TIMEOUT +# define VOYAGER_I2C_TIMEOUT 100 +#endif +// Delay between each i2c io expander ops (in MCU cycles) +#ifndef IO_EXPANDER_OP_DELAY +# define IO_EXPANDER_OP_DELAY 500 +#endif + +extern bool mcp23018_leds[2]; +extern bool is_launching; + +static uint16_t mcp23018_reset_loop; +uint8_t mcp23018_errors; + +bool io_expander_ready(void) { + uint8_t tx; + return mcp23018_readPins(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, &tx); +} + +void matrix_init_custom(void) { + // outputs + gpio_set_pin_output(B10); + gpio_set_pin_output(B11); + gpio_set_pin_output(B12); + gpio_set_pin_output(B13); + gpio_set_pin_output(B14); + gpio_set_pin_output(B15); + + // inputs + gpio_set_pin_input_low(A0); + gpio_set_pin_input_low(A1); + gpio_set_pin_input_low(A2); + gpio_set_pin_input_low(A3); + gpio_set_pin_input_low(A6); + gpio_set_pin_input_low(A7); + gpio_set_pin_input_low(B0); + + mcp23018_init(MCP23018_DEFAULT_ADDRESS); + mcp23018_errors += !mcp23018_set_config(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, 0b00000000); + mcp23018_errors += !mcp23018_set_config(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, 0b00111111); + + if (!mcp23018_errors) { + is_launching = true; + } +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + bool changed = false; + // Attempt to reset the mcp23018 if it's not initialized + if (mcp23018_errors) { + if (++mcp23018_reset_loop > 0x1FFF) { + if (io_expander_ready()) { + // If we managed to initialize the mcp23018 - we need to reinitialize the matrix / layer state. During an electric discharge the i2c peripherals might be in a weird state. Giving a delay and resetting the MCU allows to recover from this. + wait_ms(200); + mcu_reset(); + } + } + } + + // Scanning left and right side of the keyboard for key presses. + // Left side is scanned by reading the gpio pins directly, right side is scanned by reading the mcp23018 registers. + + matrix_row_t data = 0; + for (uint8_t row = 0; row <= MCP_ROWS_PER_HAND; row++) { + // strobe row + switch (row) { + case 0: + gpio_write_pin_high(B10); + break; + case 1: + gpio_write_pin_high(B11); + break; + case 2: + gpio_write_pin_high(B12); + break; + case 3: + gpio_write_pin_high(B13); + break; + case 4: + gpio_write_pin_high(B14); + break; + case 5: + gpio_write_pin_high(B15); + break; + case 6: + break; // Left hand has 6 rows + } + + // Selecting the row on the right side of the keyboard. + if (!mcp23018_errors) { + // select row + mcp23018_errors += !mcp23018_set_output(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, 0b01111111 & ~(1 << (row))); + mcp23018_errors += !mcp23018_set_output(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, ((uint8_t)!mcp23018_leds[1] << 6) | ((uint8_t)!mcp23018_leds[0] << 7)); + } + // Reading the left side of the keyboard. + if (row < MCP_ROWS_PER_HAND) { + // i2c comm incur enough wait time + if (mcp23018_errors) { + // need wait to settle pin state + matrix_io_delay(); + } + // read col data + data = ((readPin(A0) << 0) | (readPin(A1) << 1) | (readPin(A2) << 2) | (readPin(A3) << 3) | (readPin(A6) << 4) | (readPin(A7) << 5) | (readPin(B0) << 6)); + // unstrobe row + switch (row) { + case 0: + gpio_write_pin_low(B10); + break; + case 1: + gpio_write_pin_low(B11); + break; + case 2: + gpio_write_pin_low(B12); + break; + case 3: + gpio_write_pin_low(B13); + break; + case 4: + gpio_write_pin_low(B14); + break; + case 5: + gpio_write_pin_low(B15); + break; + case 6: + break; + } + + if (current_matrix[row] != data) { + current_matrix[row] = data; + changed = true; + } + } + + // Reading the right side of the keyboard. + if (!mcp23018_errors) { + for (uint16_t i = 0; i < IO_EXPANDER_OP_DELAY; i++) { + __asm__("nop"); + } + uint8_t rx; + mcp23018_errors += !mcp23018_readPins(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, &rx); + data = ~(rx & 0b00111111); + for (uint16_t i = 0; i < IO_EXPANDER_OP_DELAY; i++) { + __asm__("nop"); + } + } else { + data = 0; + } + + if (raw_matrix_right[row] != data) { + raw_matrix_right[row] = data; + changed = true; + } + } + + for (uint8_t row = 0; row < MCP_ROWS_PER_HAND; row++) { + current_matrix[11 - row] = 0; + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + current_matrix[11 - row] |= ((raw_matrix_right[6 - col] & (1 << row) ? 1 : 0) << col); + } + } + return changed; +} + +// DO NOT REMOVE +// Needed for proper wake/sleep +void matrix_power_up(void) { + bool temp_launching = is_launching; + + matrix_init_custom(); + + is_launching = temp_launching; + if (!temp_launching) { + STATUS_LED_1(false); + STATUS_LED_2(false); + STATUS_LED_3(false); + STATUS_LED_4(false); + } + + // initialize matrix state: all keys off + for (uint8_t i = 0; i < MATRIX_ROWS; i++) { + matrix[i] = 0; + } +} + +bool is_transport_connected(void) { + return (bool)(mcp23018_errors == 0); +} +#pragma GCC pop_options diff --git a/keyboards/zsa/voyager/mcuconf.h b/keyboards/zsa/voyager/mcuconf.h new file mode 100644 index 00000000000..f75edce3e9b --- /dev/null +++ b/keyboards/zsa/voyager/mcuconf.h @@ -0,0 +1,23 @@ +/* Copyright 2021 QMK + * + * 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 3 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 + +#include_next + +// for i2c expander, and ISSI +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/zsa/voyager/readme.md b/keyboards/zsa/voyager/readme.md new file mode 100644 index 00000000000..4a602ee1374 --- /dev/null +++ b/keyboards/zsa/voyager/readme.md @@ -0,0 +1,40 @@ +# Voyager + +A next-gen split, ergonomic keyboard with an active left side, USB type C, and low profile switches. + +* Keyboard Maintainer: [drashna](https://github.com/drashna), [ZSA](https://github.com/zsa/) +* Hardware Supported: Voyager (STM32F303xC) +* Hardware Availability: [ZSA Store](https://zsa.io/voyager/) + +Make example for this keyboard (after setting up your build environment): + + make zsa/voyager:default + +Flashing example for this keyboard: + + make zsa/voyager:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + + +## Voyager Customization + +### Indicator LEDs + +There are 4 functions for enabling and disabling the LEDs on the top of the boards. The functions are `STATUS_LED_1(bool)` through `STATUS_LED_4(bool)`, with the first LED being the top most LED on the left hand, and the fourth LED being the bottom most LED on the right side. + +By default, the Indicator LEDs are used to indicate the layer state for the keyboard. If you wish to change this (and indicate caps/num/scroll lock status instead), then define `VOYAGER_USER_LEDS` in your `config.h` file. + +### Detecting split / Gaming mode + +To make it extra gaming friendly, you can configure what happens when you disconnect the right half. This is especially useful when using gaming unfriendly layers or layouts (e.g. home row mods, dvorak, colemak). + +Example for enabling a specific layer while right side is disconnected: + +```c +void housekeeping_task_user(void) { + if (!is_transport_connected()) { + // set layer + } +} +``` diff --git a/keyboards/zsa/voyager/rules.mk b/keyboards/zsa/voyager/rules.mk new file mode 100644 index 00000000000..bb95224d2bf --- /dev/null +++ b/keyboards/zsa/voyager/rules.mk @@ -0,0 +1,10 @@ +MCU_LDSCRIPT = voyager + +CUSTOM_MATRIX = lite +PROGRAM_CMD = $(call EXEC_DFU) +DFU_ARGS = -d 3297:0791 -a 0 -s 0x08002000:leave +DFU_SUFFIX_ARGS = -v 3297 -p 0791 + +VPATH += drivers/gpio +SRC += matrix.c mcp23018.c +I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/zsa/voyager/voyager.c b/keyboards/zsa/voyager/voyager.c new file mode 100644 index 00000000000..d70f1be3eff --- /dev/null +++ b/keyboards/zsa/voyager/voyager.c @@ -0,0 +1,312 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "voyager.h" + +keyboard_config_t keyboard_config; + +bool mcp23018_leds[2] = {0, 0}; +bool is_launching = false; + +#if defined(DEFERRED_EXEC_ENABLE) +# if defined(DYNAMIC_MACRO_ENABLE) +deferred_token dynamic_macro_token = INVALID_DEFERRED_TOKEN; + +static uint32_t dynamic_macro_led(uint32_t trigger_time, void *cb_arg) { + static bool led_state = true; + if (!is_launching) { + led_state = !led_state; + STATUS_LED_3(led_state); + } + return 100; +} + +void dynamic_macro_record_start_user(void) { + if (my_token == INVALID_DEFERRED_TOKEN) { + STATUS_LED_3(true); + dynamic_macro_token = defer_exec(100, dynamic_macro_led, NULL); + } +} + +void dynamic_macro_record_end_user(int8_t direction) { + if (cancel_deferred_exec(dynamic_macro_token)) { + dynamic_macro_token = INVALID_DEFERRED_TOKEN; + STATUS_LED_3(false); + } +} +# endif + +static uint32_t startup_exec(uint32_t trigger_time, void *cb_arg) { + static uint8_t startup_loop = 0; + + switch (startup_loop++) { + case 0: + STATUS_LED_1(true); + STATUS_LED_2(false); + STATUS_LED_3(false); + STATUS_LED_4(false); + break; + case 1: + STATUS_LED_2(true); + break; + case 2: + STATUS_LED_3(true); + break; + case 3: + STATUS_LED_4(true); + break; + case 4: + STATUS_LED_1(false); + break; + case 5: + STATUS_LED_2(false); + break; + case 6: + STATUS_LED_3(false); + break; + case 7: + STATUS_LED_4(false); + break; + case 8: + is_launching = false; + layer_state_set_kb(layer_state); + return 0; + } + return 250; +} +#endif + +void keyboard_pre_init_kb(void) { + // Initialize Reset pins + gpio_set_pin_input(A8); + gpio_set_pin_output(A9); + gpio_write_pin_low(A9); + + gpio_set_pin_output(B5); + gpio_set_pin_output(B4); + gpio_set_pin_output(B3); + + gpio_write_pin_low(B5); + gpio_write_pin_low(B4); + gpio_write_pin_low(B3); + + keyboard_pre_init_user(); +} + +#if !defined(VOYAGER_USER_LEDS) +layer_state_t layer_state_set_kb(layer_state_t state) { + state = layer_state_set_user(state); + if (is_launching || !keyboard_config.led_level) return state; + + uint8_t layer = get_highest_layer(state); + + STATUS_LED_1(layer & (1 << 0)); + STATUS_LED_2(layer & (1 << 1)); + STATUS_LED_3(layer & (1 << 2)); + +# if !defined(CAPS_LOCK_STATUS) + STATUS_LED_4(layer & (1 << 3)); +# endif + return state; +} +#endif + +#ifdef RGB_MATRIX_ENABLE +// clang-format off +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, C2_2, C1_2, C4_3}, + {0, C2_3, C1_3, C3_3}, + {0, C2_4, C1_4, C3_4}, + {0, C2_5, C1_5, C3_5}, + {0, C2_6, C1_6, C3_6}, + {0, C2_7, C1_7, C3_7}, + {0, C2_8, C1_8, C3_8}, + {0, C8_1, C7_1, C9_1}, + {0, C8_2, C7_2, C9_2}, + {0, C8_3, C7_3, C9_3}, + {0, C8_4, C7_4, C9_4}, + {0, C8_5, C7_5, C9_5}, + {0, C8_6, C7_6, C9_6}, + {0, C2_10, C1_10, C4_11}, + {0, C2_11, C1_11, C3_11}, + {0, C2_12, C1_12, C3_12}, + {0, C2_13, C1_13, C3_13}, + {0, C2_14, C1_14, C3_14}, + {0, C2_15, C1_15, C3_15}, + {0, C2_16, C1_16, C3_16}, + {0, C8_9, C7_9, C9_9}, + {0, C8_10, C7_10, C9_10}, + {0, C8_11, C7_11, C9_11}, + {0, C8_12, C7_12, C9_12}, + {0, C8_13, C7_13, C9_13}, + {0, C8_14, C7_14, C9_14}, + + {1, C2_7, C1_7, C3_7}, + {1, C2_6, C1_6, C3_6}, + {1, C2_5, C1_5, C3_5}, + {1, C2_4, C1_4, C3_4}, + {1, C2_3, C1_3, C3_3}, + {1, C2_2, C1_2, C4_3}, + + {1, C8_5, C7_5, C9_5}, + {1, C8_4, C7_4, C9_4}, + {1, C8_3, C7_3, C9_3}, + {1, C8_2, C7_2, C9_2}, + {1, C8_1, C7_1, C9_1}, + {1, C2_8, C1_8, C3_8}, + + {1, C2_14, C1_14, C3_14}, + {1, C2_13, C1_13, C3_13}, + {1, C2_12, C1_12, C3_12}, + {1, C2_11, C1_11, C3_11}, + {1, C2_10, C1_10, C4_11}, + {1, C8_6, C7_6, C9_6}, + + {1, C8_12, C7_12, C9_12}, + {1, C8_11, C7_11, C9_11}, + {1, C8_10, C7_10, C9_10}, + {1, C8_9, C7_9, C9_9}, + {1, C2_16, C1_16, C3_16}, + {1, C2_15, C1_15, C3_15}, + + {1, C8_14, C7_14, C9_14}, + {1, C8_13, C7_13, C9_13}, +}; +// clang-format on +#endif + +#ifdef SWAP_HANDS_ENABLE +// swap-hands action needs a matrix to define the swap +// clang-format off +const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { + /* Left hand, matrix positions */ + {{6,6}, {5,6}, {4,6}, {3,6}, {2,6}, {1,6},{0,6}}, + {{6,7}, {5,7}, {4,7}, {3,7}, {2,7}, {1,7},{0,7}}, + {{6,8}, {5,8}, {4,8}, {3,8}, {2,8}, {1,8},{0,8}}, + {{6,9}, {5,9}, {4,9}, {3,9}, {2,9}, {1,9},{0,9}}, + {{6,10},{5,10},{4,10},{3,10},{2,10},{1,10},{0,10}}, + {{6,11},{5,11},{4,11},{3,11},{2,11},{1,11},{0,11}}, + /* Right hand, matrix positions */ + {{6,0}, {5,0}, {4,0}, {3,0}, {2,0}, {1,0},{0,0}}, + {{6,1}, {5,1}, {4,1}, {3,1}, {2,1}, {1,1},{0,1}}, + {{6,2}, {5,2}, {4,2}, {3,2}, {2,2}, {1,2},{0,2}}, + {{6,3}, {5,3}, {4,3}, {3,3}, {2,3}, {1,3},{0,3}}, + {{6,4}, {5,4}, {4,4}, {3,4}, {2,4}, {1,4},{0,4}}, + {{6,5}, {5,5}, {4,5}, {3,5}, {2,5}, {1,5},{0,5}}, +}; +// clang-format on +#endif + +#ifdef CAPS_LOCK_STATUS +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + STATUS_LED_4(led_state.caps_lock); + } + return res; +} +#endif + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) { +#if !defined(VOYAGER_USER_LEDS) + case LED_LEVEL: + if (record->event.pressed) { + keyboard_config.led_level ^= 1; + eeconfig_update_kb(keyboard_config.raw); + if (keyboard_config.led_level) { + layer_state_set_kb(layer_state); + } else { + STATUS_LED_1(false); + STATUS_LED_2(false); + STATUS_LED_3(false); + STATUS_LED_4(false); + } + } + break; +#endif +#ifdef RGB_MATRIX_ENABLE + case TOGGLE_LAYER_COLOR: + if (record->event.pressed) { + keyboard_config.disable_layer_led ^= 1; + if (keyboard_config.disable_layer_led) rgb_matrix_set_color_all(0, 0, 0); + } + break; + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } break; + } + } + return false; +#endif + } + return true; +} + +void keyboard_post_init_kb(void) { +#ifdef RGB_MATRIX_ENABLE + rgb_matrix_enable_noeeprom(); +#endif + + keyboard_config.raw = eeconfig_read_kb(); + + if (!keyboard_config.led_level && !keyboard_config.led_level_res) { + keyboard_config.led_level = true; + keyboard_config.led_level_res = 0b11; + eeconfig_update_kb(keyboard_config.raw); + } +#if defined(DEFERRED_EXEC_ENABLE) + is_launching = true; + defer_exec(500, startup_exec, NULL); +#endif + keyboard_post_init_user(); +} + +void eeconfig_init_kb(void) { // EEPROM is getting reset! + keyboard_config.raw = 0; + keyboard_config.led_level = true; + keyboard_config.led_level_res = 0b11; + eeconfig_update_kb(keyboard_config.raw); + eeconfig_init_user(); +} + +__attribute__((weak)) void bootloader_jump(void) { + // The ignition bootloader is checking for a high signal on A8 for 100ms when powering on the board. + // Setting both A8 and A9 high will charge the capacitor quickly. + // Setting A9 low before reset will cause the capacitor to discharge + // thus making the bootloder unlikely to trigger twice between power cycles. + gpio_set_pin_output_push_pull(A9); + gpio_set_pin_output_push_pull(A8); + gpio_write_pin_high(A9); + gpio_write_pin_high(A8); + wait_ms(500); + gpio_write_pin_low(A9); + + NVIC_SystemReset(); +} + +__attribute__((weak)) void mcu_reset(void) { + gpio_set_pin_output_push_pull(A9); + gpio_set_pin_output_push_pull(A8); + gpio_write_pin_low(A8); + gpio_write_pin_low(A9); + + NVIC_SystemReset(); +} diff --git a/keyboards/zsa/voyager/voyager.h b/keyboards/zsa/voyager/voyager.h new file mode 100644 index 00000000000..a00cc995c62 --- /dev/null +++ b/keyboards/zsa/voyager/voyager.h @@ -0,0 +1,35 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "quantum.h" + +extern bool mcp23018_leds[]; + +#define MCP23018_DEFAULT_ADDRESS 0b0100000 + +#define STATUS_LED_1(status) gpio_write_pin(B5, (bool)(status)) +#define STATUS_LED_2(status) gpio_write_pin(B4, (bool)(status)) +#define STATUS_LED_3(status) mcp23018_leds[0] = (bool)(status) +#define STATUS_LED_4(status) mcp23018_leds[1] = (bool)(status) + +enum voyager_keycodes { + TOGGLE_LAYER_COLOR = QK_KB, + LED_LEVEL, +}; + +typedef union { + uint32_t raw; + struct { + bool disable_layer_led : 1; + bool placeholder : 1; + bool led_level : 1; + uint8_t led_level_res : 2; // DO NOT REMOVE + }; +} keyboard_config_t; + +extern keyboard_config_t keyboard_config; + +bool is_transport_connected(void); From 7be23a9cb4f40841fc5394395ecf572a13636943 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:15:34 -0700 Subject: [PATCH 19/23] Data-Driven Keyboard Conversions: I (#23533) --- keyboards/ibm/model_m/mschwingen/info.json | 12 +++++++++++ keyboards/ibm/model_m/mschwingen/rules.mk | 20 +------------------ .../teensypp/{info.json => keyboard.json} | 5 +++++ keyboards/ibm/model_m/teensypp/rules.mk | 12 ----------- .../model_m_4th_gen/overnumpad_1xb/info.json | 11 +++++++++- .../model_m_4th_gen/overnumpad_1xb/rules.mk | 16 --------------- .../rev1/{info.json => keyboard.json} | 6 ++++++ keyboards/ibnuda/squiggle/rev1/rules.mk | 12 ----------- .../idobao/id42/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id42/rules.mk | 4 ---- .../idobao/id61/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id61/rules.mk | 5 ----- .../idobao/id63/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id63/rules.mk | 4 ---- .../idobao/id67/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id67/rules.mk | 4 ---- .../id80/v3/ansi/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id80/v3/ansi/rules.mk | 4 ---- .../id87/v2/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id87/v2/rules.mk | 4 ---- .../montex/v2/{info.json => keyboard.json} | 3 ++- keyboards/idobao/montex/v2/rules.mk | 4 ---- keyboards/ingrained/info.json | 12 ++++++++++- keyboards/ingrained/rules.mk | 15 -------------- keyboards/inland/kb83/info.json | 9 +++++++++ keyboards/inland/kb83/rules.mk | 18 +---------------- .../input_club/ergodox_infinity/info.json | 12 +++++++++++ .../input_club/ergodox_infinity/rules.mk | 19 ------------------ 28 files changed, 81 insertions(+), 148 deletions(-) rename keyboards/ibm/model_m/teensypp/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ibm/model_m/teensypp/rules.mk rename keyboards/ibnuda/squiggle/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ibnuda/squiggle/rev1/rules.mk rename keyboards/idobao/id42/{info.json => keyboard.json} (99%) delete mode 100755 keyboards/idobao/id42/rules.mk rename keyboards/idobao/id61/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id61/rules.mk rename keyboards/idobao/id63/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id63/rules.mk rename keyboards/idobao/id67/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id67/rules.mk rename keyboards/idobao/id80/v3/ansi/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id80/v3/ansi/rules.mk rename keyboards/idobao/id87/v2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id87/v2/rules.mk rename keyboards/idobao/montex/v2/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/idobao/montex/v2/rules.mk diff --git a/keyboards/ibm/model_m/mschwingen/info.json b/keyboards/ibm/model_m/mschwingen/info.json index ce740e4a548..0deb57ed038 100644 --- a/keyboards/ibm/model_m/mschwingen/info.json +++ b/keyboards/ibm/model_m/mschwingen/info.json @@ -16,6 +16,18 @@ }, "processor": "atmega32u4", "bootloader": "lufa-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "key_lock": true, + "dynamic_macro": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk index 7d81ffe326b..c86801e4090 100644 --- a/keyboards/ibm/model_m/mschwingen/rules.mk +++ b/keyboards/ibm/model_m/mschwingen/rules.mk @@ -1,20 +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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite -KEY_LOCK_ENABLE = yes - -DYNAMIC_MACRO_ENABLE = yes UART_DEBUG = no @@ -22,8 +6,6 @@ SRC += matrix.c UART_DRIVER_REQUIRED = yes SPI_DRIVER_REQUIRED = yes -OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS2812 LEDs - -LTO_ENABLE = yes +OPT_DEFS += -DSLEEP_LED_ENABLE DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired diff --git a/keyboards/ibm/model_m/teensypp/info.json b/keyboards/ibm/model_m/teensypp/keyboard.json similarity index 98% rename from keyboards/ibm/model_m/teensypp/info.json rename to keyboards/ibm/model_m/teensypp/keyboard.json index dcbed72aebf..4464a299f6d 100644 --- a/keyboards/ibm/model_m/teensypp/info.json +++ b/keyboards/ibm/model_m/teensypp/keyboard.json @@ -15,6 +15,11 @@ "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ibm/model_m/teensypp/rules.mk b/keyboards/ibm/model_m/teensypp/rules.mk deleted file mode 100644 index 1eeda920b40..00000000000 --- a/keyboards/ibm/model_m/teensypp/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 = 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 diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json index 37fddaaf8f1..0f67e6606d7 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "indicators": { "caps_lock": "C11", @@ -16,6 +19,12 @@ "processor": "STM32F446", // RET6 "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "haptic": true + }, "matrix_pins": { // All pins in order from left-to-right, as seen on the keyboard: // C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk +++ b/keyboards/ibm/model_m_4th_gen/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/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/keyboard.json similarity index 99% rename from keyboards/ibnuda/squiggle/rev1/info.json rename to keyboards/ibnuda/squiggle/rev1/keyboard.json index 862b6323b02..3baafefc841 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/keyboard.json @@ -19,6 +19,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true + }, "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT": { diff --git a/keyboards/ibnuda/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk deleted file mode 100644 index 2382d570350..00000000000 --- a/keyboards/ibnuda/squiggle/rev1/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 = no # 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 diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/keyboard.json similarity index 99% rename from keyboards/idobao/id42/info.json rename to keyboards/idobao/id42/keyboard.json index ace2033493b..14db7641eab 100644 --- a/keyboards/idobao/id42/info.json +++ b/keyboards/idobao/id42/keyboard.json @@ -10,7 +10,8 @@ "extrakey": true, "console": false, "command": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "B3" diff --git a/keyboards/idobao/id42/rules.mk b/keyboards/idobao/id42/rules.mk deleted file mode 100755 index 58e39b17a55..00000000000 --- a/keyboards/idobao/id42/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/keyboard.json similarity index 99% rename from keyboards/idobao/id61/info.json rename to keyboards/idobao/id61/keyboard.json index 0b1c51279de..cb55f1750dd 100644 --- a/keyboards/idobao/id61/info.json +++ b/keyboards/idobao/id61/keyboard.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "F0" diff --git a/keyboards/idobao/id61/rules.mk b/keyboards/idobao/id61/rules.mk deleted file mode 100644 index ed51a576218..00000000000 --- a/keyboards/idobao/id61/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2022 Vino Rodrigues (@vinorodrigues) -# SPDX-License-Identifier: GPL-2.0-or-later -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/keyboard.json similarity index 99% rename from keyboards/idobao/id63/info.json rename to keyboards/idobao/id63/keyboard.json index 573fb440303..1969ca4cf75 100644 --- a/keyboards/idobao/id63/info.json +++ b/keyboards/idobao/id63/keyboard.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "B7" diff --git a/keyboards/idobao/id63/rules.mk b/keyboards/idobao/id63/rules.mk deleted file mode 100644 index 58e39b17a55..00000000000 --- a/keyboards/idobao/id63/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/keyboard.json similarity index 99% rename from keyboards/idobao/id67/info.json rename to keyboards/idobao/id67/keyboard.json index 7c5308d3156..64c3623fd69 100644 --- a/keyboards/idobao/id67/info.json +++ b/keyboards/idobao/id67/keyboard.json @@ -10,7 +10,8 @@ "extrakey": true, "command": false, "console": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "F0" diff --git a/keyboards/idobao/id67/rules.mk b/keyboards/idobao/id67/rules.mk deleted file mode 100644 index 4341508fde4..00000000000 --- a/keyboards/idobao/id67/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -RGB_MATRIX_ENABLE = yes # Enable RGB Matrix feature diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/keyboard.json similarity index 99% rename from keyboards/idobao/id80/v3/ansi/info.json rename to keyboards/idobao/id80/v3/ansi/keyboard.json index 19dc8c67a70..6200c2e88c9 100644 --- a/keyboards/idobao/id80/v3/ansi/info.json +++ b/keyboards/idobao/id80/v3/ansi/keyboard.json @@ -10,7 +10,8 @@ "extrakey": true, "console": false, "command": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "rgb_matrix": { "animations": { diff --git a/keyboards/idobao/id80/v3/ansi/rules.mk b/keyboards/idobao/id80/v3/ansi/rules.mk deleted file mode 100644 index 58e39b17a55..00000000000 --- a/keyboards/idobao/id80/v3/ansi/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/keyboard.json similarity index 99% rename from keyboards/idobao/id87/v2/info.json rename to keyboards/idobao/id87/v2/keyboard.json index 4a6099207c2..0ece932274f 100644 --- a/keyboards/idobao/id87/v2/info.json +++ b/keyboards/idobao/id87/v2/keyboard.json @@ -10,7 +10,8 @@ "extrakey": true, "console": false, "command": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "E2" diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk deleted file mode 100644 index 58e39b17a55..00000000000 --- a/keyboards/idobao/id87/v2/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/keyboard.json similarity index 98% rename from keyboards/idobao/montex/v2/info.json rename to keyboards/idobao/montex/v2/keyboard.json index aefc3e45611..6c00fd538d5 100755 --- a/keyboards/idobao/montex/v2/info.json +++ b/keyboards/idobao/montex/v2/keyboard.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "B1" diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk deleted file mode 100755 index d249ac15a7c..00000000000 --- a/keyboards/idobao/montex/v2/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally mostly left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json index d9259d5f322..ec6422fb0ff 100644 --- a/keyboards/ingrained/info.json +++ b/keyboards/ingrained/info.json @@ -6,10 +6,20 @@ "usb": { "vid": "0xB33F", "pid": "0x58E4", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "unicode": true + }, + "build": { + "lto": true + }, "community_layouts": ["split_3x5_3", "split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { diff --git a/keyboards/ingrained/rules.mk b/keyboards/ingrained/rules.mk index e9a8002f902..c04c3c92ed3 100644 --- a/keyboards/ingrained/rules.mk +++ b/keyboards/ingrained/rules.mk @@ -1,19 +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 = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite -NO_USB_STARTUP_CHECK = yes -LTO_ENABLE = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json index b4396fb630e..31ca8f1bda9 100644 --- a/keyboards/inland/kb83/info.json +++ b/keyboards/inland/kb83/info.json @@ -34,6 +34,15 @@ }, "processor": "WB32FQ95", "bootloader": "wb32-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true, + "encoder": true + }, "matrix_pins": { "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/inland/kb83/rules.mk b/keyboards/inland/kb83/rules.mk index aefdb5a168d..2bdd4fd92e8 100644 --- a/keyboards/inland/kb83/rules.mk +++ b/keyboards/inland/kb83/rules.mk @@ -1,17 +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 -KEYBOARD_SHARED_EP = no -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 -DIP_SWITCH_ENABLE = yes # DPI Switch -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes -#RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED +#RGB_MATRIX_CUSTOM_USER = yes diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json index 51bf7a5f126..6f47d72685f 100644 --- a/keyboards/input_club/ergodox_infinity/info.json +++ b/keyboards/input_club/ergodox_infinity/info.json @@ -43,6 +43,18 @@ }, "processor": "MK20DX256", "bootloader": "kiibohd", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "led_matrix": true, + "unicode": true, + "swap_hands": true, + "sleep_led": true, + "st7565": true + }, "board": "IC_TEENSY_3_1", "tapping": { "toggle": 1 diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk index da68a7f25d1..c6e29883213 100644 --- a/keyboards/input_club/ergodox_infinity/rules.mk +++ b/keyboards/input_club/ergodox_infinity/rules.mk @@ -1,20 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -UNICODE_ENABLE = yes # Unicode -SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard -SLEEP_LED_ENABLE = yes - -RGBLIGHT_ENABLE = no - SERIAL_DRIVER = usart - -ST7565_ENABLE = yes - -LED_MATRIX_ENABLE = yes From baa6000ed33f1f190f43bcd993f84f3b057e952d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:36:21 -0700 Subject: [PATCH 20/23] Data-Driven Keyboard Conversions: H, Part 3 (#23530) --- .../novem/{info.json => keyboard.json} | 5 +++++ keyboards/handwired/novem/rules.mk | 12 ------------ .../handwired/onekey/bluepill_f103c6/info.json | 3 +++ .../handwired/onekey/bluepill_f103c6/rules.mk | 3 --- .../onekey/kb2040/{info.json => keyboard.json} | 3 +++ keyboards/handwired/onekey/kb2040/rules.mk | 1 - .../orbweaver/{info.json => keyboard.json} | 3 ++- keyboards/handwired/orbweaver/rules.mk | 2 -- keyboards/handwired/ortho_brass/info.json | 6 ++++++ keyboards/handwired/ortho_brass/rules.mk | 10 ---------- .../osborne1/{info.json => keyboard.json} | 3 ++- keyboards/handwired/osborne1/rules.mk | 1 - keyboards/handwired/owlet60/info.json | 7 +++++++ keyboards/handwired/owlet60/rules.mk | 13 ------------- .../mini/{info.json => keyboard.json} | 9 ++++++++- keyboards/handwired/postageboard/mini/rules.mk | 12 ------------ .../r1/{info.json => keyboard.json} | 9 ++++++++- keyboards/handwired/postageboard/r1/rules.mk | 12 ------------ keyboards/handwired/promethium/info.json | 12 ++++++++++++ keyboards/handwired/promethium/rules.mk | 17 ----------------- keyboards/handwired/pterodactyl/info.json | 9 +++++++++ keyboards/handwired/pterodactyl/rules.mk | 14 -------------- .../riblee_f401/{info.json => keyboard.json} | 12 +++++++++++- keyboards/handwired/riblee_f401/rules.mk | 13 ------------- .../riblee_f411/{info.json => keyboard.json} | 11 ++++++++++- keyboards/handwired/riblee_f411/rules.mk | 13 ------------- .../scottoslant/{info.json => keyboard.json} | 3 +++ .../handwired/scottokeebs/scottoslant/rules.mk | 1 - keyboards/handwired/slash/info.json | 6 ++++++ keyboards/handwired/slash/rules.mk | 14 -------------- keyboards/handwired/split65/stm32/info.json | 7 +++++++ keyboards/handwired/split65/stm32/rules.mk | 13 ------------- .../handwired/splittest/bluepill/keyboard.json | 8 +++++++- .../handwired/splittest/promicro/keyboard.json | 8 +++++++- keyboards/handwired/splittest/rules.mk | 12 ------------ .../handwired/splittest/teensy_2/keyboard.json | 8 +++++++- keyboards/handwired/trackpoint/info.json | 9 +++++++++ keyboards/handwired/trackpoint/rules.mk | 14 -------------- .../tractyl_manuform/4x6_right/info.json | 7 +++++++ .../tractyl_manuform/4x6_right/rules.mk | 15 --------------- .../elite_c/{info.json => keyboard.json} | 5 ++++- .../tractyl_manuform/5x6_right/elite_c/rules.mk | 5 ----- .../tractyl_manuform/5x6_right/f303/info.json | 5 ++++- .../tractyl_manuform/5x6_right/f303/rules.mk | 1 - .../tractyl_manuform/5x6_right/f411/info.json | 3 +++ .../tractyl_manuform/5x6_right/f411/rules.mk | 1 - .../tractyl_manuform/5x6_right/info.json | 8 ++++++++ .../tractyl_manuform/5x6_right/rules.mk | 15 --------------- keyboards/handwired/twadlee/tp69/info.json | 7 +++++++ keyboards/handwired/twadlee/tp69/rules.mk | 15 --------------- keyboards/handwired/unk/rev1/keyboard.json | 6 ++++++ keyboards/handwired/unk/rules.mk | 13 ------------- keyboards/handwired/uthol/rev3/info.json | 9 +++++++++ keyboards/handwired/uthol/rev3/rules.mk | 10 ---------- keyboards/handwired/wulkan/info.json | 6 ++++++ keyboards/handwired/wulkan/rules.mk | 12 ------------ keyboards/handwired/xealous/rev1/keyboard.json | 9 +++++++++ keyboards/handwired/xealous/rules.mk | 13 ------------- 58 files changed, 195 insertions(+), 288 deletions(-) rename keyboards/handwired/novem/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/handwired/novem/rules.mk rename keyboards/handwired/onekey/kb2040/{info.json => keyboard.json} (83%) delete mode 100644 keyboards/handwired/onekey/kb2040/rules.mk rename keyboards/handwired/orbweaver/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/orbweaver/rules.mk rename keyboards/handwired/osborne1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/osborne1/rules.mk rename keyboards/handwired/postageboard/mini/{info.json => keyboard.json} (53%) delete mode 100644 keyboards/handwired/postageboard/mini/rules.mk rename keyboards/handwired/postageboard/r1/{info.json => keyboard.json} (53%) delete mode 100644 keyboards/handwired/postageboard/r1/rules.mk rename keyboards/handwired/riblee_f401/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/riblee_f401/rules.mk rename keyboards/handwired/riblee_f411/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/riblee_f411/rules.mk rename keyboards/handwired/scottokeebs/scottoslant/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/scottokeebs/scottoslant/rules.mk rename keyboards/handwired/tractyl_manuform/5x6_right/elite_c/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk diff --git a/keyboards/handwired/novem/info.json b/keyboards/handwired/novem/keyboard.json similarity index 90% rename from keyboards/handwired/novem/info.json rename to keyboards/handwired/novem/keyboard.json index bc70d64ed44..bc4fe2c1c95 100644 --- a/keyboards/handwired/novem/info.json +++ b/keyboards/handwired/novem/keyboard.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/novem/rules.mk b/keyboards/handwired/novem/rules.mk deleted file mode 100644 index ca9d24172d0..00000000000 --- a/keyboards/handwired/novem/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 = 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 diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json index 9460b43f5f4..4267222cfc9 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/info.json +++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json @@ -15,5 +15,8 @@ "apa102": { "data_pin": "A1", "clock_pin": "A2" + }, + "build": { + "lto": true } } diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk index 71bc488563a..c37cc1dc1fa 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk +++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk @@ -7,9 +7,6 @@ BOOTLOADER_TYPE = stm32duino DFU_ARGS = -d 1EAF:0003 -a 2 -R DFU_SUFFIX_ARGS = -v 1EAF -p 0003 -# LTO is required to fit the firmware into the available 24K of flash -LTO_ENABLE = yes - # EEPROM emulation not supported yet (need to implement a proper firmware size # check first, otherwise the chance of the EEPROM backing store overwriting # some part of the firmware code is really high). diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/keyboard.json similarity index 83% rename from keyboards/handwired/onekey/kb2040/info.json rename to keyboards/handwired/onekey/kb2040/keyboard.json index 5c0c92ef5de..3c099342271 100644 --- a/keyboards/handwired/onekey/kb2040/info.json +++ b/keyboards/handwired/onekey/kb2040/keyboard.json @@ -8,5 +8,8 @@ "ws2812": { "pin": "GP17", "driver": "vendor" + }, + "features": { + "oled": true } } diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/handwired/onekey/kb2040/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/keyboard.json similarity index 97% rename from keyboards/handwired/orbweaver/info.json rename to keyboards/handwired/orbweaver/keyboard.json index 14c87182563..5ba08dfc2d5 100644 --- a/keyboards/handwired/orbweaver/info.json +++ b/keyboards/handwired/orbweaver/keyboard.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "rgb_matrix": { "center_point": [40, 30], diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk deleted file mode 100644 index 01f9d9397ae..00000000000 --- a/keyboards/handwired/orbweaver/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Add support for 3731 RGB matrix controller -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json index b2280b62040..5cd01b1f6d6 100644 --- a/keyboards/handwired/ortho_brass/info.json +++ b/keyboards/handwired/ortho_brass/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "community_layouts": ["ortho_4x12"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" diff --git a/keyboards/handwired/ortho_brass/rules.mk b/keyboards/handwired/ortho_brass/rules.mk index 36acc6fd924..6642cf3a9c4 100644 --- a/keyboards/handwired/ortho_brass/rules.mk +++ b/keyboards/handwired/ortho_brass/rules.mk @@ -1,11 +1 @@ -# Build Options -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 RGB underlight. - RGBLIGHT_SUPPORTED = no diff --git a/keyboards/handwired/osborne1/info.json b/keyboards/handwired/osborne1/keyboard.json similarity index 98% rename from keyboards/handwired/osborne1/info.json rename to keyboards/handwired/osborne1/keyboard.json index 2f613b5876d..8cbcb3cc8bb 100644 --- a/keyboards/handwired/osborne1/info.json +++ b/keyboards/handwired/osborne1/keyboard.json @@ -10,7 +10,8 @@ "console": true, "extrakey": false, "mousekey": false, - "nkro": false + "nkro": false, + "bluetooth": true }, "bluetooth": { "driver": "bluefruit_le" diff --git a/keyboards/handwired/osborne1/rules.mk b/keyboards/handwired/osborne1/rules.mk deleted file mode 100644 index 9ccac102c70..00000000000 --- a/keyboards/handwired/osborne1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json index f6bd2d2f239..8108f51985d 100644 --- a/keyboards/handwired/owlet60/info.json +++ b/keyboards/handwired/owlet60/info.json @@ -32,6 +32,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "debounce": 9, "community_layouts": ["alice", "alice_split_bs"], "layout_aliases": { diff --git a/keyboards/handwired/owlet60/rules.mk b/keyboards/handwired/owlet60/rules.mk index dd125034f29..09c02c88b0d 100644 --- a/keyboards/handwired/owlet60/rules.mk +++ b/keyboards/handwired/owlet60/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes -OLED_ENABLE = no SRC += matrix.c diff --git a/keyboards/handwired/postageboard/mini/info.json b/keyboards/handwired/postageboard/mini/keyboard.json similarity index 53% rename from keyboards/handwired/postageboard/mini/info.json rename to keyboards/handwired/postageboard/mini/keyboard.json index b6944f2916d..13e83147bbd 100644 --- a/keyboards/handwired/postageboard/mini/info.json +++ b/keyboards/handwired/postageboard/mini/keyboard.json @@ -8,5 +8,12 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + } } diff --git a/keyboards/handwired/postageboard/mini/rules.mk b/keyboards/handwired/postageboard/mini/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/handwired/postageboard/mini/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/postageboard/r1/info.json b/keyboards/handwired/postageboard/r1/keyboard.json similarity index 53% rename from keyboards/handwired/postageboard/r1/info.json rename to keyboards/handwired/postageboard/r1/keyboard.json index a1ea87df869..78ab5d028e0 100644 --- a/keyboards/handwired/postageboard/r1/info.json +++ b/keyboards/handwired/postageboard/r1/keyboard.json @@ -8,5 +8,12 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + } } diff --git a/keyboards/handwired/postageboard/r1/rules.mk b/keyboards/handwired/postageboard/r1/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/handwired/postageboard/r1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json index c26325069b4..6ee1ed8ca19 100644 --- a/keyboards/handwired/promethium/info.json +++ b/keyboards/handwired/promethium/info.json @@ -16,6 +16,18 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "ps2_mouse": true, + "ps2": true, + "bluetooth": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk index d6b97ed8100..7f208800663 100644 --- a/keyboards/handwired/promethium/rules.mk +++ b/keyboards/handwired/promethium/rules.mk @@ -1,28 +1,11 @@ # 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 = 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 = no # Enable WS2812 RGB underlight. -PS2_MOUSE_ENABLE = yes -PS2_ENABLE = yes PS2_DRIVER = interrupt CUSTOM_MATRIX = yes -BLUETOOTH_ENABLE = yes WS2812_DRIVER_REQUIRED = yes ANALOG_DRIVER_REQUIRED = yes SRC += rgbsps.c SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/info.json index ad83f34999d..fac20aeebe1 100644 --- a/keyboards/handwired/pterodactyl/info.json +++ b/keyboards/handwired/pterodactyl/info.json @@ -10,6 +10,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "nkro": true, + "unicode": true, + "bluetooth": true + }, "debounce": 0, "tapping": { "toggle": 1 diff --git a/keyboards/handwired/pterodactyl/rules.mk b/keyboards/handwired/pterodactyl/rules.mk index 108e1498a83..e332a03eaac 100644 --- a/keyboards/handwired/pterodactyl/rules.mk +++ b/keyboards/handwired/pterodactyl/rules.mk @@ -1,21 +1,7 @@ # 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 = 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 -UNICODE_ENABLE = yes CUSTOM_MATRIX = yes -BLUETOOTH_ENABLE = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/keyboard.json similarity index 93% rename from keyboards/handwired/riblee_f401/info.json rename to keyboards/handwired/riblee_f401/keyboard.json index 933973d5f39..18d46b55cd0 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0xFEED", "pid": "0x002A", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "tapping": { "term": 175 @@ -22,6 +25,13 @@ }, "processor": "STM32F401", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true + }, "board": "BLACKPILL_STM32_F401", "community_layouts": ["ortho_5x12"], "layouts": { diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk deleted file mode 100644 index 4c2d255a184..00000000000 --- a/keyboards/handwired/riblee_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 -KEYBOARD_SHARED_EP = yes -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/keyboard.json similarity index 94% rename from keyboards/handwired/riblee_f411/info.json rename to keyboards/handwired/riblee_f411/keyboard.json index 1c957e99404..9c7df63b3e1 100644 --- a/keyboards/handwired/riblee_f411/info.json +++ b/keyboards/handwired/riblee_f411/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0xFEED", "pid": "0x002B", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "tapping": { "term": 175 @@ -18,6 +21,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "BLACKPILL_STM32_F411", "community_layouts": ["ortho_5x12"], "layouts": { diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk deleted file mode 100644 index 4741169e4db..00000000000 --- a/keyboards/handwired/riblee_f411/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# 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 -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra -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/handwired/scottokeebs/scottoslant/info.json b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json similarity index 98% rename from keyboards/handwired/scottokeebs/scottoslant/info.json rename to keyboards/handwired/scottokeebs/scottoslant/keyboard.json index ebaa1b530c2..8c9de39cd6d 100644 --- a/keyboards/handwired/scottokeebs/scottoslant/info.json +++ b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json @@ -12,6 +12,9 @@ "mousekey": true, "nkro": true }, + "build": { + "lto": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/scottokeebs/scottoslant/rules.mk b/keyboards/handwired/scottokeebs/scottoslant/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/handwired/scottokeebs/scottoslant/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/info.json index 95abaeb9c71..4fd99ebeee3 100644 --- a/keyboards/handwired/slash/info.json +++ b/keyboards/handwired/slash/info.json @@ -18,6 +18,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "bluetooth": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/slash/rules.mk b/keyboards/handwired/slash/rules.mk index ca7f6f843fb..3437a35bdf1 100644 --- a/keyboards/handwired/slash/rules.mk +++ b/keyboards/handwired/slash/rules.mk @@ -1,16 +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 = 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/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json index a9693b3a5b9..d49339da021 100644 --- a/keyboards/handwired/split65/stm32/info.json +++ b/keyboards/handwired/split65/stm32/info.json @@ -11,6 +11,13 @@ }, "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "audio": true, + "oled": true + }, "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/split65/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk index 94186bf8c72..c6e29883213 100644 --- a/keyboards/handwired/split65/stm32/rules.mk +++ b/keyboards/handwired/split65/stm32/rules.mk @@ -1,14 +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 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output -OLED_ENABLE = yes SERIAL_DRIVER = usart diff --git a/keyboards/handwired/splittest/bluepill/keyboard.json b/keyboards/handwired/splittest/bluepill/keyboard.json index 17b7f86a6f8..28e7d091f83 100644 --- a/keyboards/handwired/splittest/bluepill/keyboard.json +++ b/keyboards/handwired/splittest/bluepill/keyboard.json @@ -5,5 +5,11 @@ }, "diode_direction": "COL2ROW", "processor": "STM32F103", - "bootloader": "stm32duino" + "bootloader": "stm32duino", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true + } } diff --git a/keyboards/handwired/splittest/promicro/keyboard.json b/keyboards/handwired/splittest/promicro/keyboard.json index f3765207656..2f5929cc008 100644 --- a/keyboards/handwired/splittest/promicro/keyboard.json +++ b/keyboards/handwired/splittest/promicro/keyboard.json @@ -11,5 +11,11 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true + } } diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk index 8d00fcc579f..ae4d823b53e 100644 --- a/keyboards/handwired/splittest/rules.mk +++ b/keyboards/handwired/splittest/rules.mk @@ -1,13 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = 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 - DEFAULT_FOLDER = handwired/splittest/promicro diff --git a/keyboards/handwired/splittest/teensy_2/keyboard.json b/keyboards/handwired/splittest/teensy_2/keyboard.json index 72e9d022b94..68ab3f92c4e 100644 --- a/keyboards/handwired/splittest/teensy_2/keyboard.json +++ b/keyboards/handwired/splittest/teensy_2/keyboard.json @@ -11,5 +11,11 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "halfkay" + "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true + } } diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json index 92098b09c64..94ed022878f 100644 --- a/keyboards/handwired/trackpoint/info.json +++ b/keyboards/handwired/trackpoint/info.json @@ -15,6 +15,15 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "ps2": true, + "ps2_mouse": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/trackpoint/rules.mk b/keyboards/handwired/trackpoint/rules.mk index ca3836ef06b..74035c9903b 100644 --- a/keyboards/handwired/trackpoint/rules.mk +++ b/keyboards/handwired/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -PS2_MOUSE_ENABLE = yes -PS2_ENABLE = yes PS2_DRIVER = usart diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index aa01e763eb4..825c59ac725 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -29,6 +29,13 @@ }, "processor": "at90usb1286", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "pointing_device": true + }, "layouts": { "LAYOUT_4x6_right": { "layout": [ diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk index 0b23bdc61ff..0f3d0657aa4 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk @@ -1,17 +1,2 @@ -# 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 -RGB_MATRIX_ENABLE = no - -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = yes diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json similarity index 88% rename from keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json index 92e0baace1f..e6c0e42bde9 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json @@ -22,5 +22,8 @@ "split_count": [10, 10] }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "build": { + "lto": true + } } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk deleted file mode 100644 index 16c76d7f49b..00000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -LTO_ENABLE := yes -RGBLIGHT_ENABLE = no -OLED_ENABLE = no -AUDIO_ENABLE = no -ENCODER_ENABLE = no diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json index eafb77fce2b..0bcc02fd743 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -22,5 +22,8 @@ ] }, "processor": "STM32F303", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "features": { + "console": true + } } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk index ab601e31f9a..23f790a1ad4 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk @@ -1,5 +1,4 @@ # KEYBOARD_SHARED_EP = yes -CONSOLE_ENABLE = yes SERIAL_DRIVER = usart AUDIO_DRIVER = dac_additive diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json index e5a6dc6c7a2..3821f0380f2 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -26,5 +26,8 @@ }, "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "console": true + }, "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk index 0c4b05ee7e2..e75692030f7 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk @@ -1,5 +1,4 @@ KEYBOARD_SHARED_EP = yes -CONSOLE_ENABLE = yes MOUSE_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json index c9fe6e89cff..b28f309fdbb 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json @@ -10,6 +10,14 @@ "matrix": [6, 5] } }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "swap_hands": true, + "pointing_device": true + }, "layouts": { "LAYOUT_5x6_right": { "layout": [ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk index 220a361a4cc..b7f7c949ec4 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/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 -SWAP_HANDS_ENABLE = yes - -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = yes diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json index afd79a9bcc6..27e0325f92d 100644 --- a/keyboards/handwired/twadlee/tp69/info.json +++ b/keyboards/handwired/twadlee/tp69/info.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "MKL26Z64", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/twadlee/tp69/rules.mk b/keyboards/handwired/twadlee/tp69/rules.mk index b73afc0e44a..43b04f34f77 100644 --- a/keyboards/handwired/twadlee/tp69/rules.mk +++ b/keyboards/handwired/twadlee/tp69/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 -PS2_MOUSE_ENABLE = no - USE_CHIBIOS_CONTRIB = yes - diff --git a/keyboards/handwired/unk/rev1/keyboard.json b/keyboards/handwired/unk/rev1/keyboard.json index fc1cfc90b72..acaca15f3b3 100644 --- a/keyboards/handwired/unk/rev1/keyboard.json +++ b/keyboards/handwired/unk/rev1/keyboard.json @@ -31,6 +31,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk index a03f28dbf5f..d4536e0cbb6 100644 --- a/keyboards/handwired/unk/rules.mk +++ b/keyboards/handwired/unk/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/unk/rev1 diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json index dbbce9139dc..a90e7a4a895 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/info.json @@ -39,5 +39,14 @@ }, "processor": "STM32F401", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "nkro": true, + "oled": true, + "wpm": true, + "extrakey": true, + "encoder": true, + "rgblight": true + }, "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk index 1577cf8a775..1071cf62ee3 100644 --- a/keyboards/handwired/uthol/rev3/rules.mk +++ b/keyboards/handwired/uthol/rev3/rules.mk @@ -1,11 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes -NKRO_ENABLE = yes KEYBOARD_SHARED_EP = yes -OLED_ENABLE = yes -WPM_ENABLE = yes -EXTRAKEY_ENABLE = yes -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json index 9bb1d9cd940..b6823af5396 100644 --- a/keyboards/handwired/wulkan/info.json +++ b/keyboards/handwired/wulkan/info.json @@ -16,6 +16,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], "layout_aliases": { diff --git a/keyboards/handwired/wulkan/rules.mk b/keyboards/handwired/wulkan/rules.mk index e664c345408..934dd273a65 100644 --- a/keyboards/handwired/wulkan/rules.mk +++ b/keyboards/handwired/wulkan/rules.mk @@ -1,13 +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 = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no NO_SUSPEND_POWER_DOWN = yes diff --git a/keyboards/handwired/xealous/rev1/keyboard.json b/keyboards/handwired/xealous/rev1/keyboard.json index 001cd82074c..9f926a36021 100644 --- a/keyboards/handwired/xealous/rev1/keyboard.json +++ b/keyboards/handwired/xealous/rev1/keyboard.json @@ -22,6 +22,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "audio": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk index aa77674920d..4a97d066df7 100644 --- a/keyboards/handwired/xealous/rules.mk +++ b/keyboards/handwired/xealous/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = 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 = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - SRC += matrix.c DEFAULT_FOLDER = handwired/xealous/rev1 From e869c80af74a91d28e51628da495e66da0cbc3ce Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 17 Apr 2024 02:49:17 +0100 Subject: [PATCH 21/23] Migrate build target markers to keyboard.json - HI (#23540) --- .../hadron/ver3/{info.json => keyboard.json} | 0 .../halfcliff/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../handwired/42/{info.json => keyboard.json} | 0 .../aball/{info.json => keyboard.json} | 0 .../alcor_dactyl/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../bdn9_ble/{info.json => keyboard.json} | 0 .../cyberstar/{info.json => keyboard.json} | 0 .../d48/{info.json => keyboard.json} | 0 .../dactyl/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../datahand/{info.json => keyboard.json} | 0 .../dqz11n1g/{info.json => keyboard.json} | 0 .../frenchdev/{info.json => keyboard.json} | 0 .../fruity60/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../lagrange/{info.json => keyboard.json} | 0 .../5x5_macropad/{info.json => keyboard.json} | 0 .../f411/{info.json => keyboard.json} | 0 .../meck_tkl/blackpill_f401/info.json | 14 ----- .../keyboard.json} | 23 ++++++++- .../meck_tkl/blackpill_f401/rules.mk | 4 -- keyboards/handwired/meck_tkl/config.h | 9 ---- .../{info.json => keyboard.json} | 5 ++ .../handwired/onekey/blackpill_f401/rules.mk | 1 - .../{info.json => keyboard.json} | 5 ++ .../onekey/blackpill_f401_tinyuf2/rules.mk | 1 - .../{info.json => keyboard.json} | 5 ++ .../handwired/onekey/blackpill_f411/rules.mk | 1 - .../{info.json => keyboard.json} | 5 ++ .../onekey/blackpill_f411_tinyuf2/rules.mk | 1 - .../{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../evb_wb32fq95/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../teensy_lc/{info.json => keyboard.json} | 0 .../ortho_brass/{info.json => keyboard.json} | 0 .../owlet60/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 5 ++ .../handwired/pill60/blackpill_f401/rules.mk | 4 -- .../{info.json => keyboard.json} | 5 ++ .../handwired/pill60/blackpill_f411/rules.mk | 4 -- .../feather/{info.json => keyboard.json} | 10 ++++ keyboards/handwired/prkl30/feather/rules.mk | 16 ------ .../promethium/{info.json => keyboard.json} | 0 .../pterodactyl/{info.json => keyboard.json} | 0 .../riblee_split/{info.json => keyboard.json} | 0 .../slash/{info.json => keyboard.json} | 0 .../stm32/{info.json => keyboard.json} | 0 .../trackpoint/{info.json => keyboard.json} | 0 .../4x6_right/{info.json => keyboard.json} | 0 .../f303/{info.json => keyboard.json} | 0 .../f411/{info.json => keyboard.json} | 0 .../twadlee/tp69/{info.json => keyboard.json} | 0 .../uthol/rev3/{info.json => keyboard.json} | 5 +- keyboards/handwired/uthol/rev3/rules.mk | 1 - .../wulkan/{info.json => keyboard.json} | 0 .../handwire/{info.json => keyboard.json} | 0 .../bad_wings/{info.json => keyboard.json} | 0 .../ansi/32u2/{info.json => keyboard.json} | 0 .../hhkb/jp/{info.json => keyboard.json} | 0 .../hhkb/yang/{info.json => keyboard.json} | 0 .../46/0_1/{info.json => keyboard.json} | 0 keyboards/hillside/46/0_1/rules.mk | 5 -- .../48/0_1/{info.json => keyboard.json} | 0 keyboards/hillside/48/0_1/rules.mk | 5 -- .../52/0_1/{info.json => keyboard.json} | 0 keyboards/hillside/52/0_1/rules.mk | 5 -- .../hbcp/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../lemon40/{info.json => keyboard.json} | 0 .../nyx/rev1/{info.json => keyboard.json} | 0 keyboards/hotdox/{info.json => keyboard.json} | 0 .../hs60/v1/{info.json => keyboard.json} | 0 .../hs60/v2/ansi/{info.json => keyboard.json} | 0 .../hs60/v2/hhkb/{info.json => keyboard.json} | 0 .../hs60/v2/iso/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../ingrained/{info.json => keyboard.json} | 0 .../inland/kb83/{info.json => keyboard.json} | 0 keyboards/inland/kb83/rgb_matrix_kb.inc | 51 ------------------- keyboards/inland/kb83/rules.mk | 1 - .../{info.json => keyboard.json} | 0 84 files changed, 66 insertions(+), 125 deletions(-) rename keyboards/hadron/ver3/{info.json => keyboard.json} (100%) rename keyboards/halfcliff/{info.json => keyboard.json} (100%) rename keyboards/handwired/108key_trackpoint/{info.json => keyboard.json} (100%) rename keyboards/handwired/42/{info.json => keyboard.json} (100%) rename keyboards/handwired/aball/{info.json => keyboard.json} (100%) rename keyboards/handwired/alcor_dactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/battleship_gamepad/{info.json => keyboard.json} (100%) rename keyboards/handwired/bdn9_ble/{info.json => keyboard.json} (100%) rename keyboards/handwired/cyberstar/{info.json => keyboard.json} (100%) rename keyboards/handwired/d48/{info.json => keyboard.json} (100%) rename keyboards/handwired/dactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/{info.json => keyboard.json} (100%) rename keyboards/handwired/datahand/{info.json => keyboard.json} (100%) rename keyboards/handwired/dqz11n1g/{info.json => keyboard.json} (100%) rename keyboards/handwired/frenchdev/{info.json => keyboard.json} (100%) rename keyboards/handwired/fruity60/{info.json => keyboard.json} (100%) rename keyboards/handwired/jankrp2040dactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/lagrange/{info.json => keyboard.json} (100%) rename keyboards/handwired/m40/5x5_macropad/{info.json => keyboard.json} (100%) rename keyboards/handwired/macroboard/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/info.json rename keyboards/handwired/meck_tkl/{info.json => blackpill_f401/keyboard.json} (89%) delete mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/rules.mk delete mode 100644 keyboards/handwired/meck_tkl/config.h rename keyboards/handwired/onekey/blackpill_f401/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/handwired/onekey/blackpill_f401/rules.mk rename keyboards/handwired/onekey/blackpill_f401_tinyuf2/{info.json => keyboard.json} (80%) delete mode 100755 keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk rename keyboards/handwired/onekey/blackpill_f411/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/handwired/onekey/blackpill_f411/rules.mk rename keyboards/handwired/onekey/blackpill_f411_tinyuf2/{info.json => keyboard.json} (80%) delete mode 100755 keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk rename keyboards/handwired/onekey/bluepill_f103c6/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/evb_wb32f3g71/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/evb_wb32fq95/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/sipeed_longan_nano/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/teensy_lc/{info.json => keyboard.json} (100%) rename keyboards/handwired/ortho_brass/{info.json => keyboard.json} (100%) rename keyboards/handwired/owlet60/{info.json => keyboard.json} (100%) rename keyboards/handwired/pill60/blackpill_f401/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/handwired/pill60/blackpill_f401/rules.mk rename keyboards/handwired/pill60/blackpill_f411/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/handwired/pill60/blackpill_f411/rules.mk rename keyboards/handwired/prkl30/feather/{info.json => keyboard.json} (78%) rename keyboards/handwired/promethium/{info.json => keyboard.json} (100%) rename keyboards/handwired/pterodactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/riblee_split/{info.json => keyboard.json} (100%) rename keyboards/handwired/slash/{info.json => keyboard.json} (100%) rename keyboards/handwired/split65/stm32/{info.json => keyboard.json} (100%) rename keyboards/handwired/trackpoint/{info.json => keyboard.json} (100%) rename keyboards/handwired/tractyl_manuform/4x6_right/{info.json => keyboard.json} (100%) rename keyboards/handwired/tractyl_manuform/5x6_right/f303/{info.json => keyboard.json} (100%) rename keyboards/handwired/tractyl_manuform/5x6_right/f411/{info.json => keyboard.json} (100%) rename keyboards/handwired/twadlee/tp69/{info.json => keyboard.json} (100%) rename keyboards/handwired/uthol/rev3/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/handwired/uthol/rev3/rules.mk rename keyboards/handwired/wulkan/{info.json => keyboard.json} (100%) rename keyboards/hardwareabstraction/handwire/{info.json => keyboard.json} (100%) rename keyboards/hazel/bad_wings/{info.json => keyboard.json} (100%) rename keyboards/hhkb/ansi/32u2/{info.json => keyboard.json} (100%) rename keyboards/hhkb/jp/{info.json => keyboard.json} (100%) rename keyboards/hhkb/yang/{info.json => keyboard.json} (100%) rename keyboards/hillside/46/0_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hillside/46/0_1/rules.mk rename keyboards/hillside/48/0_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hillside/48/0_1/rules.mk rename keyboards/hillside/52/0_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hillside/52/0_1/rules.mk rename keyboards/hineybush/hbcp/{info.json => keyboard.json} (100%) rename keyboards/horrortroll/handwired_k552/{info.json => keyboard.json} (100%) rename keyboards/horrortroll/lemon40/{info.json => keyboard.json} (100%) rename keyboards/horrortroll/nyx/rev1/{info.json => keyboard.json} (100%) rename keyboards/hotdox/{info.json => keyboard.json} (100%) rename keyboards/hs60/v1/{info.json => keyboard.json} (100%) rename keyboards/hs60/v2/ansi/{info.json => keyboard.json} (100%) rename keyboards/hs60/v2/hhkb/{info.json => keyboard.json} (100%) rename keyboards/hs60/v2/iso/{info.json => keyboard.json} (100%) rename keyboards/ibm/model_m_4th_gen/overnumpad_1xb/{info.json => keyboard.json} (100%) rename keyboards/ingrained/{info.json => keyboard.json} (100%) rename keyboards/inland/kb83/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/inland/kb83/rgb_matrix_kb.inc delete mode 100644 keyboards/inland/kb83/rules.mk rename keyboards/input_club/ergodox_infinity/{info.json => keyboard.json} (100%) diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/keyboard.json similarity index 100% rename from keyboards/hadron/ver3/info.json rename to keyboards/hadron/ver3/keyboard.json diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/keyboard.json similarity index 100% rename from keyboards/halfcliff/info.json rename to keyboards/halfcliff/keyboard.json diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/keyboard.json similarity index 100% rename from keyboards/handwired/108key_trackpoint/info.json rename to keyboards/handwired/108key_trackpoint/keyboard.json diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/keyboard.json similarity index 100% rename from keyboards/handwired/42/info.json rename to keyboards/handwired/42/keyboard.json diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/keyboard.json similarity index 100% rename from keyboards/handwired/aball/info.json rename to keyboards/handwired/aball/keyboard.json diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/keyboard.json similarity index 100% rename from keyboards/handwired/alcor_dactyl/info.json rename to keyboards/handwired/alcor_dactyl/keyboard.json diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/keyboard.json similarity index 100% rename from keyboards/handwired/battleship_gamepad/info.json rename to keyboards/handwired/battleship_gamepad/keyboard.json diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/keyboard.json similarity index 100% rename from keyboards/handwired/bdn9_ble/info.json rename to keyboards/handwired/bdn9_ble/keyboard.json diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/keyboard.json similarity index 100% rename from keyboards/handwired/cyberstar/info.json rename to keyboards/handwired/cyberstar/keyboard.json diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/keyboard.json similarity index 100% rename from keyboards/handwired/d48/info.json rename to keyboards/handwired/d48/keyboard.json diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl/info.json rename to keyboards/handwired/dactyl/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json rename to keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/keyboard.json similarity index 100% rename from keyboards/handwired/datahand/info.json rename to keyboards/handwired/datahand/keyboard.json diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/keyboard.json similarity index 100% rename from keyboards/handwired/dqz11n1g/info.json rename to keyboards/handwired/dqz11n1g/keyboard.json diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/keyboard.json similarity index 100% rename from keyboards/handwired/frenchdev/info.json rename to keyboards/handwired/frenchdev/keyboard.json diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/keyboard.json similarity index 100% rename from keyboards/handwired/fruity60/info.json rename to keyboards/handwired/fruity60/keyboard.json diff --git a/keyboards/handwired/jankrp2040dactyl/info.json b/keyboards/handwired/jankrp2040dactyl/keyboard.json similarity index 100% rename from keyboards/handwired/jankrp2040dactyl/info.json rename to keyboards/handwired/jankrp2040dactyl/keyboard.json diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/keyboard.json similarity index 100% rename from keyboards/handwired/lagrange/info.json rename to keyboards/handwired/lagrange/keyboard.json diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/keyboard.json similarity index 100% rename from keyboards/handwired/m40/5x5_macropad/info.json rename to keyboards/handwired/m40/5x5_macropad/keyboard.json diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/keyboard.json similarity index 100% rename from keyboards/handwired/macroboard/f411/info.json rename to keyboards/handwired/macroboard/f411/keyboard.json diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json deleted file mode 100644 index eeaa9c392be..00000000000 --- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "matrix_pins": { - "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"], - "rows": ["B15", "A8", "A9", "B14", "A15", "B3"] - }, - "diode_direction": "COL2ROW", - "indicators": { - "caps_lock": "C13", - "on_state": 0 - }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" -} diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json similarity index 89% rename from keyboards/handwired/meck_tkl/info.json rename to keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json index 5147d96ee02..4a9e2a5380a 100644 --- a/keyboards/handwired/meck_tkl/info.json +++ b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x474B", "pid": "0x0001", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "features": { "bootmagic": true, @@ -15,6 +18,24 @@ "console": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"], + "rows": ["B15", "A8", "A9", "B14", "A15", "B3"] + }, + "diode_direction": "COL2ROW", + "indicators": { + "caps_lock": "C13", + "on_state": 0 + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk deleted file mode 100644 index b5f27c93eab..00000000000 --- a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h deleted file mode 100644 index 30221cc2168..00000000000 --- a/keyboards/handwired/meck_tkl/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021 Gabriel Kim (@gabrielkim13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#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/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/keyboard.json similarity index 79% rename from keyboards/handwired/onekey/blackpill_f401/info.json rename to keyboards/handwired/onekey/blackpill_f401/keyboard.json index 69a7ea87a75..29e2f3f17d6 100644 --- a/keyboards/handwired/onekey/blackpill_f401/info.json +++ b/keyboards/handwired/onekey/blackpill_f401/keyboard.json @@ -1,6 +1,11 @@ { "keyboard_name": "Onekey Blackpill STM32F401", "development_board": "blackpill_f401", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f401/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json similarity index 80% rename from keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json rename to keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json index ed9435c740b..413bf7a7f34 100644 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json @@ -2,6 +2,11 @@ "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2", "development_board": "blackpill_f401", "bootloader": "tinyuf2", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk deleted file mode 100755 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/keyboard.json similarity index 79% rename from keyboards/handwired/onekey/blackpill_f411/info.json rename to keyboards/handwired/onekey/blackpill_f411/keyboard.json index 5ee8ec3d5ed..077fee4b3bd 100644 --- a/keyboards/handwired/onekey/blackpill_f411/info.json +++ b/keyboards/handwired/onekey/blackpill_f411/keyboard.json @@ -1,6 +1,11 @@ { "keyboard_name": "Onekey Blackpill STM32F411", "development_board": "blackpill_f411", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f411/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json similarity index 80% rename from keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json rename to keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json index 8e8b52080ad..e37bf6f54dc 100644 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json @@ -2,6 +2,11 @@ "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2", "development_board": "blackpill_f411", "bootloader": "tinyuf2", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk deleted file mode 100755 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/bluepill_f103c6/info.json rename to keyboards/handwired/onekey/bluepill_f103c6/keyboard.json diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/evb_wb32f3g71/info.json rename to keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/evb_wb32fq95/info.json rename to keyboards/handwired/onekey/evb_wb32fq95/keyboard.json diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/sipeed_longan_nano/info.json rename to keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json diff --git a/keyboards/handwired/onekey/teensy_lc/info.json b/keyboards/handwired/onekey/teensy_lc/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/teensy_lc/info.json rename to keyboards/handwired/onekey/teensy_lc/keyboard.json diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/keyboard.json similarity index 100% rename from keyboards/handwired/ortho_brass/info.json rename to keyboards/handwired/ortho_brass/keyboard.json diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/keyboard.json similarity index 100% rename from keyboards/handwired/owlet60/info.json rename to keyboards/handwired/owlet60/keyboard.json diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/keyboard.json similarity index 78% rename from keyboards/handwired/pill60/blackpill_f401/info.json rename to keyboards/handwired/pill60/blackpill_f401/keyboard.json index 8d85a2e9300..9b3530b9583 100644 --- a/keyboards/handwired/pill60/blackpill_f401/info.json +++ b/keyboards/handwired/pill60/blackpill_f401/keyboard.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], "rows": ["B4", "B3", "A15", "B13", "B5"] diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk deleted file mode 100644 index 3d2bfceea99..00000000000 --- a/keyboards/handwired/pill60/blackpill_f401/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/keyboard.json similarity index 78% rename from keyboards/handwired/pill60/blackpill_f411/info.json rename to keyboards/handwired/pill60/blackpill_f411/keyboard.json index 4e0935f79ce..1961d616ddb 100644 --- a/keyboards/handwired/pill60/blackpill_f411/info.json +++ b/keyboards/handwired/pill60/blackpill_f411/keyboard.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], "rows": ["B4", "B3", "A15", "B13", "B5"] diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk deleted file mode 100644 index b5f27c93eab..00000000000 --- a/keyboards/handwired/pill60/blackpill_f411/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/keyboard.json similarity index 78% rename from keyboards/handwired/prkl30/feather/info.json rename to keyboards/handwired/prkl30/feather/keyboard.json index a89fe9ec57f..721107e0646 100644 --- a/keyboards/handwired/prkl30/feather/info.json +++ b/keyboards/handwired/prkl30/feather/keyboard.json @@ -1,4 +1,14 @@ { + "features": { + "bluetooth": true, + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk index aaab95b9e04..3437a35bdf1 100644 --- a/keyboards/handwired/prkl30/feather/rules.mk +++ b/keyboards/handwired/prkl30/feather/rules.mk @@ -1,18 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -ENCODER_ENABLE = yes -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. - -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/keyboard.json similarity index 100% rename from keyboards/handwired/promethium/info.json rename to keyboards/handwired/promethium/keyboard.json diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/keyboard.json similarity index 100% rename from keyboards/handwired/pterodactyl/info.json rename to keyboards/handwired/pterodactyl/keyboard.json diff --git a/keyboards/handwired/riblee_split/info.json b/keyboards/handwired/riblee_split/keyboard.json similarity index 100% rename from keyboards/handwired/riblee_split/info.json rename to keyboards/handwired/riblee_split/keyboard.json diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/keyboard.json similarity index 100% rename from keyboards/handwired/slash/info.json rename to keyboards/handwired/slash/keyboard.json diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/keyboard.json similarity index 100% rename from keyboards/handwired/split65/stm32/info.json rename to keyboards/handwired/split65/stm32/keyboard.json diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/keyboard.json similarity index 100% rename from keyboards/handwired/trackpoint/info.json rename to keyboards/handwired/trackpoint/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/4x6_right/info.json rename to keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/keyboard.json similarity index 100% rename from keyboards/handwired/twadlee/tp69/info.json rename to keyboards/handwired/twadlee/tp69/keyboard.json diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/keyboard.json similarity index 92% rename from keyboards/handwired/uthol/rev3/info.json rename to keyboards/handwired/uthol/rev3/keyboard.json index a90e7a4a895..9b1a476b87c 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/keyboard.json @@ -1,7 +1,10 @@ { "keyboard_name": "UtholThree", "usb": { - "device_version": "0.0.3" + "device_version": "0.0.3", + "shared_endpoint": { + "keyboard": true + } }, "rgblight": { "led_count": 39, diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/uthol/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/keyboard.json similarity index 100% rename from keyboards/handwired/wulkan/info.json rename to keyboards/handwired/wulkan/keyboard.json diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/keyboard.json similarity index 100% rename from keyboards/hardwareabstraction/handwire/info.json rename to keyboards/hardwareabstraction/handwire/keyboard.json diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/keyboard.json similarity index 100% rename from keyboards/hazel/bad_wings/info.json rename to keyboards/hazel/bad_wings/keyboard.json diff --git a/keyboards/hhkb/ansi/32u2/info.json b/keyboards/hhkb/ansi/32u2/keyboard.json similarity index 100% rename from keyboards/hhkb/ansi/32u2/info.json rename to keyboards/hhkb/ansi/32u2/keyboard.json diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/keyboard.json similarity index 100% rename from keyboards/hhkb/jp/info.json rename to keyboards/hhkb/jp/keyboard.json diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/keyboard.json similarity index 100% rename from keyboards/hhkb/yang/info.json rename to keyboards/hhkb/yang/keyboard.json diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/keyboard.json similarity index 100% rename from keyboards/hillside/46/0_1/info.json rename to keyboards/hillside/46/0_1/keyboard.json diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk deleted file mode 100644 index 89c84d8be9d..00000000000 --- a/keyboards/hillside/46/0_1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# 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 -# HAPTIC_ENABLE = yes # Enable haptic driver -# HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/keyboard.json similarity index 100% rename from keyboards/hillside/48/0_1/info.json rename to keyboards/hillside/48/0_1/keyboard.json diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk deleted file mode 100644 index 89c84d8be9d..00000000000 --- a/keyboards/hillside/48/0_1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# 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 -# HAPTIC_ENABLE = yes # Enable haptic driver -# HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/keyboard.json similarity index 100% rename from keyboards/hillside/52/0_1/info.json rename to keyboards/hillside/52/0_1/keyboard.json diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk deleted file mode 100644 index 89c84d8be9d..00000000000 --- a/keyboards/hillside/52/0_1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# 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 -# HAPTIC_ENABLE = yes # Enable haptic driver -# HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/keyboard.json similarity index 100% rename from keyboards/hineybush/hbcp/info.json rename to keyboards/hineybush/hbcp/keyboard.json diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/keyboard.json similarity index 100% rename from keyboards/horrortroll/handwired_k552/info.json rename to keyboards/horrortroll/handwired_k552/keyboard.json diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/keyboard.json similarity index 100% rename from keyboards/horrortroll/lemon40/info.json rename to keyboards/horrortroll/lemon40/keyboard.json diff --git a/keyboards/horrortroll/nyx/rev1/info.json b/keyboards/horrortroll/nyx/rev1/keyboard.json similarity index 100% rename from keyboards/horrortroll/nyx/rev1/info.json rename to keyboards/horrortroll/nyx/rev1/keyboard.json diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/keyboard.json similarity index 100% rename from keyboards/hotdox/info.json rename to keyboards/hotdox/keyboard.json diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/keyboard.json similarity index 100% rename from keyboards/hs60/v1/info.json rename to keyboards/hs60/v1/keyboard.json diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/keyboard.json similarity index 100% rename from keyboards/hs60/v2/ansi/info.json rename to keyboards/hs60/v2/ansi/keyboard.json diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/keyboard.json similarity index 100% rename from keyboards/hs60/v2/hhkb/info.json rename to keyboards/hs60/v2/hhkb/keyboard.json diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/keyboard.json similarity index 100% rename from keyboards/hs60/v2/iso/info.json rename to keyboards/hs60/v2/iso/keyboard.json diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json similarity index 100% rename from keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json rename to keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/keyboard.json similarity index 100% rename from keyboards/ingrained/info.json rename to keyboards/ingrained/keyboard.json diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/keyboard.json similarity index 100% rename from keyboards/inland/kb83/info.json rename to keyboards/inland/kb83/keyboard.json diff --git a/keyboards/inland/kb83/rgb_matrix_kb.inc b/keyboards/inland/kb83/rgb_matrix_kb.inc deleted file mode 100644 index 56e2bd31cbb..00000000000 --- a/keyboards/inland/kb83/rgb_matrix_kb.inc +++ /dev/null @@ -1,51 +0,0 @@ -// !!! DO NOT ADD #pragma once !!! // - -// Step 1. -// Declare custom effects using the RGB_MATRIX_EFFECT macro -// (note the lack of semicolon after the macro!) - -RGB_MATRIX_EFFECT(turn_off_rgb) -RGB_MATRIX_EFFECT(kb_reset_rgb) - -// Step 2. -// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block - -#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS - -// e.g: A simple effect, self-contained within a single method -static bool turn_off_rgb(effect_params_t *params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - for (uint8_t i = led_min; i < led_max; i++) { - rgb_matrix_set_color(i, 0x00, 0x00, 0x00); - } - return rgb_matrix_check_finished_leds(led_max); -} - -// e.g: A more complex effect, relying on external methods and state, with -// dedicated init and run methods -static uint8_t some_global_state; -static void kb_reset_rgb_init(effect_params_t* params) { - some_global_state = 0; -} -static bool kb_reset_rgb_run(effect_params_t* params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - some_global_state++; - if(some_global_state&0x01){ - for (uint8_t i = led_min; i < led_max; i++) - rgb_matrix_set_color(i, 0, 0, 0); - } - else{ - for (uint8_t i = led_min; i < led_max; i++) - rgb_matrix_set_color(i, 0xc0, 0xc0, 0xc0); - } - if(some_global_state>=7) - rgb_matrix_init(); - return rgb_matrix_check_finished_leds(led_max); -} - -static bool kb_reset_rgb(effect_params_t* params) { - if (params->init) kb_reset_rgb_init(params); - return kb_reset_rgb_run(params); -} - -#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/keyboards/inland/kb83/rules.mk b/keyboards/inland/kb83/rules.mk deleted file mode 100644 index 2bdd4fd92e8..00000000000 --- a/keyboards/inland/kb83/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#RGB_MATRIX_CUSTOM_USER = yes diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/keyboard.json similarity index 100% rename from keyboards/input_club/ergodox_infinity/info.json rename to keyboards/input_club/ergodox_infinity/keyboard.json From 36a6f2ba3c248e9f0498bc27be3788542ea3a972 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 17 Apr 2024 03:15:02 +0100 Subject: [PATCH 22/23] Migrate build target markers to keyboard.json - S (#23532) --- .../satt/comet46/{info.json => keyboard.json} | 6 +++ keyboards/satt/comet46/rules.mk | 12 ------ .../grs_70ec/{info.json => keyboard.json} | 7 ++++ keyboards/sekigon/grs_70ec/rules.mk | 12 ------ .../hotswap/{info.json => keyboard.json} | 4 +- .../shandoncodes/mino_plus/hotswap/rules.mk | 2 - .../soldered/{info.json => keyboard.json} | 4 +- .../shandoncodes/mino_plus/soldered/rules.mk | 2 - .../{info.json => keyboard.json} | 0 keyboards/sharkoon/skiller_sgk50_s2/rules.mk | 1 - .../3_0/elitec/{info.json => keyboard.json} | 6 +++ keyboards/signum/3_0/elitec/rules.mk | 13 ------ .../3_0/teensy/{info.json => keyboard.json} | 6 +++ keyboards/signum/3_0/teensy/rules.mk | 13 ------ .../{info.json => keyboard.json} | 11 +++++ keyboards/silverbullet44/rules.mk | 14 ------- .../uni660/rev1/{info.json => keyboard.json} | 9 ++++ keyboards/sirius/uni660/rev1/rules.mk | 13 ------ .../unigo66/{info.json => keyboard.json} | 8 ++++ keyboards/sirius/unigo66/rules.mk | 15 ------- .../sixkeyboard/{info.json => keyboard.json} | 6 +++ keyboards/sixkeyboard/rules.mk | 11 ----- keyboards/skergo/config.h | 23 ----------- keyboards/skergo/{info.json => keyboard.json} | 12 ++++++ keyboards/skergo/rules.mk | 13 ------ .../skippys_custom_pcs/rooboard65/config.h | 41 ------------------- .../rooboard65/{info.json => keyboard.json} | 14 +++++++ .../skippys_custom_pcs/rooboard65/rules.mk | 13 ------ .../roopad/{info.json => keyboard.json} | 7 ++++ keyboards/skippys_custom_pcs/roopad/rules.mk | 13 ------ .../skmt/15k/{info.json => keyboard.json} | 3 ++ keyboards/skmt/15k/rules.mk | 1 - .../{info.json => keyboard.json} | 7 ++++ keyboards/smallkeyboard/rules.mk | 15 ------- .../iron160_h/{info.json => keyboard.json} | 8 ++++ .../smithrune/iron160/iron160_h/rules.mk | 16 -------- .../iron160_s/{info.json => keyboard.json} | 8 ++++ .../smithrune/iron160/iron160_s/rules.mk | 16 -------- .../f072/{info.json => keyboard.json} | 12 ++++++ keyboards/smithrune/iron165r2/f072/rules.mk | 15 ------- .../f411/{info.json => keyboard.json} | 12 ++++++ keyboards/smithrune/iron165r2/f411/rules.mk | 14 ------- .../{info.json => keyboard.json} | 0 keyboards/soda/cherish/config.h | 39 ------------------ .../soda/cherish/{info.json => keyboard.json} | 15 +++++++ keyboards/soda/cherish/rules.mk | 14 ------- .../nebula12/{info.json => keyboard.json} | 7 ++++ keyboards/spaceholdings/nebula12/rules.mk | 15 +------ .../nebula68/{info.json => keyboard.json} | 7 ++++ keyboards/spaceholdings/nebula68/rules.mk | 15 +------ .../rev1/feather/{info.json => keyboard.json} | 9 ++++ .../spaceman/pancake/rev1/feather/rules.mk | 14 ------- .../promicro/{info.json => keyboard.json} | 8 ++++ .../spaceman/pancake/rev1/promicro/rules.mk | 13 ------ keyboards/specskeys/config.h | 39 ------------------ .../specskeys/{info.json => keyboard.json} | 13 ++++++ keyboards/specskeys/rules.mk | 13 ------ .../split78/{info.json => keyboard.json} | 7 ++++ keyboards/spiderisland/split78/rules.mk | 11 ----- keyboards/spleeb/{info.json => keyboard.json} | 0 .../splitkb/zima/{info.json => keyboard.json} | 14 +++++++ keyboards/splitkb/zima/rules.mk | 18 -------- .../lagom/{info.json => keyboard.json} | 0 keyboards/sthlmkb/lagom/rules.mk | 6 +-- keyboards/stront/{info.json => keyboard.json} | 0 .../supersplit/{info.json => keyboard.json} | 0 .../southpaw_65/{info.json => keyboard.json} | 11 +++++ keyboards/switchplate/southpaw_65/rules.mk | 14 ------- keyboards/sx60/{info.json => keyboard.json} | 7 ++++ keyboards/sx60/rules.mk | 12 ------ .../launch_1/{info.json => keyboard.json} | 12 ++++++ keyboards/system76/launch_1/rules.mk | 15 ------- 72 files changed, 261 insertions(+), 525 deletions(-) rename keyboards/satt/comet46/{info.json => keyboard.json} (95%) rename keyboards/sekigon/grs_70ec/{info.json => keyboard.json} (96%) rename keyboards/shandoncodes/mino_plus/hotswap/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/shandoncodes/mino_plus/hotswap/rules.mk rename keyboards/shandoncodes/mino_plus/soldered/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/shandoncodes/mino_plus/soldered/rules.mk rename keyboards/sharkoon/skiller_sgk50_s2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sharkoon/skiller_sgk50_s2/rules.mk rename keyboards/signum/3_0/elitec/{info.json => keyboard.json} (61%) rename keyboards/signum/3_0/teensy/{info.json => keyboard.json} (61%) rename keyboards/silverbullet44/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/silverbullet44/rules.mk rename keyboards/sirius/uni660/rev1/{info.json => keyboard.json} (95%) rename keyboards/sirius/unigo66/{info.json => keyboard.json} (97%) rename keyboards/sixkeyboard/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/skergo/config.h rename keyboards/skergo/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/skippys_custom_pcs/rooboard65/config.h rename keyboards/skippys_custom_pcs/rooboard65/{info.json => keyboard.json} (94%) rename keyboards/skippys_custom_pcs/roopad/{info.json => keyboard.json} (93%) rename keyboards/skmt/15k/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/skmt/15k/rules.mk rename keyboards/smallkeyboard/{info.json => keyboard.json} (92%) rename keyboards/smithrune/iron160/iron160_h/{info.json => keyboard.json} (98%) rename keyboards/smithrune/iron160/iron160_s/{info.json => keyboard.json} (99%) rename keyboards/smithrune/iron165r2/f072/{info.json => keyboard.json} (72%) delete mode 100644 keyboards/smithrune/iron165r2/f072/rules.mk rename keyboards/smithrune/iron165r2/f411/{info.json => keyboard.json} (74%) delete mode 100644 keyboards/smithrune/iron165r2/f411/rules.mk rename keyboards/snes_macropad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/soda/cherish/config.h rename keyboards/soda/cherish/{info.json => keyboard.json} (95%) rename keyboards/spaceholdings/nebula12/{info.json => keyboard.json} (91%) rename keyboards/spaceholdings/nebula68/{info.json => keyboard.json} (97%) rename keyboards/spaceman/pancake/rev1/feather/{info.json => keyboard.json} (55%) rename keyboards/spaceman/pancake/rev1/promicro/{info.json => keyboard.json} (52%) delete mode 100644 keyboards/specskeys/config.h rename keyboards/specskeys/{info.json => keyboard.json} (95%) rename keyboards/spiderisland/split78/{info.json => keyboard.json} (97%) rename keyboards/spleeb/{info.json => keyboard.json} (100%) rename keyboards/splitkb/zima/{info.json => keyboard.json} (85%) rename keyboards/sthlmkb/lagom/{info.json => keyboard.json} (100%) rename keyboards/stront/{info.json => keyboard.json} (100%) rename keyboards/supersplit/{info.json => keyboard.json} (100%) rename keyboards/switchplate/southpaw_65/{info.json => keyboard.json} (98%) rename keyboards/sx60/{info.json => keyboard.json} (99%) rename keyboards/system76/launch_1/{info.json => keyboard.json} (96%) diff --git a/keyboards/satt/comet46/info.json b/keyboards/satt/comet46/keyboard.json similarity index 95% rename from keyboards/satt/comet46/info.json rename to keyboards/satt/comet46/keyboard.json index 5b11be662e5..0092f19c799 100644 --- a/keyboards/satt/comet46/info.json +++ b/keyboards/satt/comet46/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/satt/comet46/rules.mk b/keyboards/satt/comet46/rules.mk index 0db5166ffac..18d234d62a0 100644 --- a/keyboards/satt/comet46/rules.mk +++ b/keyboards/satt/comet46/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 = 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 CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/keyboard.json similarity index 96% rename from keyboards/sekigon/grs_70ec/info.json rename to keyboards/sekigon/grs_70ec/keyboard.json index 833cd747895..e940e71d884 100644 --- a/keyboards/sekigon/grs_70ec/info.json +++ b/keyboards/sekigon/grs_70ec/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x70EC", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "split": { "enabled": true, "soft_serial_pin": "D3" diff --git a/keyboards/sekigon/grs_70ec/rules.mk b/keyboards/sekigon/grs_70ec/rules.mk index ac989e7ea83..37cfffd7692 100644 --- a/keyboards/sekigon/grs_70ec/rules.mk +++ b/keyboards/sekigon/grs_70ec/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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes diff --git a/keyboards/shandoncodes/mino_plus/hotswap/info.json b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json similarity index 98% rename from keyboards/shandoncodes/mino_plus/hotswap/info.json rename to keyboards/shandoncodes/mino_plus/hotswap/keyboard.json index b7cda6d71ff..f181c610ed1 100644 --- a/keyboards/shandoncodes/mino_plus/hotswap/info.json +++ b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json @@ -10,7 +10,9 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "oled": true, + "wpm": true }, "matrix_pins": { "cols": ["B12", "A15", "B3", "B2", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "F1", "A0", "A8", "A10"], diff --git a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk b/keyboards/shandoncodes/mino_plus/hotswap/rules.mk deleted file mode 100644 index 76e55c05f48..00000000000 --- a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/shandoncodes/mino_plus/soldered/info.json b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json similarity index 98% rename from keyboards/shandoncodes/mino_plus/soldered/info.json rename to keyboards/shandoncodes/mino_plus/soldered/keyboard.json index 52b612e01bf..2b717c4c597 100644 --- a/keyboards/shandoncodes/mino_plus/soldered/info.json +++ b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json @@ -10,7 +10,9 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "oled": true, + "wpm": true }, "matrix_pins": { "cols": ["B4", "B3", "A15", "A10", "A8", "B14", "B12", "B10", "A5", "A4", "A3", "B0", "A7", "C15", "B5"], diff --git a/keyboards/shandoncodes/mino_plus/soldered/rules.mk b/keyboards/shandoncodes/mino_plus/soldered/rules.mk deleted file mode 100644 index 76e55c05f48..00000000000 --- a/keyboards/shandoncodes/mino_plus/soldered/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/sharkoon/skiller_sgk50_s2/info.json b/keyboards/sharkoon/skiller_sgk50_s2/keyboard.json similarity index 100% rename from keyboards/sharkoon/skiller_sgk50_s2/info.json rename to keyboards/sharkoon/skiller_sgk50_s2/keyboard.json diff --git a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/signum/3_0/elitec/info.json b/keyboards/signum/3_0/elitec/keyboard.json similarity index 61% rename from keyboards/signum/3_0/elitec/info.json rename to keyboards/signum/3_0/elitec/keyboard.json index 84336ac59f4..5482e519a1a 100644 --- a/keyboards/signum/3_0/elitec/info.json +++ b/keyboards/signum/3_0/elitec/keyboard.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"], "rows": ["D2", "D1", "F5", "B5"] diff --git a/keyboards/signum/3_0/elitec/rules.mk b/keyboards/signum/3_0/elitec/rules.mk index 614691a01be..16051206467 100644 --- a/keyboards/signum/3_0/elitec/rules.mk +++ b/keyboards/signum/3_0/elitec/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # 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 RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/signum/3_0/teensy/info.json b/keyboards/signum/3_0/teensy/keyboard.json similarity index 61% rename from keyboards/signum/3_0/teensy/info.json rename to keyboards/signum/3_0/teensy/keyboard.json index 7eae1153236..1db8479d9b0 100644 --- a/keyboards/signum/3_0/teensy/info.json +++ b/keyboards/signum/3_0/teensy/keyboard.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"], "rows": ["B0", "B3", "F6", "C7"] diff --git a/keyboards/signum/3_0/teensy/rules.mk b/keyboards/signum/3_0/teensy/rules.mk index 614691a01be..16051206467 100644 --- a/keyboards/signum/3_0/teensy/rules.mk +++ b/keyboards/signum/3_0/teensy/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # 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 RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/keyboard.json similarity index 94% rename from keyboards/silverbullet44/info.json rename to keyboards/silverbullet44/keyboard.json index e232fdba3e8..793ec229e4b 100644 --- a/keyboards/silverbullet44/info.json +++ b/keyboards/silverbullet44/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": true, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk deleted file mode 100644 index 95e92dce2a4..00000000000 --- a/keyboards/silverbullet44/rules.mk +++ /dev/null @@ -1,14 +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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no -AUDIO_ENABLE = yes # Audio output -LTO_ENABLE = yes diff --git a/keyboards/sirius/uni660/rev1/info.json b/keyboards/sirius/uni660/rev1/keyboard.json similarity index 95% rename from keyboards/sirius/uni660/rev1/info.json rename to keyboards/sirius/uni660/rev1/keyboard.json index f5b070f87e1..793edcc6858 100644 --- a/keyboards/sirius/uni660/rev1/info.json +++ b/keyboards/sirius/uni660/rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0201", "device_version": "19.1.2" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "unicode": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/sirius/uni660/rev1/rules.mk b/keyboards/sirius/uni660/rev1/rules.mk index 7ac75072699..18d234d62a0 100644 --- a/keyboards/sirius/uni660/rev1/rules.mk +++ b/keyboards/sirius/uni660/rev1/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/keyboard.json similarity index 97% rename from keyboards/sirius/unigo66/info.json rename to keyboards/sirius/unigo66/keyboard.json index 866fd9abbf9..ac683a0f1db 100644 --- a/keyboards/sirius/unigo66/info.json +++ b/keyboards/sirius/unigo66/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1001", "device_version": "19.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": false, + "usb_hid": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sirius/unigo66/rules.mk b/keyboards/sirius/unigo66/rules.mk index 6cf02169cf6..56889eab51a 100644 --- a/keyboards/sirius/unigo66/rules.mk +++ b/keyboards/sirius/unigo66/rules.mk @@ -1,18 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -USB_HID_ENABLE = yes - CUSTOM_MATRIX = yes SRC += custom_matrix.cpp\ main.c diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/keyboard.json similarity index 85% rename from keyboards/sixkeyboard/info.json rename to keyboards/sixkeyboard/keyboard.json index 247b255a363..aff5c985f79 100644 --- a/keyboards/sixkeyboard/info.json +++ b/keyboards/sixkeyboard/keyboard.json @@ -9,6 +9,12 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "processor": "atmega16u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_2x3"], diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk index d1d7bc48818..09c02c88b0d 100644 --- a/keyboards/sixkeyboard/rules.mk +++ b/keyboards/sixkeyboard/rules.mk @@ -1,14 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = 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 CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h deleted file mode 100644 index a463c64167e..00000000000 --- a/keyboards/skergo/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (C) 2021 Keyz.io Ltd. -* -* 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 3 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/skergo/info.json b/keyboards/skergo/keyboard.json similarity index 97% rename from keyboards/skergo/info.json rename to keyboards/skergo/keyboard.json index 0e68b6aedd7..49ff7b81b6e 100644 --- a/keyboards/skergo/info.json +++ b/keyboards/skergo/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x534B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"], "rows": ["B0", "B4", "B3", "B2", "B1"] diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/skergo/rules.mk +++ b/keyboards/skergo/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h deleted file mode 100644 index b352868d2d4..00000000000 --- a/keyboards/skippys_custom_pcs/rooboard65/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 - -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 - -/* Define less important options */ - -/* - * 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/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json similarity index 94% rename from keyboards/skippys_custom_pcs/rooboard65/info.json rename to keyboards/skippys_custom_pcs/rooboard65/keyboard.json index b6151a303c4..527884714b2 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/info.json +++ b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "F7" }, diff --git a/keyboards/skippys_custom_pcs/rooboard65/rules.mk b/keyboards/skippys_custom_pcs/rooboard65/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/rules.mk +++ b/keyboards/skippys_custom_pcs/rooboard65/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/keyboard.json similarity index 93% rename from keyboards/skippys_custom_pcs/roopad/info.json rename to keyboards/skippys_custom_pcs/roopad/keyboard.json index c44fcd1541f..0da722ff120 100644 --- a/keyboards/skippys_custom_pcs/roopad/info.json +++ b/keyboards/skippys_custom_pcs/roopad/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 21, "sleep": true, diff --git a/keyboards/skippys_custom_pcs/roopad/rules.mk b/keyboards/skippys_custom_pcs/roopad/rules.mk index d280d696f53..3437a35bdf1 100644 --- a/keyboards/skippys_custom_pcs/roopad/rules.mk +++ b/keyboards/skippys_custom_pcs/roopad/rules.mk @@ -1,15 +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 = 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/skmt/15k/info.json b/keyboards/skmt/15k/keyboard.json similarity index 99% rename from keyboards/skmt/15k/info.json rename to keyboards/skmt/15k/keyboard.json index 903a13b985e..9cf215f4d48 100644 --- a/keyboards/skmt/15k/info.json +++ b/keyboards/skmt/15k/keyboard.json @@ -4,6 +4,9 @@ "maintainer": "satorusaka", "bootloader": "rp2040", "diode_direction": "COL2ROW", + "build": { + "lto": true + }, "features": { "bootmagic": true, "command": false, diff --git a/keyboards/skmt/15k/rules.mk b/keyboards/skmt/15k/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/skmt/15k/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/keyboard.json similarity index 92% rename from keyboards/smallkeyboard/info.json rename to keyboards/smallkeyboard/keyboard.json index d5a64f465ad..9963d83a47f 100644 --- a/keyboards/smallkeyboard/info.json +++ b/keyboards/smallkeyboard/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x736B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk index 1dcdf891550..982989bad1d 100644 --- a/keyboards/smallkeyboard/rules.mk +++ b/keyboards/smallkeyboard/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -RGB_MATRIX_ENABLE = yes - RGB_MATRIX_SUPPORTED = yes diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/keyboard.json similarity index 98% rename from keyboards/smithrune/iron160/iron160_h/info.json rename to keyboards/smithrune/iron160/iron160_h/keyboard.json index 3fb14989d69..d9ada0879d5 100644 --- a/keyboards/smithrune/iron160/iron160_h/info.json +++ b/keyboards/smithrune/iron160/iron160_h/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1648", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "matrix_pins": { diff --git a/keyboards/smithrune/iron160/iron160_h/rules.mk b/keyboards/smithrune/iron160/iron160_h/rules.mk index c889da168d6..4138455538f 100644 --- a/keyboards/smithrune/iron160/iron160_h/rules.mk +++ b/keyboards/smithrune/iron160/iron160_h/rules.mk @@ -1,18 +1,2 @@ -# 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 # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -LTO_ENABLE = no - EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = legacy - diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/keyboard.json similarity index 99% rename from keyboards/smithrune/iron160/iron160_s/info.json rename to keyboards/smithrune/iron160/iron160_s/keyboard.json index 91c66a3d4fb..b2a465399f5 100644 --- a/keyboards/smithrune/iron160/iron160_s/info.json +++ b/keyboards/smithrune/iron160/iron160_s/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1653", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "matrix_pins": { diff --git a/keyboards/smithrune/iron160/iron160_s/rules.mk b/keyboards/smithrune/iron160/iron160_s/rules.mk index 2c863bbe31a..4138455538f 100644 --- a/keyboards/smithrune/iron160/iron160_s/rules.mk +++ b/keyboards/smithrune/iron160/iron160_s/rules.mk @@ -1,18 +1,2 @@ -# 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 # USB Nkey Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -LTO_ENABLE = no - EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = legacy - diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/keyboard.json similarity index 72% rename from keyboards/smithrune/iron165r2/f072/info.json rename to keyboards/smithrune/iron165r2/f072/keyboard.json index 2cbbaa84f3f..e16493d0b5c 100644 --- a/keyboards/smithrune/iron165r2/f072/info.json +++ b/keyboards/smithrune/iron165r2/f072/keyboard.json @@ -1,4 +1,16 @@ { + "build": { + "lto": false + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk deleted file mode 100644 index b524e61f4bb..00000000000 --- a/keyboards/smithrune/iron165r2/f072/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = no -ENCODER_ENABLE = no -BACKLIGHT_ENABLE = yes - diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/keyboard.json similarity index 74% rename from keyboards/smithrune/iron165r2/f411/info.json rename to keyboards/smithrune/iron165r2/f411/keyboard.json index ff685e3cdd8..d3d4b3de506 100644 --- a/keyboards/smithrune/iron165r2/f411/info.json +++ b/keyboards/smithrune/iron165r2/f411/keyboard.json @@ -1,4 +1,16 @@ { + "build": { + "lto": false + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "eeprom": { "driver": "i2c" }, diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk deleted file mode 100644 index f5a58ab0cb7..00000000000 --- a/keyboards/smithrune/iron165r2/f411/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = no -ENCODER_ENABLE = no -BACKLIGHT_ENABLE = yes diff --git a/keyboards/snes_macropad/info.json b/keyboards/snes_macropad/keyboard.json similarity index 100% rename from keyboards/snes_macropad/info.json rename to keyboards/snes_macropad/keyboard.json diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/soda/cherish/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Álvaro "Gondolindrim" Volpato - -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/soda/cherish/info.json b/keyboards/soda/cherish/keyboard.json similarity index 95% rename from keyboards/soda/cherish/info.json rename to keyboards/soda/cherish/keyboard.json index 1284c79ce4a..b256e939651 100644 --- a/keyboards/soda/cherish/info.json +++ b/keyboards/soda/cherish/keyboard.json @@ -8,6 +8,21 @@ "pid": "0xEB52", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk index a8af2d4ebca..04fe1eba2ac 100644 --- a/keyboards/soda/cherish/rules.mk +++ b/keyboards/soda/cherish/rules.mk @@ -1,16 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/keyboard.json similarity index 91% rename from keyboards/spaceholdings/nebula12/info.json rename to keyboards/spaceholdings/nebula12/keyboard.json index 6638498e0c6..2b170e8e618 100755 --- a/keyboards/spaceholdings/nebula12/info.json +++ b/keyboards/spaceholdings/nebula12/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x5337", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk index a0b1795cee0..dd548eee148 100755 --- a/keyboards/spaceholdings/nebula12/rules.mk +++ b/keyboards/spaceholdings/nebula12/rules.mk @@ -3,24 +3,11 @@ # 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 -RGBLIGHT_ENABLE = yes # Underglow RGB - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC += keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ drivers/led/issi/is31fl3731.c \ quantum/color.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/keyboard.json similarity index 97% rename from keyboards/spaceholdings/nebula68/info.json rename to keyboards/spaceholdings/nebula68/keyboard.json index dfc61b3a2d1..47cab7a5b02 100755 --- a/keyboards/spaceholdings/nebula68/info.json +++ b/keyboards/spaceholdings/nebula68/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "ws2812": { "pin": "A7", "driver": "pwm" diff --git a/keyboards/spaceholdings/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk index d2484b627c3..c2507bf03df 100755 --- a/keyboards/spaceholdings/nebula68/rules.mk +++ b/keyboards/spaceholdings/nebula68/rules.mk @@ -3,24 +3,11 @@ # 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 -RGBLIGHT_ENABLE = yes # Underglow RGB - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC += keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ drivers/led/issi/is31fl3733.c \ quantum/color.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/spaceman/pancake/rev1/feather/info.json b/keyboards/spaceman/pancake/rev1/feather/keyboard.json similarity index 55% rename from keyboards/spaceman/pancake/rev1/feather/info.json rename to keyboards/spaceman/pancake/rev1/feather/keyboard.json index 85f95a011bb..3b82e3d4999 100644 --- a/keyboards/spaceman/pancake/rev1/feather/info.json +++ b/keyboards/spaceman/pancake/rev1/feather/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bluetooth": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"], "rows": ["B5", "D7", "C6", "D0"] diff --git a/keyboards/spaceman/pancake/rev1/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk index 35ad61d4a17..bccd7dfa97e 100644 --- a/keyboards/spaceman/pancake/rev1/feather/rules.mk +++ b/keyboards/spaceman/pancake/rev1/feather/rules.mk @@ -1,20 +1,6 @@ # 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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. -BLUETOOTH_ENABLE = yes - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/spaceman/pancake/rev1/promicro/info.json b/keyboards/spaceman/pancake/rev1/promicro/keyboard.json similarity index 52% rename from keyboards/spaceman/pancake/rev1/promicro/info.json rename to keyboards/spaceman/pancake/rev1/promicro/keyboard.json index 47ab8fdcd0a..658eaa39c15 100644 --- a/keyboards/spaceman/pancake/rev1/promicro/info.json +++ b/keyboards/spaceman/pancake/rev1/promicro/keyboard.json @@ -1,4 +1,12 @@ { + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "E6", "B4", "B5", "D7", "C6", "D4", "D0", "D1"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/spaceman/pancake/rev1/promicro/rules.mk b/keyboards/spaceman/pancake/rev1/promicro/rules.mk index 96e36eba388..16051206467 100644 --- a/keyboards/spaceman/pancake/rev1/promicro/rules.mk +++ b/keyboards/spaceman/pancake/rev1/promicro/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h deleted file mode 100644 index 490ac5e5c02..00000000000 --- a/keyboards/specskeys/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Nico - -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/specskeys/info.json b/keyboards/specskeys/keyboard.json similarity index 95% rename from keyboards/specskeys/info.json rename to keyboards/specskeys/keyboard.json index eb92e6f34fd..104b1ea13d9 100644 --- a/keyboards/specskeys/info.json +++ b/keyboards/specskeys/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0080", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/specskeys/rules.mk b/keyboards/specskeys/rules.mk index 05f8c4ece5f..3437a35bdf1 100644 --- a/keyboards/specskeys/rules.mk +++ b/keyboards/specskeys/rules.mk @@ -1,15 +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 = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/keyboard.json similarity index 97% rename from keyboards/spiderisland/split78/info.json rename to keyboards/spiderisland/split78/keyboard.json index e507a668b1d..cd49755b0f4 100644 --- a/keyboards/spiderisland/split78/info.json +++ b/keyboards/spiderisland/split78/keyboard.json @@ -8,6 +8,13 @@ "pid": "0xF4E4", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "backlight": { "pin": "D4", "breathing": true diff --git a/keyboards/spiderisland/split78/rules.mk b/keyboards/spiderisland/split78/rules.mk index db8262a763b..2d02998dd10 100644 --- a/keyboards/spiderisland/split78/rules.mk +++ b/keyboards/spiderisland/split78/rules.mk @@ -1,14 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow - # custom matrix setup CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/spleeb/info.json b/keyboards/spleeb/keyboard.json similarity index 100% rename from keyboards/spleeb/info.json rename to keyboards/spleeb/keyboard.json diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/keyboard.json similarity index 85% rename from keyboards/splitkb/zima/info.json rename to keyboards/splitkb/zima/keyboard.json index 0c6a104c528..68892960da7 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/keyboard.json @@ -8,6 +8,20 @@ "pid": "0xF75B", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": false, + "encoder": true, + "extrakey": true, + "haptic": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk index 3bcfccdd7bd..dea510c2ab3 100644 --- a/keyboards/splitkb/zima/rules.mk +++ b/keyboards/splitkb/zima/rules.mk @@ -1,19 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = 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 = yes # Audio output - -ENCODER_ENABLE = yes # ENables the use of one or more encoders -OLED_ENABLE = yes -HAPTIC_ENABLE = yes # Supported but not included by defaut HAPTIC_DRIVER = drv2605l - -LTO_ENABLE = yes diff --git a/keyboards/sthlmkb/lagom/info.json b/keyboards/sthlmkb/lagom/keyboard.json similarity index 100% rename from keyboards/sthlmkb/lagom/info.json rename to keyboards/sthlmkb/lagom/keyboard.json diff --git a/keyboards/sthlmkb/lagom/rules.mk b/keyboards/sthlmkb/lagom/rules.mk index 39bdd537d5d..2e2102e76be 100644 --- a/keyboards/sthlmkb/lagom/rules.mk +++ b/keyboards/sthlmkb/lagom/rules.mk @@ -1,8 +1,4 @@ -# Build Options -# change yes to no to disable -# -CUSTOM_MATRIX = lite # Lite custom matrix - +CUSTOM_MATRIX = lite # Project specific files SRC += matrix.c diff --git a/keyboards/stront/info.json b/keyboards/stront/keyboard.json similarity index 100% rename from keyboards/stront/info.json rename to keyboards/stront/keyboard.json diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/keyboard.json similarity index 100% rename from keyboards/supersplit/info.json rename to keyboards/supersplit/keyboard.json diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/keyboard.json similarity index 98% rename from keyboards/switchplate/southpaw_65/info.json rename to keyboards/switchplate/southpaw_65/keyboard.json index 19d08ee61a5..fd879349f25 100644 --- a/keyboards/switchplate/southpaw_65/info.json +++ b/keyboards/switchplate/southpaw_65/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x4084", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "backlight": { "pin": "B5", "levels": 10 diff --git a/keyboards/switchplate/southpaw_65/rules.mk b/keyboards/switchplate/southpaw_65/rules.mk index 89d05c5487e..e11c65db028 100644 --- a/keyboards/switchplate/southpaw_65/rules.mk +++ b/keyboards/switchplate/southpaw_65/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/sx60/info.json b/keyboards/sx60/keyboard.json similarity index 99% rename from keyboards/sx60/info.json rename to keyboards/sx60/keyboard.json index 246d2892f45..42eefbc81a8 100644 --- a/keyboards/sx60/info.json +++ b/keyboards/sx60/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/sx60/rules.mk b/keyboards/sx60/rules.mk index 2f0d22e49f8..394c3372d21 100755 --- a/keyboards/sx60/rules.mk +++ b/keyboards/sx60/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no CUSTOM_MATRIX = yes # project specific files diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/keyboard.json similarity index 96% rename from keyboards/system76/launch_1/info.json rename to keyboards/system76/launch_1/keyboard.json index 536b310cc03..28a505448ef 100644 --- a/keyboards/system76/launch_1/info.json +++ b/keyboards/system76/launch_1/keyboard.json @@ -7,6 +7,18 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "dynamic_keymap": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "raw": true, + "rgb_matrix": true + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/system76/launch_1/rules.mk b/keyboards/system76/launch_1/rules.mk index 181976b2ddc..6c4999df373 100644 --- a/keyboards/system76/launch_1/rules.mk +++ b/keyboards/system76/launch_1/rules.mk @@ -4,22 +4,7 @@ F_CPU = 8000000 # External oscillator is 16 MHz F_USB = 16000000 -# Build options -# change yes to no to disable -BOOTMAGIC_ENABLE = no # 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 -DYNAMIC_KEYMAP_ENABLE = yes # Reconfigurable keyboard without flashing firmware -NKRO_ENABLE = yes # USB N-key rollover -RAW_ENABLE = yes # Raw HID commands (used by Keyboard Configurator) -BACKLIGHT_ENABLE = no # RGB backlight (conflicts with RGB matrix) -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # RGB matrix RGB_MATRIX_CUSTOM_KB = yes # Custom keyboard effects -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Link-time optimization for smaller binary # Add System76 EC command interface as well as I2C and USB mux drivers SRC += system76_ec.c usb_mux.c From fffe8ee75f29ea15c558e2a4805cfe58cb09f49a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 17 Apr 2024 07:20:42 +0100 Subject: [PATCH 23/23] Remove *_SUPPORTED = yes (#23541) --- keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/scylla/blackpill/rules.mk | 2 -- keyboards/bastardkb/scylla/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/skeletyl/blackpill/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/tbkmini/blackpill/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk | 2 -- keyboards/crkbd/rules.mk | 7 ------- keyboards/latincompass/latin6rgb/rules.mk | 2 -- keyboards/melgeek/mj65/rev3/rules.mk | 1 - keyboards/montsinger/rebound/rev4/rules.mk | 1 - keyboards/phase_studio/titan65/hotswap/rules.mk | 1 - keyboards/planck/ez/rules.mk | 1 - keyboards/smallkeyboard/rules.mk | 1 - 43 files changed, 86 deletions(-) delete mode 100644 keyboards/smallkeyboard/rules.mk diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk index 0869ac07972..7f2338227af 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk index 0869ac07972..7f2338227af 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk index 0869ac07972..7f2338227af 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk index 0869ac07972..7f2338227af 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk index e2a00339775..9e797122a74 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default. -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default. RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk index e1f2bf81f8f..808675da02b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default. -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default. RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk index e1f2bf81f8f..808675da02b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default. -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default. RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk index 20c87fca307..0875a191c5d 100644 --- a/keyboards/bastardkb/scylla/blackpill/rules.mk +++ b/keyboards/bastardkb/scylla/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk index ef125eb2fea..3834385af03 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk index 20c87fca307..0875a191c5d 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk +++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk index ef125eb2fea..3834385af03 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk index 20c87fca307..0875a191c5d 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index ef125eb2fea..3834385af03 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk index a63f102097f..836587e45e6 100644 --- a/keyboards/crkbd/rules.mk +++ b/keyboards/crkbd/rules.mk @@ -1,8 +1 @@ -# Build Options -# change yes to no to disable -# - DEFAULT_FOLDER = crkbd/rev1 - -RGBLIGHT_SUPPORTED = yes -RGB_MATRIX_SUPPORTED = yes diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk index c05a204a403..3d1f3ae6de1 100644 --- a/keyboards/latincompass/latin6rgb/rules.mk +++ b/keyboards/latincompass/latin6rgb/rules.mk @@ -13,5 +13,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes - -RGB_MATRIX_SUPPORTED = yes diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk index 8b7f40c50b5..d3f22ef58ac 100644 --- a/keyboards/melgeek/mj65/rev3/rules.mk +++ b/keyboards/melgeek/mj65/rev3/rules.mk @@ -1,3 +1,2 @@ -RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk index 0fc2e835d76..643c971d472 100644 --- a/keyboards/montsinger/rebound/rev4/rules.mk +++ b/keyboards/montsinger/rebound/rev4/rules.mk @@ -13,6 +13,5 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Disable unsupported hardware -RGBLIGHT_SUPPORTED = yes AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk index a3b3ae4eaa8..871008928ea 100644 --- a/keyboards/phase_studio/titan65/hotswap/rules.mk +++ b/keyboards/phase_studio/titan65/hotswap/rules.mk @@ -14,4 +14,3 @@ RGB_MATRIX_ENABLE = yes AUDIO_SUPPORTED = no RGBLIGHT_SUPPORTED = no -RGB_MATRIX_SUPPORTED = yes diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index 9d3db5cdb72..97f68215f81 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -14,7 +14,6 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. ENCODER_ENABLE = yes -RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk deleted file mode 100644 index 982989bad1d..00000000000 --- a/keyboards/smallkeyboard/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_SUPPORTED = yes