diff options
author | Ryan <fauxpark@gmail.com> | 2022-11-04 05:26:18 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-03 18:26:18 +0000 |
commit | 40122c28e026ab2da6dd784b66fd8de2b6dc1fed (patch) | |
tree | a23b7ef28bc7de5a77c76c0156f81132998fefe3 | |
parent | db2aa039f197f958fbf0e95c0d7256a5a41c7163 (diff) |
Resolve info.json/rules.mk feature conflicts in three boards (#18942)
-rw-r--r-- | keyboards/0_sixty/info.json | 9 | ||||
-rw-r--r-- | keyboards/0_sixty/rules.mk | 20 | ||||
-rw-r--r-- | keyboards/handwired/reclined/info.json | 8 | ||||
-rw-r--r-- | keyboards/handwired/reclined/rules.mk | 19 | ||||
-rw-r--r-- | keyboards/makenova/omega/omega4/info.json | 2 | ||||
-rw-r--r-- | keyboards/makenova/omega/omega4/rules.mk | 19 |
6 files changed, 12 insertions, 65 deletions
diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json index 7fc718c602..154f7bd442 100644 --- a/keyboards/0_sixty/info.json +++ b/keyboards/0_sixty/info.json @@ -6,6 +6,15 @@ "vid": "0x7654", "device_version": "0.0.1" }, + "features": { + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "lto": true + }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_1x2uC": { "layout": [ diff --git a/keyboards/0_sixty/rules.mk b/keyboards/0_sixty/rules.mk index 18f45534c8..a0d06a89dd 100644 --- a/keyboards/0_sixty/rules.mk +++ b/keyboards/0_sixty/rules.mk @@ -1,21 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -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 - -LTO_ENABLE = yes # Link-time opt - DEFAULT_FOLDER = 0_sixty/base diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json index a5f308fa75..bc928b2b44 100644 --- a/keyboards/handwired/reclined/info.json +++ b/keyboards/handwired/reclined/info.json @@ -6,16 +6,10 @@ "debounce": 5, "diode_direction": "ROW2COL", "features": { - "audio": false, - "backlight": false, - "bootmagic": false, "command": true, "console": true, "extrakey": true, - "mousekey": true, - "nkro": false, - "sleep_led": false, - "unicode": false + "mousekey": true }, "matrix_pins": { "cols": ["B2", "F4", "B3", "F5", "B1", "F6", "D4", "D7", "D0", "E6", "D1", "B4"], diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk index 64e496d030..6e7633bfe0 100644 --- a/keyboards/handwired/reclined/rules.mk +++ b/keyboards/handwired/reclined/rules.mk @@ -1,18 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# 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 +# This file intentionally left blank diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/info.json index 5e9bf22595..437f850963 100644 --- a/keyboards/makenova/omega/omega4/info.json +++ b/keyboards/makenova/omega/omega4/info.json @@ -6,8 +6,6 @@ "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": true diff --git a/keyboards/makenova/omega/omega4/rules.mk b/keyboards/makenova/omega/omega4/rules.mk index 515ca5621f..6e7633bfe0 100644 --- a/keyboards/makenova/omega/omega4/rules.mk +++ b/keyboards/makenova/omega/omega4/rules.mk @@ -1,18 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -# 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 +# This file intentionally left blank |