From 924147dfe44ca812ed5e6ca17b2eb345dd72b2c3 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 17 May 2024 15:54:21 -0700 Subject: [PATCH] Miscellaneous Data-Driven Keyboard Conversions (#23712) Converts `rules.mk` entries to data-driven where applicable. Affects: - `handwired/dygma/raise/ansi` - `handwired/dygma/raise/iso` - `handwired/symmetric70_proto/promicro` - `handwired/symmetric70_proto/proton_c` - `lazydesigners/dimple/ortho` - `lazydesigners/dimple/staggered/rev2` - `lazydesigners/dimple/staggered/rev3` - `sirius/uni660/rev2/ansi` - `sirius/uni660/rev2/iso` --- keyboards/handwired/dygma/raise/ansi/keyboard.json | 7 +++++++ keyboards/handwired/dygma/raise/info.json | 6 ------ keyboards/handwired/dygma/raise/iso/keyboard.json | 7 +++++++ keyboards/handwired/dygma/raise/rules.mk | 1 - .../handwired/symmetric70_proto/promicro/info.json | 5 +++++ .../handwired/symmetric70_proto/promicro/rules.mk | 13 +------------ .../handwired/symmetric70_proto/proton_c/info.json | 7 ++++++- .../handwired/symmetric70_proto/proton_c/rules.mk | 13 +------------ keyboards/lazydesigners/dimple/ortho/rules.mk | 1 - .../lazydesigners/dimple/staggered/rev2/rules.mk | 1 - .../lazydesigners/dimple/staggered/rev3/rules.mk | 1 - keyboards/sirius/uni660/rev2/ansi/keyboard.json | 9 +++++++++ keyboards/sirius/uni660/rev2/iso/keyboard.json | 9 +++++++++ keyboards/sirius/uni660/rev2/rules.mk | 13 ------------- 14 files changed, 45 insertions(+), 48 deletions(-) diff --git a/keyboards/handwired/dygma/raise/ansi/keyboard.json b/keyboards/handwired/dygma/raise/ansi/keyboard.json index 0b6c9f6f679..9abe98fdfa5 100644 --- a/keyboards/handwired/dygma/raise/ansi/keyboard.json +++ b/keyboards/handwired/dygma/raise/ansi/keyboard.json @@ -1,4 +1,11 @@ { + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "raw": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json index 2d0c354f3b2..be32abfb94c 100644 --- a/keyboards/handwired/dygma/raise/info.json +++ b/keyboards/handwired/dygma/raise/info.json @@ -25,11 +25,5 @@ "sleep": true }, "development_board": "blackpill_f411", - "features": { - "bootmagic": false, - "mousekey": true, - "extrakey": true, - "rgb_matrix": true - }, "debounce": 0 } diff --git a/keyboards/handwired/dygma/raise/iso/keyboard.json b/keyboards/handwired/dygma/raise/iso/keyboard.json index 0b6c9f6f679..9abe98fdfa5 100644 --- a/keyboards/handwired/dygma/raise/iso/keyboard.json +++ b/keyboards/handwired/dygma/raise/iso/keyboard.json @@ -1,4 +1,11 @@ { + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true, + "raw": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk index 7a078c9757b..cd02f80200d 100644 --- a/keyboards/handwired/dygma/raise/rules.mk +++ b/keyboards/handwired/dygma/raise/rules.mk @@ -4,7 +4,6 @@ CUSTOM_MATRIX = lite # in the usb driver this triggers that allows mousekeys to work. The same side # effect happens if console or midi is enabled -- so something to do with # alternate usb endpoints. -RAW_ENABLE = yes I2C_DRIVER_REQUIRED = yes SRC += matrix.c diff --git a/keyboards/handwired/symmetric70_proto/promicro/info.json b/keyboards/handwired/symmetric70_proto/promicro/info.json index 29feccc819e..e567fb283d0 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/info.json +++ b/keyboards/handwired/symmetric70_proto/promicro/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Symmetric70 prototype promicro", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/symmetric70_proto/promicro/rules.mk b/keyboards/handwired/symmetric70_proto/promicro/rules.mk index 29f6808ed5d..6e7633bfe01 100644 --- a/keyboards/handwired/symmetric70_proto/promicro/rules.mk +++ b/keyboards/handwired/symmetric70_proto/promicro/rules.mk @@ -1,12 +1 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +# This file intentionally left blank diff --git a/keyboards/handwired/symmetric70_proto/proton_c/info.json b/keyboards/handwired/symmetric70_proto/proton_c/info.json index 1fd231bbc47..0b9e8584670 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/info.json +++ b/keyboards/handwired/symmetric70_proto/proton_c/info.json @@ -1,4 +1,9 @@ { "keyboard_name": "Symmetric70 prototype proton-c", - "development_board": "proton_c" + "development_board": "proton_c", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false + } } diff --git a/keyboards/handwired/symmetric70_proto/proton_c/rules.mk b/keyboards/handwired/symmetric70_proto/proton_c/rules.mk index 29f6808ed5d..6e7633bfe01 100644 --- a/keyboards/handwired/symmetric70_proto/proton_c/rules.mk +++ b/keyboards/handwired/symmetric70_proto/proton_c/rules.mk @@ -1,12 +1 @@ -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +# This file intentionally left blank diff --git a/keyboards/lazydesigners/dimple/ortho/rules.mk b/keyboards/lazydesigners/dimple/ortho/rules.mk index dcedd7449b5..623023fdb63 100644 --- a/keyboards/lazydesigners/dimple/ortho/rules.mk +++ b/keyboards/lazydesigners/dimple/ortho/rules.mk @@ -1,4 +1,3 @@ # Disable unsupported hardware BACKLIGHT_SUPPORTED = no -RGBLIGHT_ENABLE = no AUDIO_SUPPORTED = no diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk index 748a459f785..271780b75ec 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk +++ b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk @@ -1,3 +1,2 @@ # Disable unsupported hardware -RGBLIGHT_ENABLE = no AUDIO_SUPPORTED = no diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk index 748a459f785..271780b75ec 100644 --- a/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk +++ b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk @@ -1,3 +1,2 @@ # Disable unsupported hardware -RGBLIGHT_ENABLE = no AUDIO_SUPPORTED = no diff --git a/keyboards/sirius/uni660/rev2/ansi/keyboard.json b/keyboards/sirius/uni660/rev2/ansi/keyboard.json index bc09b260808..3db9fb966a7 100644 --- a/keyboards/sirius/uni660/rev2/ansi/keyboard.json +++ b/keyboards/sirius/uni660/rev2/ansi/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0202", "device_version": "20.0.4" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "unicode": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/sirius/uni660/rev2/iso/keyboard.json b/keyboards/sirius/uni660/rev2/iso/keyboard.json index af369f48daf..0e5958c1171 100644 --- a/keyboards/sirius/uni660/rev2/iso/keyboard.json +++ b/keyboards/sirius/uni660/rev2/iso/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0203", "device_version": "20.0.4" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "unicode": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/sirius/uni660/rev2/rules.mk b/keyboards/sirius/uni660/rev2/rules.mk index 791fa054c8e..c03b052c56b 100644 --- a/keyboards/sirius/uni660/rev2/rules.mk +++ b/keyboards/sirius/uni660/rev2/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