From 88453acc6aa4c92fdcc90f706987114cc4b9a237 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 19 Apr 2025 19:56:45 +0100 Subject: [PATCH 1/2] Remove duplication of RGBLight defaults (#25169) --- keyboards/anavi/knobs3/keyboard.json | 3 --- keyboards/anavi/macropad10/keyboard.json | 3 --- keyboards/ask55/keyboard.json | 2 -- keyboards/cannonkeys/ripple/keyboard.json | 2 -- keyboards/chickenman/ciel65/keyboard.json | 2 -- keyboards/clueboard/17/keyboard.json | 4 +--- keyboards/clueboard/2x1800/2018/keyboard.json | 1 - keyboards/clueboard/66/rev1/keyboard.json | 4 +--- keyboards/clueboard/66/rev2/keyboard.json | 4 +--- keyboards/clueboard/66/rev3/keyboard.json | 4 +--- keyboards/clueboard/66/rev4/keyboard.json | 4 +--- keyboards/clueboard/66_hotswap/prototype/keyboard.json | 4 +--- keyboards/clueboard/card/keyboard.json | 4 +--- keyboards/ghs/jem/info.json | 2 -- keyboards/hillside/46/0_1/keyboard.json | 1 - keyboards/hillside/48/0_1/keyboard.json | 1 - keyboards/hillside/52/0_1/keyboard.json | 1 - keyboards/jaykeeb/kamigakushi/keyboard.json | 2 -- keyboards/jaykeeb/sriwedari70/keyboard.json | 2 -- keyboards/kbdfans/odinmini/keyboard.json | 1 - keyboards/keycapsss/3w6_2040/keyboard.json | 1 - keyboards/keyspensory/kp60/keyboard.json | 1 - keyboards/kprepublic/jj50/rev2/keyboard.json | 1 - keyboards/lxxt/keyboard.json | 2 -- keyboards/mechwild/bde/info.json | 3 +-- keyboards/mechwild/bde/rev2/keyboard.json | 1 - keyboards/mechwild/sugarglider/info.json | 2 -- keyboards/mk65/keyboard.json | 2 -- keyboards/mlego/m65/rev1/keyboard.json | 1 - keyboards/mlego/m65/rev2/keyboard.json | 1 - keyboards/mlego/m65/rev3/keyboard.json | 1 - keyboards/mlego/m65/rev4/keyboard.json | 1 - keyboards/mwstudio/mw80/keyboard.json | 2 -- keyboards/nightly_boards/octopadplus/keyboard.json | 2 -- keyboards/pauperboards/brick/keyboard.json | 1 - keyboards/plywrks/allaro/keyboard.json | 2 -- keyboards/prototypist/oceanographer/keyboard.json | 2 -- keyboards/rastersoft/minitkl/keyboard.json | 1 - keyboards/reedskeebs/alish40/keyboard.json | 4 +--- keyboards/salicylic_acid3/guide68/keyboard.json | 1 - keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json | 2 -- keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json | 2 -- keyboards/studiokestra/galatea/rev2/keyboard.json | 1 - keyboards/studiokestra/galatea/rev3/keyboard.json | 1 - keyboards/takashicompany/goat51/keyboard.json | 2 -- keyboards/takashicompany/spreadwriter/keyboard.json | 2 -- keyboards/tau4/keyboard.json | 1 - keyboards/tweetydabird/lbs4/keyboard.json | 3 --- keyboards/tweetydabird/lbs6/keyboard.json | 3 --- keyboards/vinhcatba/uncertainty/keyboard.json | 1 - keyboards/work_louder/micro/keyboard.json | 1 - keyboards/work_louder/numpad/keyboard.json | 1 - keyboards/yoichiro/lunakey_pico/keyboard.json | 4 +--- 53 files changed, 10 insertions(+), 97 deletions(-) diff --git a/keyboards/anavi/knobs3/keyboard.json b/keyboards/anavi/knobs3/keyboard.json index 11081ee0863..86aaadf98fb 100644 --- a/keyboards/anavi/knobs3/keyboard.json +++ b/keyboards/anavi/knobs3/keyboard.json @@ -23,9 +23,6 @@ "rgblight": { "led_count": 1, "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, - "max_brightness": 255, "animations": { "alternating": true, "breathing": true, diff --git a/keyboards/anavi/macropad10/keyboard.json b/keyboards/anavi/macropad10/keyboard.json index a355fdd5492..2e1218d45ff 100644 --- a/keyboards/anavi/macropad10/keyboard.json +++ b/keyboards/anavi/macropad10/keyboard.json @@ -22,9 +22,6 @@ "rgblight": { "led_count": 4, "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, - "max_brightness": 255, "animations": { "alternating": true, "breathing": true, diff --git a/keyboards/ask55/keyboard.json b/keyboards/ask55/keyboard.json index 66efb1749ae..53451e5329d 100644 --- a/keyboards/ask55/keyboard.json +++ b/keyboards/ask55/keyboard.json @@ -36,9 +36,7 @@ "static_gradient": true }, "brightness_steps": 8, - "hue_steps": 8, "led_count": 8, - "max_brightness": 255, "saturation_steps": 8, "sleep": true }, diff --git a/keyboards/cannonkeys/ripple/keyboard.json b/keyboards/cannonkeys/ripple/keyboard.json index 3dc11719a14..bce98e226c4 100644 --- a/keyboards/cannonkeys/ripple/keyboard.json +++ b/keyboards/cannonkeys/ripple/keyboard.json @@ -36,8 +36,6 @@ "rgblight": { "led_count": 20, "hue_steps": 17, - "saturation_steps": 17, - "brightness_steps": 17, "animations": { "static_gradient": true, "twinkle": true, diff --git a/keyboards/chickenman/ciel65/keyboard.json b/keyboards/chickenman/ciel65/keyboard.json index 8c316759a8c..70527b2aaf6 100644 --- a/keyboards/chickenman/ciel65/keyboard.json +++ b/keyboards/chickenman/ciel65/keyboard.json @@ -26,10 +26,8 @@ }, "rgblight": { "led_count": 14, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, - "max_brightness": 255, "sleep": true, "animations": { "alternating": true, diff --git a/keyboards/clueboard/17/keyboard.json b/keyboards/clueboard/17/keyboard.json index d6aec9cfcc8..dcf273afdac 100644 --- a/keyboards/clueboard/17/keyboard.json +++ b/keyboards/clueboard/17/keyboard.json @@ -32,10 +32,8 @@ "static_gradient": true, "twinkle": true }, - "brightness_steps": 17, "hue_steps": 10, - "led_count": 4, - "saturation_steps": 17 + "led_count": 4 }, "ws2812": { "pin": "F6" diff --git a/keyboards/clueboard/2x1800/2018/keyboard.json b/keyboards/clueboard/2x1800/2018/keyboard.json index 1a926c62b9a..e7b4c95ce32 100644 --- a/keyboards/clueboard/2x1800/2018/keyboard.json +++ b/keyboards/clueboard/2x1800/2018/keyboard.json @@ -44,7 +44,6 @@ "twinkle": true }, "brightness_steps": 8, - "hue_steps": 8, "led_count": 16, "saturation_steps": 8 }, diff --git a/keyboards/clueboard/66/rev1/keyboard.json b/keyboards/clueboard/66/rev1/keyboard.json index ca1e3a6553b..4743a125b93 100644 --- a/keyboards/clueboard/66/rev1/keyboard.json +++ b/keyboards/clueboard/66/rev1/keyboard.json @@ -33,10 +33,8 @@ "static_gradient": true, "twinkle": true }, - "brightness_steps": 17, "hue_steps": 10, - "led_count": 14, - "saturation_steps": 17 + "led_count": 14 }, "ws2812": { "pin": "B2" diff --git a/keyboards/clueboard/66/rev2/keyboard.json b/keyboards/clueboard/66/rev2/keyboard.json index fea4f8d39bc..39ca7c48416 100644 --- a/keyboards/clueboard/66/rev2/keyboard.json +++ b/keyboards/clueboard/66/rev2/keyboard.json @@ -34,10 +34,8 @@ "static_gradient": true, "twinkle": true }, - "brightness_steps": 17, "hue_steps": 32, - "led_count": 14, - "saturation_steps": 17 + "led_count": 14 }, "ws2812": { "pin": "D7" diff --git a/keyboards/clueboard/66/rev3/keyboard.json b/keyboards/clueboard/66/rev3/keyboard.json index 4553979d8a2..7713c734819 100644 --- a/keyboards/clueboard/66/rev3/keyboard.json +++ b/keyboards/clueboard/66/rev3/keyboard.json @@ -34,10 +34,8 @@ "static_gradient": true, "twinkle": true }, - "brightness_steps": 17, "hue_steps": 32, - "led_count": 18, - "saturation_steps": 17 + "led_count": 18 }, "ws2812": { "pin": "D7" diff --git a/keyboards/clueboard/66/rev4/keyboard.json b/keyboards/clueboard/66/rev4/keyboard.json index dbc1b94915d..d834b688f99 100644 --- a/keyboards/clueboard/66/rev4/keyboard.json +++ b/keyboards/clueboard/66/rev4/keyboard.json @@ -32,10 +32,8 @@ "static_gradient": true, "twinkle": true }, - "brightness_steps": 17, "hue_steps": 32, - "led_count": 18, - "saturation_steps": 17 + "led_count": 18 }, "ws2812": { "pin": "D7" diff --git a/keyboards/clueboard/66_hotswap/prototype/keyboard.json b/keyboards/clueboard/66_hotswap/prototype/keyboard.json index 9d0b0dd27c7..1325612ed3c 100644 --- a/keyboards/clueboard/66_hotswap/prototype/keyboard.json +++ b/keyboards/clueboard/66_hotswap/prototype/keyboard.json @@ -39,10 +39,8 @@ "static_gradient": true, "twinkle": true }, - "brightness_steps": 17, "hue_steps": 32, - "led_count": 26, - "saturation_steps": 17 + "led_count": 26 }, "ws2812": { "pin": "D7" diff --git a/keyboards/clueboard/card/keyboard.json b/keyboards/clueboard/card/keyboard.json index 0425819ed7a..3929c073d70 100644 --- a/keyboards/clueboard/card/keyboard.json +++ b/keyboards/clueboard/card/keyboard.json @@ -25,10 +25,8 @@ "rows": ["F0", "F5", "F4", "B4"] }, "rgblight": { - "brightness_steps": 17, "hue_steps": 10, - "led_count": 4, - "saturation_steps": 17 + "led_count": 4 }, "ws2812": { "pin": "E6" diff --git a/keyboards/ghs/jem/info.json b/keyboards/ghs/jem/info.json index b90655647d5..21d9bf0e6ba 100644 --- a/keyboards/ghs/jem/info.json +++ b/keyboards/ghs/jem/info.json @@ -29,8 +29,6 @@ "rgblight": { "led_count": 22, "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, "animations": { "breathing": true, "rainbow_mood": true, diff --git a/keyboards/hillside/46/0_1/keyboard.json b/keyboards/hillside/46/0_1/keyboard.json index 663eeb25f4e..7d3967c8c36 100644 --- a/keyboards/hillside/46/0_1/keyboard.json +++ b/keyboards/hillside/46/0_1/keyboard.json @@ -40,7 +40,6 @@ "rgblight": { "led_count": 4, "split": true, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, "sleep": true diff --git a/keyboards/hillside/48/0_1/keyboard.json b/keyboards/hillside/48/0_1/keyboard.json index 4dd2e013617..acae16f3470 100644 --- a/keyboards/hillside/48/0_1/keyboard.json +++ b/keyboards/hillside/48/0_1/keyboard.json @@ -40,7 +40,6 @@ "rgblight": { "led_count": 5, "split": true, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, "sleep": true diff --git a/keyboards/hillside/52/0_1/keyboard.json b/keyboards/hillside/52/0_1/keyboard.json index c8db3917d67..469e6c58443 100644 --- a/keyboards/hillside/52/0_1/keyboard.json +++ b/keyboards/hillside/52/0_1/keyboard.json @@ -40,7 +40,6 @@ "rgblight": { "led_count": 5, "split": true, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, "sleep": true diff --git a/keyboards/jaykeeb/kamigakushi/keyboard.json b/keyboards/jaykeeb/kamigakushi/keyboard.json index 7ab02d2c66c..6095d9cd87c 100644 --- a/keyboards/jaykeeb/kamigakushi/keyboard.json +++ b/keyboards/jaykeeb/kamigakushi/keyboard.json @@ -19,10 +19,8 @@ }, "rgblight": { "led_count": 2, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, - "max_brightness": 255, "animations": { "alternating": true, "breathing": true, diff --git a/keyboards/jaykeeb/sriwedari70/keyboard.json b/keyboards/jaykeeb/sriwedari70/keyboard.json index c9569a9724a..20f7e00ba41 100644 --- a/keyboards/jaykeeb/sriwedari70/keyboard.json +++ b/keyboards/jaykeeb/sriwedari70/keyboard.json @@ -30,10 +30,8 @@ }, "rgblight": { "led_count": 8, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, - "max_brightness": 255, "animations": { "alternating": true, "breathing": true, diff --git a/keyboards/kbdfans/odinmini/keyboard.json b/keyboards/kbdfans/odinmini/keyboard.json index a9cb1a798fc..34002e83d86 100644 --- a/keyboards/kbdfans/odinmini/keyboard.json +++ b/keyboards/kbdfans/odinmini/keyboard.json @@ -35,7 +35,6 @@ "twinkle": true }, "brightness_steps": 8, - "hue_steps": 8, "led_count": 4, "max_brightness": 180, "saturation_steps": 8, diff --git a/keyboards/keycapsss/3w6_2040/keyboard.json b/keyboards/keycapsss/3w6_2040/keyboard.json index f29b3753c6b..e481b98894d 100644 --- a/keyboards/keycapsss/3w6_2040/keyboard.json +++ b/keyboards/keycapsss/3w6_2040/keyboard.json @@ -42,7 +42,6 @@ "sat": 232, "speed": 2 }, - "hue_steps": 8, "led_count": 2, "max_brightness": 100, "saturation_steps": 8, diff --git a/keyboards/keyspensory/kp60/keyboard.json b/keyboards/keyspensory/kp60/keyboard.json index 1172e14d455..8672cf10e8e 100644 --- a/keyboards/keyspensory/kp60/keyboard.json +++ b/keyboards/keyspensory/kp60/keyboard.json @@ -26,7 +26,6 @@ }, "rgblight": { "led_count": 8, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, "animations": { diff --git a/keyboards/kprepublic/jj50/rev2/keyboard.json b/keyboards/kprepublic/jj50/rev2/keyboard.json index b739c20713b..c3e0f7a3226 100644 --- a/keyboards/kprepublic/jj50/rev2/keyboard.json +++ b/keyboards/kprepublic/jj50/rev2/keyboard.json @@ -39,7 +39,6 @@ "twinkle": true }, "brightness_steps": 8, - "hue_steps": 8, "led_count": 6, "saturation_steps": 8 }, diff --git a/keyboards/lxxt/keyboard.json b/keyboards/lxxt/keyboard.json index 3a2700883d5..5a028cacd89 100644 --- a/keyboards/lxxt/keyboard.json +++ b/keyboards/lxxt/keyboard.json @@ -26,10 +26,8 @@ }, "rgblight": { "led_count": 16, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, - "max_brightness": 255, "sleep": true, "animations": { "alternating": true, diff --git a/keyboards/mechwild/bde/info.json b/keyboards/mechwild/bde/info.json index 918c792aa70..edecde1ebae 100644 --- a/keyboards/mechwild/bde/info.json +++ b/keyboards/mechwild/bde/info.json @@ -10,8 +10,7 @@ }, "development_board": "promicro", "rgblight": { - "sleep": true, - "max_brightness": 255 + "sleep": true }, "tapping": { "tap_keycode_delay": 10, diff --git a/keyboards/mechwild/bde/rev2/keyboard.json b/keyboards/mechwild/bde/rev2/keyboard.json index 932f99f0e96..b166934e1e0 100644 --- a/keyboards/mechwild/bde/rev2/keyboard.json +++ b/keyboards/mechwild/bde/rev2/keyboard.json @@ -34,7 +34,6 @@ "animations": { "rainbow_swirl": true }, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8 }, diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index 80004f35d14..0b796f7c21d 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -18,8 +18,6 @@ }, "rgblight": { "led_count": 10, - "max_brightness": 255, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, "animations": { diff --git a/keyboards/mk65/keyboard.json b/keyboards/mk65/keyboard.json index 9135deaf199..07a78872c4d 100644 --- a/keyboards/mk65/keyboard.json +++ b/keyboards/mk65/keyboard.json @@ -34,10 +34,8 @@ }, "rgblight": { "led_count": 7, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, - "max_brightness": 255, "sleep": true, "animations": { "alternating": true, diff --git a/keyboards/mlego/m65/rev1/keyboard.json b/keyboards/mlego/m65/rev1/keyboard.json index 2f77137eec9..b763c2e2cf3 100644 --- a/keyboards/mlego/m65/rev1/keyboard.json +++ b/keyboards/mlego/m65/rev1/keyboard.json @@ -42,7 +42,6 @@ "static_gradient": true, "twinkle": true }, - "hue_steps": 8, "layers": { "enabled": true }, diff --git a/keyboards/mlego/m65/rev2/keyboard.json b/keyboards/mlego/m65/rev2/keyboard.json index 00147673091..f07f1280a41 100644 --- a/keyboards/mlego/m65/rev2/keyboard.json +++ b/keyboards/mlego/m65/rev2/keyboard.json @@ -41,7 +41,6 @@ "static_gradient": true, "twinkle": true }, - "hue_steps": 8, "layers": { "enabled": true }, diff --git a/keyboards/mlego/m65/rev3/keyboard.json b/keyboards/mlego/m65/rev3/keyboard.json index 4b7980b63bf..168a214a88a 100644 --- a/keyboards/mlego/m65/rev3/keyboard.json +++ b/keyboards/mlego/m65/rev3/keyboard.json @@ -42,7 +42,6 @@ "static_gradient": true, "twinkle": true }, - "hue_steps": 8, "layers": { "enabled": true }, diff --git a/keyboards/mlego/m65/rev4/keyboard.json b/keyboards/mlego/m65/rev4/keyboard.json index ab2a708ba88..a83f363bb1e 100644 --- a/keyboards/mlego/m65/rev4/keyboard.json +++ b/keyboards/mlego/m65/rev4/keyboard.json @@ -44,7 +44,6 @@ "static_gradient": true, "twinkle": true }, - "hue_steps": 8, "layers": { "enabled": true }, diff --git a/keyboards/mwstudio/mw80/keyboard.json b/keyboards/mwstudio/mw80/keyboard.json index 829e97591c6..08591eb7065 100644 --- a/keyboards/mwstudio/mw80/keyboard.json +++ b/keyboards/mwstudio/mw80/keyboard.json @@ -29,8 +29,6 @@ "rgblight": { "led_count": 16, "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, "animations": { "alternating": true, "breathing": true, diff --git a/keyboards/nightly_boards/octopadplus/keyboard.json b/keyboards/nightly_boards/octopadplus/keyboard.json index ca5a7cdad16..8b94b722a82 100644 --- a/keyboards/nightly_boards/octopadplus/keyboard.json +++ b/keyboards/nightly_boards/octopadplus/keyboard.json @@ -52,9 +52,7 @@ "twinkle": true }, "brightness_steps": 8, - "hue_steps": 8, "led_count": 8, - "max_brightness": 255, "saturation_steps": 8, "sleep": true }, diff --git a/keyboards/pauperboards/brick/keyboard.json b/keyboards/pauperboards/brick/keyboard.json index 8ebe32ded41..d1267f08918 100644 --- a/keyboards/pauperboards/brick/keyboard.json +++ b/keyboards/pauperboards/brick/keyboard.json @@ -35,7 +35,6 @@ }, "rgblight": { "led_count": 8, - "hue_steps": 8, "brightness_steps": 8, "saturation_steps": 8, "animations": { diff --git a/keyboards/plywrks/allaro/keyboard.json b/keyboards/plywrks/allaro/keyboard.json index fecc15f73bc..a9a0a175b60 100644 --- a/keyboards/plywrks/allaro/keyboard.json +++ b/keyboards/plywrks/allaro/keyboard.json @@ -26,8 +26,6 @@ "rgblight": { "led_count": 16, "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, "animations": { "alternating": true, "breathing": true, diff --git a/keyboards/prototypist/oceanographer/keyboard.json b/keyboards/prototypist/oceanographer/keyboard.json index 8b0209d451f..13bc41355c4 100644 --- a/keyboards/prototypist/oceanographer/keyboard.json +++ b/keyboards/prototypist/oceanographer/keyboard.json @@ -29,8 +29,6 @@ "led_count": 3, "sleep": true, "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, "max_brightness": 155, "animations": { "alternating": true, diff --git a/keyboards/rastersoft/minitkl/keyboard.json b/keyboards/rastersoft/minitkl/keyboard.json index e8d06919597..6b0869bc633 100644 --- a/keyboards/rastersoft/minitkl/keyboard.json +++ b/keyboards/rastersoft/minitkl/keyboard.json @@ -24,7 +24,6 @@ "rgblight": { "led_count": 3, "pin": "B2", - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, "animations": { diff --git a/keyboards/reedskeebs/alish40/keyboard.json b/keyboards/reedskeebs/alish40/keyboard.json index 1a4b9f4afed..564d4eeeda5 100644 --- a/keyboards/reedskeebs/alish40/keyboard.json +++ b/keyboards/reedskeebs/alish40/keyboard.json @@ -34,10 +34,8 @@ "static_gradient": true, "twinkle": true }, - "brightness_steps": 17, "hue_steps": 10, - "led_count": 10, - "saturation_steps": 17 + "led_count": 10 }, "ws2812": { "pin": "F5" diff --git a/keyboards/salicylic_acid3/guide68/keyboard.json b/keyboards/salicylic_acid3/guide68/keyboard.json index 0714262858f..d2c6f10d11c 100644 --- a/keyboards/salicylic_acid3/guide68/keyboard.json +++ b/keyboards/salicylic_acid3/guide68/keyboard.json @@ -39,7 +39,6 @@ "twinkle": true }, "sleep": true, - "max_brightness": 255, "split": true, "split_count": [6, 6] }, diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json b/keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json index 7586ed5a347..e4b63753e2d 100644 --- a/keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json +++ b/keyboards/sawnsprojects/eclipse/eclipse60/keyboard.json @@ -26,10 +26,8 @@ }, "rgblight": { "led_count": 18, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, - "max_brightness": 255, "sleep": true, "animations": { "alternating": true, diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json b/keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json index 80ae2558f2d..6790011807c 100644 --- a/keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json +++ b/keyboards/sawnsprojects/eclipse/tinyneko/keyboard.json @@ -26,10 +26,8 @@ }, "rgblight": { "led_count": 18, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, - "max_brightness": 255, "sleep": true, "animations": { "alternating": true, diff --git a/keyboards/studiokestra/galatea/rev2/keyboard.json b/keyboards/studiokestra/galatea/rev2/keyboard.json index 115b5684cd3..19bb235e33a 100644 --- a/keyboards/studiokestra/galatea/rev2/keyboard.json +++ b/keyboards/studiokestra/galatea/rev2/keyboard.json @@ -40,7 +40,6 @@ }, "rgblight": { "led_count": 24, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, "max_brightness": 200, diff --git a/keyboards/studiokestra/galatea/rev3/keyboard.json b/keyboards/studiokestra/galatea/rev3/keyboard.json index a4b07bb4df6..c077351bb92 100644 --- a/keyboards/studiokestra/galatea/rev3/keyboard.json +++ b/keyboards/studiokestra/galatea/rev3/keyboard.json @@ -36,7 +36,6 @@ }, "rgblight": { "led_count": 24, - "hue_steps": 8, "saturation_steps": 8, "brightness_steps": 8, "max_brightness": 200, diff --git a/keyboards/takashicompany/goat51/keyboard.json b/keyboards/takashicompany/goat51/keyboard.json index c4246857133..8ef4c543436 100644 --- a/keyboards/takashicompany/goat51/keyboard.json +++ b/keyboards/takashicompany/goat51/keyboard.json @@ -32,8 +32,6 @@ "rgblight": { "led_count": 11, "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, "animations": { "alternating": true, "breathing": true, diff --git a/keyboards/takashicompany/spreadwriter/keyboard.json b/keyboards/takashicompany/spreadwriter/keyboard.json index 2c9fcd1619a..59c78c45323 100644 --- a/keyboards/takashicompany/spreadwriter/keyboard.json +++ b/keyboards/takashicompany/spreadwriter/keyboard.json @@ -31,8 +31,6 @@ "rgblight": { "led_count": 53, "hue_steps": 10, - "saturation_steps": 17, - "brightness_steps": 17, "animations": { "alternating": true, "breathing": true, diff --git a/keyboards/tau4/keyboard.json b/keyboards/tau4/keyboard.json index f5acdbddd33..9a8e280905d 100644 --- a/keyboards/tau4/keyboard.json +++ b/keyboards/tau4/keyboard.json @@ -47,7 +47,6 @@ "twinkle": true }, "brightness_steps": 8, - "hue_steps": 8, "layers": { "blink": false, "enabled": true, diff --git a/keyboards/tweetydabird/lbs4/keyboard.json b/keyboards/tweetydabird/lbs4/keyboard.json index 31765207722..e223289a3c0 100644 --- a/keyboards/tweetydabird/lbs4/keyboard.json +++ b/keyboards/tweetydabird/lbs4/keyboard.json @@ -36,9 +36,6 @@ }, "rgblight": { "led_count": 6, - "hue_steps": 8, - "saturation_steps": 17, - "brightness_steps": 17, "max_brightness": 175, "animations": { "alternating": true, diff --git a/keyboards/tweetydabird/lbs6/keyboard.json b/keyboards/tweetydabird/lbs6/keyboard.json index 1714e9b6c46..57be9289f86 100644 --- a/keyboards/tweetydabird/lbs6/keyboard.json +++ b/keyboards/tweetydabird/lbs6/keyboard.json @@ -39,9 +39,6 @@ }, "rgblight": { "led_count": 8, - "hue_steps": 8, - "saturation_steps": 17, - "brightness_steps": 17, "max_brightness": 200, "animations": { "alternating": true, diff --git a/keyboards/vinhcatba/uncertainty/keyboard.json b/keyboards/vinhcatba/uncertainty/keyboard.json index 5f35a144d83..551e30c823a 100644 --- a/keyboards/vinhcatba/uncertainty/keyboard.json +++ b/keyboards/vinhcatba/uncertainty/keyboard.json @@ -47,7 +47,6 @@ "override_rgb": true }, "led_count": 14, - "max_brightness": 255, "sleep": true }, "url": "", diff --git a/keyboards/work_louder/micro/keyboard.json b/keyboards/work_louder/micro/keyboard.json index 1b57ca82e88..b9ba6227bd7 100644 --- a/keyboards/work_louder/micro/keyboard.json +++ b/keyboards/work_louder/micro/keyboard.json @@ -38,7 +38,6 @@ "hue": 213 }, "brightness_steps": 8, - "hue_steps": 8, "led_count": 8, "max_brightness": 150, "saturation_steps": 8, diff --git a/keyboards/work_louder/numpad/keyboard.json b/keyboards/work_louder/numpad/keyboard.json index bd615c40808..08bf7295dac 100644 --- a/keyboards/work_louder/numpad/keyboard.json +++ b/keyboards/work_louder/numpad/keyboard.json @@ -99,7 +99,6 @@ "hue": 213 }, "brightness_steps": 8, - "hue_steps": 8, "led_count": 8, "max_brightness": 120, "saturation_steps": 8, diff --git a/keyboards/yoichiro/lunakey_pico/keyboard.json b/keyboards/yoichiro/lunakey_pico/keyboard.json index 39070d615a6..a6db26fde0e 100644 --- a/keyboards/yoichiro/lunakey_pico/keyboard.json +++ b/keyboards/yoichiro/lunakey_pico/keyboard.json @@ -41,10 +41,8 @@ "static_gradient": true, "twinkle": true }, - "hue_steps": 8, "saturation_steps": 8, - "brightness_steps": 8, - "max_brightness": 255 + "brightness_steps": 8 }, "split": { "enabled": true, From ea85ace4a90baca401e49f35365a6a8f7d3802c4 Mon Sep 17 00:00:00 2001 From: Pascal Getreuer <50221757+getreuer@users.noreply.github.com> Date: Sat, 19 Apr 2025 11:57:00 -0700 Subject: [PATCH 2/2] Ignore the Layer Lock key in Repeat Key and Caps Word. (#25171) --- quantum/process_keycode/process_caps_word.c | 7 ++- quantum/process_keycode/process_repeat_key.c | 5 +- tests/caps_word/test.mk | 2 + tests/caps_word/test_caps_word.cpp | 52 +++++++++++++++++--- tests/repeat_key/test.mk | 1 + tests/repeat_key/test_repeat_key.cpp | 33 +++++++++++++ 6 files changed, 91 insertions(+), 9 deletions(-) diff --git a/quantum/process_keycode/process_caps_word.c b/quantum/process_keycode/process_caps_word.c index b8fb868c6d3..8ab66cc5213 100644 --- a/quantum/process_keycode/process_caps_word.c +++ b/quantum/process_keycode/process_caps_word.c @@ -160,8 +160,13 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) { case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX: case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX: case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX: +#ifdef TRI_LAYER_ENABLE // Ignore Tri Layer keys. case QK_TRI_LAYER_LOWER ... QK_TRI_LAYER_UPPER: - // Ignore AltGr. +#endif // TRI_LAYER_ENABLE +#ifdef LAYER_LOCK_ENABLE // Ignore Layer Lock key. + case QK_LAYER_LOCK: +#endif // LAYER_LOCK_ENABLE + // Ignore AltGr. case KC_RALT: case OSM(MOD_RALT): return true; diff --git a/quantum/process_keycode/process_repeat_key.c b/quantum/process_keycode/process_repeat_key.c index 73f4ddedcf1..fdeed4f4665 100644 --- a/quantum/process_keycode/process_repeat_key.c +++ b/quantum/process_keycode/process_repeat_key.c @@ -41,7 +41,10 @@ static bool remember_last_key(uint16_t keycode, keyrecord_t* record, uint8_t* re #ifdef TRI_LAYER_ENABLE // Ignore Tri Layer keys. case QK_TRI_LAYER_LOWER: case QK_TRI_LAYER_UPPER: -#endif // TRI_LAYER_ENABLE +#endif // TRI_LAYER_ENABLE +#ifdef LAYER_LOCK_ENABLE // Ignore Layer Lock key. + case QK_LAYER_LOCK: +#endif // LAYER_LOCK_ENABLE return false; // Ignore hold events on tap-hold keys. diff --git a/tests/caps_word/test.mk b/tests/caps_word/test.mk index 2509b018588..6d5664aa054 100644 --- a/tests/caps_word/test.mk +++ b/tests/caps_word/test.mk @@ -15,5 +15,7 @@ CAPS_WORD_ENABLE = yes COMMAND_ENABLE = no +LAYER_LOCK_ENABLE = yes SPACE_CADET_ENABLE = yes +TRI_LAYER_ENABLE = yes diff --git a/tests/caps_word/test_caps_word.cpp b/tests/caps_word/test_caps_word.cpp index 28d86e93243..4b58790915a 100644 --- a/tests/caps_word/test_caps_word.cpp +++ b/tests/caps_word/test_caps_word.cpp @@ -156,21 +156,22 @@ TEST_F(CapsWord, IdleTimeout) { // Turn on Caps Word and tap "A". caps_word_on(); tap_key(key_a); - VERIFY_AND_CLEAR(driver); + EXPECT_EMPTY_REPORT(driver); idle_for(CAPS_WORD_IDLE_TIMEOUT); run_one_scan_loop(); + VERIFY_AND_CLEAR(driver); // Caps Word should be off and mods should be clear. EXPECT_EQ(is_caps_word_on(), false); EXPECT_EQ(get_mods() | get_weak_mods(), 0); - EXPECT_EMPTY_REPORT(driver).Times(AnyNumber()); // Expect unshifted "A". EXPECT_REPORT(driver, (KC_A)); + EXPECT_EMPTY_REPORT(driver); tap_key(key_a); - + run_one_scan_loop(); VERIFY_AND_CLEAR(driver); } @@ -244,6 +245,7 @@ TEST_F(CapsWord, ShiftsAltGrSymbols) { // clang-format off EXPECT_CALL(driver, send_keyboard_mock(AnyOf( KeyboardReport(), + KeyboardReport(KC_LSFT), KeyboardReport(KC_RALT), KeyboardReport(KC_LSFT, KC_RALT)))) .Times(AnyNumber()); @@ -259,6 +261,9 @@ TEST_F(CapsWord, ShiftsAltGrSymbols) { tap_key(key_a); run_one_scan_loop(); key_altgr.release(); + run_one_scan_loop(); + + idle_for(CAPS_WORD_IDLE_TIMEOUT); VERIFY_AND_CLEAR(driver); } @@ -274,6 +279,7 @@ TEST_F(CapsWord, ShiftsModTapAltGrSymbols) { // clang-format off EXPECT_CALL(driver, send_keyboard_mock(AnyOf( KeyboardReport(), + KeyboardReport(KC_LSFT), KeyboardReport(KC_RALT), KeyboardReport(KC_LSFT, KC_RALT)))) .Times(AnyNumber()); @@ -289,8 +295,11 @@ TEST_F(CapsWord, ShiftsModTapAltGrSymbols) { tap_key(key_a); run_one_scan_loop(); key_altgr_t.release(); - + run_one_scan_loop(); EXPECT_TRUE(is_caps_word_on()); + + idle_for(CAPS_WORD_IDLE_TIMEOUT); + VERIFY_AND_CLEAR(driver); } @@ -535,7 +544,11 @@ TEST_P(CapsWordDoubleTapShift, Activation) { // machine at this point. This due to imperfect test isolation which can't // reset the caps word double shift timer on test case setup. idle_for(CAPS_WORD_IDLE_TIMEOUT); + + EXPECT_REPORT(driver, (KC_ESC)); + EXPECT_EMPTY_REPORT(driver); tap_key(esc); + VERIFY_AND_CLEAR(driver); } // Double tap doesn't count if another key is pressed between the taps. @@ -589,6 +602,7 @@ TEST_P(CapsWordDoubleTapShift, SlowTaps) { EXPECT_EQ(is_caps_word_on(), false); // Caps Word is still off. clear_oneshot_mods(); + send_keyboard_report(); VERIFY_AND_CLEAR(driver); } @@ -626,7 +640,7 @@ TEST_F(CapsWord, IgnoresOSLHold) { run_one_scan_loop(); tap_key(key_b); key_osl.release(); - run_one_scan_loop(); + idle_for(CAPS_WORD_IDLE_TIMEOUT + 1); VERIFY_AND_CLEAR(driver); } @@ -645,15 +659,39 @@ TEST_F(CapsWord, IgnoresOSLTap) { KeyboardReport(), KeyboardReport(KC_LSFT)))) .Times(AnyNumber()); + // clang-format on EXPECT_REPORT(driver, (KC_LSFT, KC_B)); caps_word_on(); tap_key(key_osl); tap_key(key_b); - run_one_scan_loop(); + idle_for(CAPS_WORD_IDLE_TIMEOUT); + + VERIFY_AND_CLEAR(driver); +} + +TEST_F(CapsWord, IgnoresLayerLockKey) { + TestDriver driver; + KeymapKey key_llock(0, 1, 0, QK_LAYER_LOCK); + KeymapKey key_b(0, 0, 0, KC_B); + set_keymap({key_llock, key_b}); + + // Allow any number of reports with no keys or only modifiers. + // clang-format off + EXPECT_CALL(driver, send_keyboard_mock(AnyOf( + KeyboardReport(), + KeyboardReport(KC_LSFT)))) + .Times(AnyNumber()); + // clang-format on + + EXPECT_REPORT(driver, (KC_LSFT, KC_B)); + caps_word_on(); + + tap_key(key_llock); + tap_key(key_b); + idle_for(CAPS_WORD_IDLE_TIMEOUT); VERIFY_AND_CLEAR(driver); } -// clang-format on } // namespace diff --git a/tests/repeat_key/test.mk b/tests/repeat_key/test.mk index aec8ff3bfb8..186207ffc21 100644 --- a/tests/repeat_key/test.mk +++ b/tests/repeat_key/test.mk @@ -16,3 +16,4 @@ REPEAT_KEY_ENABLE = yes AUTO_SHIFT_ENABLE = yes +LAYER_LOCK_ENABLE = yes diff --git a/tests/repeat_key/test_repeat_key.cpp b/tests/repeat_key/test_repeat_key.cpp index eee44fc1044..ed5d6187617 100644 --- a/tests/repeat_key/test_repeat_key.cpp +++ b/tests/repeat_key/test_repeat_key.cpp @@ -751,4 +751,37 @@ TEST_F(RepeatKey, RepeatKeyInvoke) { testing::Mock::VerifyAndClearExpectations(&driver); } +// Check that mods and Layer Lock are not remembered. +TEST_F(RepeatKey, IgnoredKeys) { + TestDriver driver; + KeymapKey regular_key(0, 0, 0, KC_A); + KeymapKey key_repeat(0, 1, 0, QK_REP); + KeymapKey key_lsft(0, 2, 0, KC_LSFT); + KeymapKey key_lctl(0, 3, 0, KC_LCTL); + KeymapKey key_llck(0, 4, 0, QK_LAYER_LOCK); + set_keymap({regular_key, key_repeat, key_lsft, key_lctl, key_llck}); + + // Allow any number of empty reports. + EXPECT_EMPTY_REPORT(driver).Times(AnyNumber()); + { + InSequence seq; + EXPECT_REPORT(driver, (KC_A)); + EXPECT_REPORT(driver, (KC_LSFT)); + EXPECT_REPORT(driver, (KC_LCTL)); + EXPECT_REPORT(driver, (KC_A)); + EXPECT_REPORT(driver, (KC_A)); + } + + tap_key(regular_key); // Taps the KC_A key. + + // Tap Shift, Ctrl, and Layer Lock keys, which should not be remembered. + tap_keys(key_lsft, key_lctl, key_llck); + EXPECT_KEYCODE_EQ(get_last_keycode(), KC_A); + + // Tapping the Repeat Key should still reproduce KC_A. + tap_keys(key_repeat, key_repeat); + + testing::Mock::VerifyAndClearExpectations(&driver); +} + } // namespace