From 2d9140af53e4e5bbc5cd50a2b6f3eda20ed8f71e Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 3 Apr 2023 15:50:31 +1000 Subject: Fix a handful of CLI errors (#20321) --- keyboards/lily58/glow_enc/info.json | 6 ++++++ keyboards/lily58/glow_enc/rules.mk | 9 +-------- keyboards/lily58/light/info.json | 7 +++++++ keyboards/lily58/light/rules.mk | 4 +--- keyboards/lily58/rev1/info.json | 4 ++++ keyboards/lily58/rules.mk | 16 +--------------- 6 files changed, 20 insertions(+), 26 deletions(-) (limited to 'keyboards/lily58') diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json index 01bd6835ff..47911a04a2 100644 --- a/keyboards/lily58/glow_enc/info.json +++ b/keyboards/lily58/glow_enc/info.json @@ -8,6 +8,11 @@ "pid": "0x0059", "device_version": "1.0.0" }, + "features": { + "encoder": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] @@ -19,6 +24,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/lily58/glow_enc/rules.mk b/keyboards/lily58/glow_enc/rules.mk index 3d80190eb2..4da205a168 100644 --- a/keyboards/lily58/glow_enc/rules.mk +++ b/keyboards/lily58/glow_enc/rules.mk @@ -1,8 +1 @@ -ENCODER_ENABLE = yes # ENables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB light -LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features -BOOTMAGIC_ENABLE = no -RGB_MATRIX_ENABLE = no # Per key rgb leds - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend \ No newline at end of file +LTO_ENABLE = yes diff --git a/keyboards/lily58/light/info.json b/keyboards/lily58/light/info.json index 0ab0bd68d2..fcbae26163 100644 --- a/keyboards/lily58/light/info.json +++ b/keyboards/lily58/light/info.json @@ -8,6 +8,12 @@ "pid": "0x4C4C", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "oled": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] @@ -19,6 +25,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "encoder": { "right": { diff --git a/keyboards/lily58/light/rules.mk b/keyboards/lily58/light/rules.mk index d4957d98e4..4da205a168 100644 --- a/keyboards/lily58/light/rules.mk +++ b/keyboards/lily58/light/rules.mk @@ -1,3 +1 @@ -ENCODER_ENABLE = yes # ENables the use of one or more encoders -RGBLIGHT_ENABLE = yes # Enable keyboard RGB light -LTO_ENABLE = yes # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features +LTO_ENABLE = yes diff --git a/keyboards/lily58/rev1/info.json b/keyboards/lily58/rev1/info.json index 373fd0c5c8..a484904923 100644 --- a/keyboards/lily58/rev1/info.json +++ b/keyboards/lily58/rev1/info.json @@ -8,12 +8,16 @@ "pid": "0xEB2D", "device_version": "1.0.0" }, + "features": { + "oled": true + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk index 2fca52967d..76ce166170 100644 --- a/keyboards/lily58/rules.mk +++ b/keyboards/lily58/rules.mk @@ -1,17 +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 # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 # OLED display -SPLIT_KEYBOARD = yes +OLED_DRIVER = SSD1306 DEFAULT_FOLDER = lily58/rev1 -- cgit v1.2.3