diff options
| author | Joel Challis | 2024-03-15 02:42:33 +0100 |
|---|---|---|
| committer | GitHub | 2024-03-15 02:42:33 +0100 |
| commit | 80b72487ce053f128817c5d4c625a63cb3cf9c10 (patch) | |
| tree | f81c6a7254e9489f36d50f3f451f4421f1bc5a35 /keyboards/merge | |
| parent | 539fa21bf80308a21048334909b6512917aa3c7b (diff) | |
Migrate features from rules.mk to data drive - LMN (#23277)
Diffstat (limited to 'keyboards/merge')
| -rw-r--r-- | keyboards/merge/iso_macro/keyboard.json (renamed from keyboards/merge/iso_macro/info.json) | 10 | ||||
| -rw-r--r-- | keyboards/merge/iso_macro/rules.mk | 13 | ||||
| -rw-r--r-- | keyboards/merge/uc1/keyboard.json (renamed from keyboards/merge/uc1/info.json) | 10 | ||||
| -rw-r--r-- | keyboards/merge/uc1/rules.mk | 13 |
4 files changed, 20 insertions, 26 deletions
diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/keyboard.json index fe20e701ba..1c6d905282 100644 --- a/keyboards/merge/iso_macro/info.json +++ b/keyboards/merge/iso_macro/keyboard.json @@ -8,6 +8,16 @@ "pid": "0x1200", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["B4", "B5", "B6"], "rows": ["F4", "F5", "F6"] diff --git a/keyboards/merge/iso_macro/rules.mk b/keyboards/merge/iso_macro/rules.mk deleted file mode 100644 index f6b1d47e1a..0000000000 --- a/keyboards/merge/iso_macro/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 = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/keyboard.json index b1f032417f..85e9b03c64 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/keyboard.json @@ -30,6 +30,16 @@ "ws2812": { "pin": "B5" }, + "features": { + "bootmagic": false, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, "matrix_pins": { "cols": ["B3", "B4"], "rows": ["B1", "B2"] diff --git a/keyboards/merge/uc1/rules.mk b/keyboards/merge/uc1/rules.mk deleted file mode 100644 index e78e1f6cec..0000000000 --- a/keyboards/merge/uc1/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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes |