From 2367d8129c92474eb0da66ebc5ace893097cf574 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 16 Jun 2023 14:04:45 +1000 Subject: Move `RGBLIGHT_SLEEP` to data driven (#21072) --- keyboards/kbdfans/bounce/75/hotswap/config.h | 1 - keyboards/kbdfans/bounce/75/hotswap/info.json | 3 +++ keyboards/kbdfans/bounce/75/soldered/config.h | 1 - keyboards/kbdfans/bounce/75/soldered/info.json | 3 +++ keyboards/kbdfans/kbd19x/config.h | 1 - keyboards/kbdfans/kbd19x/info.json | 3 +++ keyboards/kbdfans/kbd4x/config.h | 1 - keyboards/kbdfans/kbd4x/info.json | 3 +++ keyboards/kbdfans/kbd67/hotswap/config.h | 2 -- keyboards/kbdfans/kbd67/hotswap/info.json | 3 +++ keyboards/kbdfans/kbd67/rev1/config.h | 2 -- keyboards/kbdfans/kbd67/rev1/info.json | 3 ++- keyboards/kbdfans/kbd67/rev2/config.h | 1 - keyboards/kbdfans/kbd67/rev2/info.json | 3 ++- keyboards/kbdfans/kbd6x/config.h | 1 - keyboards/kbdfans/kbd6x/info.json | 3 +++ keyboards/kbdfans/kbd75/config.h | 2 -- keyboards/kbdfans/kbd75/rev1/info.json | 3 +++ keyboards/kbdfans/kbd75/rev2/info.json | 3 +++ keyboards/kbdfans/kbd75hs/config.h | 1 - keyboards/kbdfans/kbd75hs/info.json | 3 +++ keyboards/kbdfans/kbd8x/config.h | 1 - keyboards/kbdfans/kbd8x/info.json | 3 +++ keyboards/kbdfans/kbd8x_mk2/config.h | 1 - keyboards/kbdfans/kbd8x_mk2/info.json | 3 ++- keyboards/kbdfans/kbdpad/mk2/config.h | 1 - keyboards/kbdfans/kbdpad/mk2/info.json | 3 +++ keyboards/kbdfans/odin/soldered/config.h | 1 - keyboards/kbdfans/odin/soldered/info.json | 3 ++- keyboards/kbdfans/odin/v2/config.h | 1 - keyboards/kbdfans/odin/v2/info.json | 3 ++- keyboards/kbdfans/phaseone/config.h | 1 - keyboards/kbdfans/phaseone/info.json | 3 +++ 33 files changed, 46 insertions(+), 24 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h index 29f510620b..5e43b120d0 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/config.h +++ b/keyboards/kbdfans/bounce/75/hotswap/config.h @@ -32,6 +32,5 @@ #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 -#define RGBLIGHT_SLEEP #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json index 444a5addae..402593379d 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/info.json +++ b/keyboards/kbdfans/bounce/75/hotswap/info.json @@ -16,6 +16,9 @@ "caps_lock": "C6", "on_state": 0 }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "F0" }, diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h index 29f510620b..5e43b120d0 100644 --- a/keyboards/kbdfans/bounce/75/soldered/config.h +++ b/keyboards/kbdfans/bounce/75/soldered/config.h @@ -32,6 +32,5 @@ #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 -#define RGBLIGHT_SLEEP #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json index 9dbb3712ce..958a031a39 100644 --- a/keyboards/kbdfans/bounce/75/soldered/info.json +++ b/keyboards/kbdfans/bounce/75/soldered/info.json @@ -17,6 +17,9 @@ "caps_lock": "C6", "on_state": 0 }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "B7" }, diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index b18438ab4e..9b4a354800 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json index 3fb10600ee..88fe409e30 100644 --- a/keyboards/kbdfans/kbd19x/info.json +++ b/keyboards/kbdfans/kbd19x/info.json @@ -22,6 +22,9 @@ "scroll_lock": "B1", "on_state": 0 }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h index d08ecf7f98..2ce93360c2 100644 --- a/keyboards/kbdfans/kbd4x/config.h +++ b/keyboards/kbdfans/kbd4x/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json index 21d1428f0d..67561d3d09 100644 --- a/keyboards/kbdfans/kbd4x/info.json +++ b/keyboards/kbdfans/kbd4x/info.json @@ -17,6 +17,9 @@ "pin": "B6", "breathing": true }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h index dfbc40e0a0..2092332c0b 100644 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ // /*== all animations enable ==*/ #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -33,7 +32,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - #define RGBLIGHT_SLEEP /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json index edbbf6638e..796253aa23 100644 --- a/keyboards/kbdfans/kbd67/hotswap/info.json +++ b/keyboards/kbdfans/kbd67/hotswap/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "B4" }, diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h index 20e3b8f0df..ec2e9d4273 100644 --- a/keyboards/kbdfans/kbd67/rev1/config.h +++ b/keyboards/kbdfans/kbd67/rev1/config.h @@ -21,8 +21,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ - #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json index e34cbb87e2..ee09db2634 100644 --- a/keyboards/kbdfans/kbd67/rev1/info.json +++ b/keyboards/kbdfans/kbd67/rev1/info.json @@ -25,7 +25,8 @@ "pin": "E2" }, "rgblight": { - "max_brightness": 180 + "max_brightness": 180, + "sleep": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h index 1aa30c01cd..190ef273f9 100644 --- a/keyboards/kbdfans/kbd67/rev2/config.h +++ b/keyboards/kbdfans/kbd67/rev2/config.h @@ -31,4 +31,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json index bf83ad4af3..6eaf1d3871 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/info.json @@ -24,7 +24,8 @@ "pin": "E2" }, "rgblight": { - "max_brightness": 240 + "max_brightness": 240, + "sleep": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h index d29b1e494a..3ef91c5d5c 100644 --- a/keyboards/kbdfans/kbd6x/config.h +++ b/keyboards/kbdfans/kbd6x/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 12 #define RGBLIGHT_VAL_STEP 12 -#define RGBLIGHT_SLEEP /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json index 782da6bc64..d876c2cd16 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/info.json @@ -17,6 +17,9 @@ "pin": "B7", "breathing": true }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "F0" }, diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h index 38d9bacad9..2d6af51f65 100644 --- a/keyboards/kbdfans/kbd75/config.h +++ b/keyboards/kbdfans/kbd75/config.h @@ -23,5 +23,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -/* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#define RGBLIGHT_SLEEP diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index ab56fc90d1..8e486dcfc1 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -21,6 +21,9 @@ "caps_lock": "B2", "on_state": 0 }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index 11eb19b729..b3358cac29 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -21,6 +21,9 @@ "caps_lock": "B2", "on_state": 0 }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h index 4bc0c6dcff..f039fa94cd 100644 --- a/keyboards/kbdfans/kbd75hs/config.h +++ b/keyboards/kbdfans/kbd75hs/config.h @@ -32,6 +32,5 @@ #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 -#define RGBLIGHT_SLEEP #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json index fef9c5a8c2..67cb64afe5 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/keyboards/kbdfans/kbd75hs/info.json @@ -16,6 +16,9 @@ "indicators": { "caps_lock": "C6" }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "F0" }, diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h index 655b83f0e3..d10c565718 100644 --- a/keyboards/kbdfans/kbd8x/config.h +++ b/keyboards/kbdfans/kbd8x/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json index eeda61ac35..39da3c9521 100644 --- a/keyboards/kbdfans/kbd8x/info.json +++ b/keyboards/kbdfans/kbd8x/info.json @@ -22,6 +22,9 @@ "num_lock": "B1", "scroll_lock": "B2" }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h index 74fad03a87..010745066a 100644 --- a/keyboards/kbdfans/kbd8x_mk2/config.h +++ b/keyboards/kbdfans/kbd8x_mk2/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json index 5c15e9e2d5..07d45a948f 100644 --- a/keyboards/kbdfans/kbd8x_mk2/info.json +++ b/keyboards/kbdfans/kbd8x_mk2/info.json @@ -21,7 +21,8 @@ "pin": "B3" }, "rgblight": { - "max_brightness": 200 + "max_brightness": 200, + "sleep": true }, "indicators": { "caps_lock": "E6", diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index 9457b20766..a23a8173eb 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index dc47064fee..0d3d551d27 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -18,6 +18,9 @@ "levels": 5, "breathing": true }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "B5" }, diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h index b55a558628..d79d0e0113 100644 --- a/keyboards/kbdfans/odin/soldered/config.h +++ b/keyboards/kbdfans/odin/soldered/config.h @@ -31,6 +31,5 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_SLEEP #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json index acbdc574bf..e5b2234a6c 100644 --- a/keyboards/kbdfans/odin/soldered/info.json +++ b/keyboards/kbdfans/odin/soldered/info.json @@ -22,7 +22,8 @@ "pin": "B15" }, "rgblight": { - "max_brightness": 180 + "max_brightness": 180, + "sleep": true }, "processor": "STM32F072", "bootloader": "stm32-dfu", diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h index a753f00c6a..aa11063f71 100644 --- a/keyboards/kbdfans/odin/v2/config.h +++ b/keyboards/kbdfans/odin/v2/config.h @@ -29,4 +29,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_SLEEP diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json index 59d2dde7ac..b3047ac96f 100644 --- a/keyboards/kbdfans/odin/v2/info.json +++ b/keyboards/kbdfans/odin/v2/info.json @@ -22,7 +22,8 @@ "pin": "B15" }, "rgblight": { - "max_brightness": 180 + "max_brightness": 180, + "sleep": true }, "processor": "STM32F072", "bootloader": "stm32-dfu", diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h index a8e7f41e17..d693cbe66a 100644 --- a/keyboards/kbdfans/phaseone/config.h +++ b/keyboards/kbdfans/phaseone/config.h @@ -36,6 +36,5 @@ #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 -#define RGBLIGHT_SLEEP #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json index 0b4bf2e19f..bca4d3bfd8 100644 --- a/keyboards/kbdfans/phaseone/info.json +++ b/keyboards/kbdfans/phaseone/info.json @@ -18,6 +18,9 @@ "num_lock": "D7", "on_state": 0 }, + "rgblight": { + "sleep": true + }, "ws2812": { "pin": "B6" }, -- cgit v1.2.3 From b1783db4eacacaf8181cfbce13146db1941486ba Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 18 Jun 2023 14:39:07 +1000 Subject: Move `RGBLED_NUM` to data driven (#21278) --- keyboards/kbdfans/baguette66/rgb/config.h | 3 +-- keyboards/kbdfans/baguette66/rgb/info.json | 3 +++ keyboards/kbdfans/bounce/75/hotswap/config.h | 1 - keyboards/kbdfans/bounce/75/hotswap/info.json | 1 + keyboards/kbdfans/bounce/75/soldered/config.h | 1 - keyboards/kbdfans/bounce/75/soldered/info.json | 1 + keyboards/kbdfans/kbd19x/config.h | 1 - keyboards/kbdfans/kbd19x/info.json | 1 + keyboards/kbdfans/kbd4x/config.h | 1 - keyboards/kbdfans/kbd4x/info.json | 1 + keyboards/kbdfans/kbd67/hotswap/config.h | 1 - keyboards/kbdfans/kbd67/hotswap/info.json | 1 + keyboards/kbdfans/kbd67/mkiirgb/v4/config.h | 3 +-- keyboards/kbdfans/kbd67/mkiirgb/v4/info.json | 3 +++ keyboards/kbdfans/kbd67/rev1/config.h | 1 - keyboards/kbdfans/kbd67/rev1/info.json | 1 + keyboards/kbdfans/kbd67/rev2/config.h | 1 - keyboards/kbdfans/kbd67/rev2/info.json | 1 + keyboards/kbdfans/kbd6x/config.h | 1 - keyboards/kbdfans/kbd6x/info.json | 1 + keyboards/kbdfans/kbd75/config.h | 1 - keyboards/kbdfans/kbd75/rev1/info.json | 1 + keyboards/kbdfans/kbd75/rev2/info.json | 1 + keyboards/kbdfans/kbd75hs/config.h | 1 - keyboards/kbdfans/kbd75hs/info.json | 1 + keyboards/kbdfans/kbd75rgb/config.h | 3 +-- keyboards/kbdfans/kbd75rgb/info.json | 3 +++ keyboards/kbdfans/kbd8x/config.h | 1 - keyboards/kbdfans/kbd8x/info.json | 1 + keyboards/kbdfans/kbd8x_mk2/config.h | 1 - keyboards/kbdfans/kbd8x_mk2/info.json | 1 + keyboards/kbdfans/kbdpad/mk1/config.h | 1 - keyboards/kbdfans/kbdpad/mk1/info.json | 3 +++ keyboards/kbdfans/kbdpad/mk2/config.h | 1 - keyboards/kbdfans/kbdpad/mk2/info.json | 1 + keyboards/kbdfans/niu_mini/config.h | 1 - keyboards/kbdfans/niu_mini/info.json | 3 +++ keyboards/kbdfans/odin/rgb/config.h | 1 - keyboards/kbdfans/odin/soldered/config.h | 1 - keyboards/kbdfans/odin/soldered/info.json | 1 + keyboards/kbdfans/odin/v2/config.h | 1 - keyboards/kbdfans/odin/v2/info.json | 1 + keyboards/kbdfans/phaseone/config.h | 1 - keyboards/kbdfans/phaseone/info.json | 1 + 44 files changed, 35 insertions(+), 25 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h index ee3574ac9c..c495f44266 100644 --- a/keyboards/kbdfans/baguette66/rgb/config.h +++ b/keyboards/kbdfans/baguette66/rgb/config.h @@ -19,8 +19,7 @@ #define USB_SUSPEND_WAKEUP_DELAY 5000 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 -#define RGBLED_NUM 66 -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGB_MATRIX_LED_COUNT 66 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json index 5f8faf89ae..32a661a70b 100644 --- a/keyboards/kbdfans/baguette66/rgb/info.json +++ b/keyboards/kbdfans/baguette66/rgb/info.json @@ -7,6 +7,9 @@ "pid": "0x0106", "device_version": "0.0.1" }, + "rgblight": { + "led_count": 66 + }, "ws2812": { "pin": "E6" }, diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h index 5e43b120d0..10dc5f97b8 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/config.h +++ b/keyboards/kbdfans/bounce/75/hotswap/config.h @@ -28,7 +28,6 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) #define RGBLIGHT_DEFAULT_SPD 15 -#define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json index 402593379d..70906f7b71 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/info.json +++ b/keyboards/kbdfans/bounce/75/hotswap/info.json @@ -17,6 +17,7 @@ "on_state": 0 }, "rgblight": { + "led_count": 4, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h index 5e43b120d0..10dc5f97b8 100644 --- a/keyboards/kbdfans/bounce/75/soldered/config.h +++ b/keyboards/kbdfans/bounce/75/soldered/config.h @@ -28,7 +28,6 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) #define RGBLIGHT_DEFAULT_SPD 15 -#define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json index 958a031a39..86b98e5fa1 100644 --- a/keyboards/kbdfans/bounce/75/soldered/info.json +++ b/keyboards/kbdfans/bounce/75/soldered/info.json @@ -18,6 +18,7 @@ "on_state": 0 }, "rgblight": { + "led_count": 4, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index 9b4a354800..698e6a23d9 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json index 88fe409e30..0f7b7476d8 100644 --- a/keyboards/kbdfans/kbd19x/info.json +++ b/keyboards/kbdfans/kbd19x/info.json @@ -23,6 +23,7 @@ "on_state": 0 }, "rgblight": { + "led_count": 18, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h index 2ce93360c2..56a528dce3 100644 --- a/keyboards/kbdfans/kbd4x/config.h +++ b/keyboards/kbdfans/kbd4x/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json index 67561d3d09..3a905f2e47 100644 --- a/keyboards/kbdfans/kbd4x/info.json +++ b/keyboards/kbdfans/kbd4x/info.json @@ -18,6 +18,7 @@ "breathing": true }, "rgblight": { + "led_count": 16, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h index 2092332c0b..b311b40261 100644 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once - #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json index 796253aa23..cf37d516e8 100644 --- a/keyboards/kbdfans/kbd67/hotswap/info.json +++ b/keyboards/kbdfans/kbd67/hotswap/info.json @@ -18,6 +18,7 @@ "breathing": true }, "rgblight": { + "led_count": 8, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h index 8b79d929d6..317453e45a 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h @@ -18,8 +18,7 @@ #define USB_SUSPEND_WAKEUP_DELAY 5000 -#define RGBLED_NUM 68 -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGB_MATRIX_LED_COUNT 68 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json index f7d5ab552f..a2e2618c81 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json @@ -4,6 +4,9 @@ "pid": "0x1227", "device_version": "0.0.4" }, + "rgblight": { + "led_count": 68 + }, "ws2812": { "pin": "C7" }, diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h index ec2e9d4273..930c7e7faa 100644 --- a/keyboards/kbdfans/kbd67/rev1/config.h +++ b/keyboards/kbdfans/kbd67/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once - #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json index ee09db2634..728c8205b1 100644 --- a/keyboards/kbdfans/kbd67/rev1/info.json +++ b/keyboards/kbdfans/kbd67/rev1/info.json @@ -25,6 +25,7 @@ "pin": "E2" }, "rgblight": { + "led_count": 20, "max_brightness": 180, "sleep": true }, diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h index 190ef273f9..3138184150 100644 --- a/keyboards/kbdfans/kbd67/rev2/config.h +++ b/keyboards/kbdfans/kbd67/rev2/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json index 6eaf1d3871..a7b280b40f 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/info.json @@ -24,6 +24,7 @@ "pin": "E2" }, "rgblight": { + "led_count": 16, "max_brightness": 240, "sleep": true }, diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h index 3ef91c5d5c..8090b62391 100644 --- a/keyboards/kbdfans/kbd6x/config.h +++ b/keyboards/kbdfans/kbd6x/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 12 #define RGBLIGHT_SAT_STEP 12 #define RGBLIGHT_VAL_STEP 12 diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json index d876c2cd16..25bbdc2a24 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/info.json @@ -18,6 +18,7 @@ "breathing": true }, "rgblight": { + "led_count": 14, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h index 2d6af51f65..89ab02d326 100644 --- a/keyboards/kbdfans/kbd75/config.h +++ b/keyboards/kbdfans/kbd75/config.h @@ -19,7 +19,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index 8e486dcfc1..53c4206c3a 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -22,6 +22,7 @@ "on_state": 0 }, "rgblight": { + "led_count": 16, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index b3358cac29..34daaaed4d 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -22,6 +22,7 @@ "on_state": 0 }, "rgblight": { + "led_count": 16, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h index f039fa94cd..00213f746c 100644 --- a/keyboards/kbdfans/kbd75hs/config.h +++ b/keyboards/kbdfans/kbd75hs/config.h @@ -28,7 +28,6 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) #define RGBLIGHT_DEFAULT_SPD 15 -#define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json index 67cb64afe5..86aa409039 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/keyboards/kbdfans/kbd75hs/info.json @@ -17,6 +17,7 @@ "caps_lock": "C6" }, "rgblight": { + "led_count": 18, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h index 6d1273875d..08555f63d1 100644 --- a/keyboards/kbdfans/kbd75rgb/config.h +++ b/keyboards/kbdfans/kbd75rgb/config.h @@ -19,8 +19,7 @@ #define USB_SUSPEND_WAKEUP_DELAY 5000 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 -#define RGBLED_NUM 84 -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGB_MATRIX_LED_COUNT 84 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json index 231f13f412..e5b6f980d3 100644 --- a/keyboards/kbdfans/kbd75rgb/info.json +++ b/keyboards/kbdfans/kbd75rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x6063", "device_version": "0.0.1" }, + "rgblight": { + "led_count": 84 + }, "ws2812": { "pin": "C7" }, diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h index d10c565718..d55b72c6d4 100644 --- a/keyboards/kbdfans/kbd8x/config.h +++ b/keyboards/kbdfans/kbd8x/config.h @@ -27,7 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json index 39da3c9521..2f173aca35 100644 --- a/keyboards/kbdfans/kbd8x/info.json +++ b/keyboards/kbdfans/kbd8x/info.json @@ -23,6 +23,7 @@ "scroll_lock": "B2" }, "rgblight": { + "led_count": 20, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h index 010745066a..6d907961df 100644 --- a/keyboards/kbdfans/kbd8x_mk2/config.h +++ b/keyboards/kbdfans/kbd8x_mk2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once - #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json index 07d45a948f..6d81794947 100644 --- a/keyboards/kbdfans/kbd8x_mk2/info.json +++ b/keyboards/kbdfans/kbd8x_mk2/info.json @@ -21,6 +21,7 @@ "pin": "B3" }, "rgblight": { + "led_count": 20, "max_brightness": 200, "sleep": true }, diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h index a3a9a993df..d849732a07 100644 --- a/keyboards/kbdfans/kbdpad/mk1/config.h +++ b/keyboards/kbdfans/kbdpad/mk1/config.h @@ -27,4 +27,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 6 diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json index 3527370e4c..4495eab886 100644 --- a/keyboards/kbdfans/kbdpad/mk1/info.json +++ b/keyboards/kbdfans/kbdpad/mk1/info.json @@ -17,6 +17,9 @@ "pin": "D4", "breathing": true }, + "rgblight": { + "led_count": 6 + }, "ws2812": { "driver": "i2c" }, diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index a23a8173eb..6d907961df 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once - #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index 0d3d551d27..aa4a3c5e1f 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -19,6 +19,7 @@ "breathing": true }, "rgblight": { + "led_count": 16, "sleep": true }, "ws2812": { diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h index fb154031a0..9fa20a136c 100644 --- a/keyboards/kbdfans/niu_mini/config.h +++ b/keyboards/kbdfans/niu_mini/config.h @@ -33,7 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json index 4ba2f38516..af3b136f8f 100644 --- a/keyboards/kbdfans/niu_mini/info.json +++ b/keyboards/kbdfans/niu_mini/info.json @@ -17,6 +17,9 @@ "pin": "B6", "levels": 4 }, + "rgblight": { + "led_count": 14 + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h index 54794e66be..9cc883891a 100644 --- a/keyboards/kbdfans/odin/rgb/config.h +++ b/keyboards/kbdfans/odin/rgb/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGBLED_NUM 104 #define RGB_MATRIX_LED_COUNT 104 #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h index d79d0e0113..0236ebcefe 100644 --- a/keyboards/kbdfans/odin/soldered/config.h +++ b/keyboards/kbdfans/odin/soldered/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json index e5b2234a6c..559a21b6b4 100644 --- a/keyboards/kbdfans/odin/soldered/info.json +++ b/keyboards/kbdfans/odin/soldered/info.json @@ -22,6 +22,7 @@ "pin": "B15" }, "rgblight": { + "led_count": 4, "max_brightness": 180, "sleep": true }, diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h index aa11063f71..d67ae880ed 100644 --- a/keyboards/kbdfans/odin/v2/config.h +++ b/keyboards/kbdfans/odin/v2/config.h @@ -16,7 +16,6 @@ #pragma once - #define RGBLED_NUM 4 #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json index b3047ac96f..97d1bdc57a 100644 --- a/keyboards/kbdfans/odin/v2/info.json +++ b/keyboards/kbdfans/odin/v2/info.json @@ -22,6 +22,7 @@ "pin": "B15" }, "rgblight": { + "led_count": 4, "max_brightness": 180, "sleep": true }, diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h index d693cbe66a..4cbb32a859 100644 --- a/keyboards/kbdfans/phaseone/config.h +++ b/keyboards/kbdfans/phaseone/config.h @@ -32,7 +32,6 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) #define RGBLIGHT_DEFAULT_SPD 15 -#define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json index bca4d3bfd8..470608d223 100644 --- a/keyboards/kbdfans/phaseone/info.json +++ b/keyboards/kbdfans/phaseone/info.json @@ -19,6 +19,7 @@ "on_state": 0 }, "rgblight": { + "led_count": 4, "sleep": true }, "ws2812": { -- cgit v1.2.3 From 416af0171c6433a7ecb198386dd2c3ac70d4cbd2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 24 Jun 2023 05:31:25 +1000 Subject: Remove CORTEX_ENABLE_WFI_IDLE from keyboards. (#21353) * Remove CORTEX_ENABLE_WFI_IDLE from the codebase. * Turn on CORTEX_ENABLE_WFI_IDLE by default. --- keyboards/kbdfans/odin/rgb/rules.mk | 2 -- keyboards/kbdfans/odin/soldered/rules.mk | 2 -- keyboards/kbdfans/odin/v2/rules.mk | 2 -- 3 files changed, 6 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/odin/rgb/rules.mk b/keyboards/kbdfans/odin/rgb/rules.mk index b7807ae418..c49a369dd0 100644 --- a/keyboards/kbdfans/odin/rgb/rules.mk +++ b/keyboards/kbdfans/odin/rgb/rules.mk @@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/kbdfans/odin/soldered/rules.mk b/keyboards/kbdfans/odin/soldered/rules.mk index 9e42693cb6..c3b8e77d77 100644 --- a/keyboards/kbdfans/odin/soldered/rules.mk +++ b/keyboards/kbdfans/odin/soldered/rules.mk @@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/kbdfans/odin/v2/rules.mk b/keyboards/kbdfans/odin/v2/rules.mk index 0f15f10b20..0098dc473a 100644 --- a/keyboards/kbdfans/odin/v2/rules.mk +++ b/keyboards/kbdfans/odin/v2/rules.mk @@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -- cgit v1.2.3 From 6545eb64a0cc1797893c6782e78a3ecc68de729d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 24 Jun 2023 17:13:18 +1000 Subject: Move `RGB_MATRIX_HUE/SAT/VAL/SPD_STEP` to data driven (#21354) --- keyboards/kbdfans/baguette66/rgb/config.h | 4 ---- keyboards/kbdfans/baguette66/rgb/info.json | 5 ++++- keyboards/kbdfans/kbd67/mkiirgb/v4/config.h | 4 ---- keyboards/kbdfans/kbd67/mkiirgb/v4/info.json | 5 ++++- keyboards/kbdfans/kbd67/mkiirgb_iso/config.h | 4 ---- keyboards/kbdfans/kbd67/mkiirgb_iso/info.json | 5 ++++- keyboards/kbdfans/kbd75rgb/config.h | 4 ---- keyboards/kbdfans/kbd75rgb/info.json | 5 ++++- 8 files changed, 16 insertions(+), 20 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h index c495f44266..78802b19f9 100644 --- a/keyboards/kbdfans/baguette66/rgb/config.h +++ b/keyboards/kbdfans/baguette66/rgb/config.h @@ -61,7 +61,3 @@ #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL -#define RGB_MATRIX_HUE_STEP 8 -#define RGB_MATRIX_SAT_STEP 8 -#define RGB_MATRIX_VAL_STEP 8 -#define RGB_MATRIX_SPD_STEP 10 diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json index 32a661a70b..9ac27f950a 100644 --- a/keyboards/kbdfans/baguette66/rgb/info.json +++ b/keyboards/kbdfans/baguette66/rgb/info.json @@ -14,7 +14,10 @@ "pin": "E6" }, "rgb_matrix": { - "driver": "WS2812" + "driver": "WS2812", + "sat_steps": 8, + "val_steps": 8, + "speed_steps": 10 }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"], diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h index 317453e45a..2b06b9c43c 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h @@ -36,10 +36,6 @@ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. # define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL -# define RGB_MATRIX_HUE_STEP 8 -# define RGB_MATRIX_SAT_STEP 8 -# define RGB_MATRIX_VAL_STEP 8 -# define RGB_MATRIX_SPD_STEP 10 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json index a2e2618c81..f66a39d799 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json @@ -11,7 +11,10 @@ "pin": "C7" }, "rgb_matrix": { - "driver": "WS2812" + "driver": "WS2812", + "sat_steps": 8, + "val_steps": 8, + "speed_steps": 10 }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h index ede122f3f2..10f0bc0ec2 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h @@ -26,10 +26,6 @@ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. # define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL -# define RGB_MATRIX_HUE_STEP 8 -# define RGB_MATRIX_SAT_STEP 8 -# define RGB_MATRIX_VAL_STEP 8 -# define RGB_MATRIX_SPD_STEP 10 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json index 4c7d09aa8e..222742ed8f 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json @@ -12,7 +12,10 @@ "pin": "C7" }, "rgb_matrix": { - "driver": "WS2812" + "driver": "WS2812", + "sat_steps": 8, + "val_steps": 8, + "speed_steps": 10 }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h index 08555f63d1..6a93d118d6 100644 --- a/keyboards/kbdfans/kbd75rgb/config.h +++ b/keyboards/kbdfans/kbd75rgb/config.h @@ -61,7 +61,3 @@ #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL -#define RGB_MATRIX_HUE_STEP 8 -#define RGB_MATRIX_SAT_STEP 8 -#define RGB_MATRIX_VAL_STEP 8 -#define RGB_MATRIX_SPD_STEP 10 diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json index e5b6f980d3..bf2f596f3a 100644 --- a/keyboards/kbdfans/kbd75rgb/info.json +++ b/keyboards/kbdfans/kbd75rgb/info.json @@ -15,7 +15,10 @@ "pin": "C7" }, "rgb_matrix": { - "driver": "WS2812" + "driver": "WS2812", + "sat_steps": 8, + "val_steps": 8, + "speed_steps": 10 }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], -- cgit v1.2.3 From 4ae9bfd17ab01608e1bf2492c35d79bd2ad5c0fe Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 24 Jun 2023 17:37:54 +1000 Subject: Move `RGBLIGHT_HUE/SAT/VAL_STEP` to data driven (#21292) Co-authored-by: Nick Brassel --- keyboards/kbdfans/bounce/75/hotswap/config.h | 3 --- keyboards/kbdfans/bounce/75/hotswap/info.json | 3 +++ keyboards/kbdfans/bounce/75/soldered/config.h | 3 --- keyboards/kbdfans/bounce/75/soldered/info.json | 3 +++ keyboards/kbdfans/kbd19x/config.h | 3 --- keyboards/kbdfans/kbd19x/info.json | 2 ++ keyboards/kbdfans/kbd4x/config.h | 3 --- keyboards/kbdfans/kbd4x/info.json | 2 ++ keyboards/kbdfans/kbd67/hotswap/config.h | 3 --- keyboards/kbdfans/kbd67/hotswap/info.json | 2 ++ keyboards/kbdfans/kbd67/rev1/config.h | 3 --- keyboards/kbdfans/kbd67/rev1/info.json | 2 ++ keyboards/kbdfans/kbd67/rev2/config.h | 3 --- keyboards/kbdfans/kbd67/rev2/info.json | 2 ++ keyboards/kbdfans/kbd6x/config.h | 3 --- keyboards/kbdfans/kbd6x/info.json | 3 +++ keyboards/kbdfans/kbd75/config.h | 3 --- keyboards/kbdfans/kbd75/rev1/info.json | 2 ++ keyboards/kbdfans/kbd75/rev2/info.json | 2 ++ keyboards/kbdfans/kbd75hs/config.h | 3 --- keyboards/kbdfans/kbd75hs/info.json | 3 +++ keyboards/kbdfans/kbd8x/config.h | 3 --- keyboards/kbdfans/kbd8x/info.json | 2 ++ keyboards/kbdfans/kbd8x_mk2/config.h | 3 --- keyboards/kbdfans/kbd8x_mk2/info.json | 2 ++ keyboards/kbdfans/kbdpad/mk2/config.h | 3 --- keyboards/kbdfans/kbdpad/mk2/info.json | 2 ++ keyboards/kbdfans/niu_mini/config.h | 3 --- keyboards/kbdfans/niu_mini/info.json | 2 ++ keyboards/kbdfans/odin/soldered/config.h | 3 --- keyboards/kbdfans/odin/soldered/info.json | 2 ++ keyboards/kbdfans/odin/v2/config.h | 4 ---- keyboards/kbdfans/odin/v2/info.json | 2 ++ keyboards/kbdfans/phaseone/config.h | 3 --- keyboards/kbdfans/phaseone/info.json | 3 +++ 35 files changed, 41 insertions(+), 52 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h index 10dc5f97b8..4705c300f9 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/config.h +++ b/keyboards/kbdfans/bounce/75/hotswap/config.h @@ -28,8 +28,5 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) #define RGBLIGHT_DEFAULT_SPD 15 -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 10 -#define RGBLIGHT_VAL_STEP 10 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json index 70906f7b71..e715aab4c3 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/info.json +++ b/keyboards/kbdfans/bounce/75/hotswap/info.json @@ -17,6 +17,9 @@ "on_state": 0 }, "rgblight": { + "hue_steps": 10, + "saturation_steps": 10, + "brightness_steps": 10, "led_count": 4, "sleep": true }, diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h index 10dc5f97b8..4705c300f9 100644 --- a/keyboards/kbdfans/bounce/75/soldered/config.h +++ b/keyboards/kbdfans/bounce/75/soldered/config.h @@ -28,8 +28,5 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) #define RGBLIGHT_DEFAULT_SPD 15 -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 10 -#define RGBLIGHT_VAL_STEP 10 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json index 86b98e5fa1..582c3d8c55 100644 --- a/keyboards/kbdfans/bounce/75/soldered/info.json +++ b/keyboards/kbdfans/bounce/75/soldered/info.json @@ -18,6 +18,9 @@ "on_state": 0 }, "rgblight": { + "hue_steps": 10, + "saturation_steps": 10, + "brightness_steps": 10, "led_count": 4, "sleep": true }, diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index 698e6a23d9..4ef254c5af 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json index 0f7b7476d8..ce716804f7 100644 --- a/keyboards/kbdfans/kbd19x/info.json +++ b/keyboards/kbdfans/kbd19x/info.json @@ -23,6 +23,8 @@ "on_state": 0 }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 18, "sleep": true }, diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h index 56a528dce3..3fe83f1a3a 100644 --- a/keyboards/kbdfans/kbd4x/config.h +++ b/keyboards/kbdfans/kbd4x/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json index 3a905f2e47..7040322fc3 100644 --- a/keyboards/kbdfans/kbd4x/info.json +++ b/keyboards/kbdfans/kbd4x/info.json @@ -18,6 +18,8 @@ "breathing": true }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 16, "sleep": true }, diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h index b311b40261..21548537d4 100644 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 // /*== all animations enable ==*/ #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json index cf37d516e8..8ddee65b5c 100644 --- a/keyboards/kbdfans/kbd67/hotswap/info.json +++ b/keyboards/kbdfans/kbd67/hotswap/info.json @@ -18,6 +18,8 @@ "breathing": true }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 8, "sleep": true }, diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h index 930c7e7faa..62c2837ebe 100644 --- a/keyboards/kbdfans/kbd67/rev1/config.h +++ b/keyboards/kbdfans/kbd67/rev1/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json index 728c8205b1..383d1cc5a8 100644 --- a/keyboards/kbdfans/kbd67/rev1/info.json +++ b/keyboards/kbdfans/kbd67/rev1/info.json @@ -25,6 +25,8 @@ "pin": "E2" }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 20, "max_brightness": 180, "sleep": true diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h index 3138184150..7ab9c36d3b 100644 --- a/keyboards/kbdfans/kbd67/rev2/config.h +++ b/keyboards/kbdfans/kbd67/rev2/config.h @@ -27,6 +27,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json index a7b280b40f..7f053c26ce 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/info.json @@ -24,6 +24,8 @@ "pin": "E2" }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 16, "max_brightness": 240, "sleep": true diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h index 8090b62391..62c2837ebe 100644 --- a/keyboards/kbdfans/kbd6x/config.h +++ b/keyboards/kbdfans/kbd6x/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_HUE_STEP 12 -#define RGBLIGHT_SAT_STEP 12 -#define RGBLIGHT_VAL_STEP 12 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json index 25bbdc2a24..b0ff678010 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/info.json @@ -18,6 +18,9 @@ "breathing": true }, "rgblight": { + "hue_steps": 12, + "saturation_steps": 12, + "brightness_steps": 12, "led_count": 14, "sleep": true }, diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h index 89ab02d326..8cb5bddc38 100644 --- a/keyboards/kbdfans/kbd75/config.h +++ b/keyboards/kbdfans/kbd75/config.h @@ -19,6 +19,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index 53c4206c3a..fe52330c9c 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -22,6 +22,8 @@ "on_state": 0 }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 16, "sleep": true }, diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index 34daaaed4d..e75a10fd31 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -22,6 +22,8 @@ "on_state": 0 }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 16, "sleep": true }, diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h index 00213f746c..fab8ddf3f6 100644 --- a/keyboards/kbdfans/kbd75hs/config.h +++ b/keyboards/kbdfans/kbd75hs/config.h @@ -28,8 +28,5 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) #define RGBLIGHT_DEFAULT_SPD 15 -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 10 -#define RGBLIGHT_VAL_STEP 10 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json index 86aa409039..ec245dbbf1 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/keyboards/kbdfans/kbd75hs/info.json @@ -17,6 +17,9 @@ "caps_lock": "C6" }, "rgblight": { + "hue_steps": 10, + "saturation_steps": 10, + "brightness_steps": 10, "led_count": 18, "sleep": true }, diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h index d55b72c6d4..e5b1e26b62 100644 --- a/keyboards/kbdfans/kbd8x/config.h +++ b/keyboards/kbdfans/kbd8x/config.h @@ -27,9 +27,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json index 2f173aca35..0239fa78a9 100644 --- a/keyboards/kbdfans/kbd8x/info.json +++ b/keyboards/kbdfans/kbd8x/info.json @@ -23,6 +23,8 @@ "scroll_lock": "B2" }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 20, "sleep": true }, diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h index 6d907961df..ee31dd7bfe 100644 --- a/keyboards/kbdfans/kbd8x_mk2/config.h +++ b/keyboards/kbdfans/kbd8x_mk2/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json index 6d81794947..1029582d5b 100644 --- a/keyboards/kbdfans/kbd8x_mk2/info.json +++ b/keyboards/kbdfans/kbd8x_mk2/info.json @@ -21,6 +21,8 @@ "pin": "B3" }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 20, "max_brightness": 200, "sleep": true diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index 6d907961df..ee31dd7bfe 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index aa4a3c5e1f..3d2afceb24 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -19,6 +19,8 @@ "breathing": true }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 16, "sleep": true }, diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h index 9fa20a136c..7eaf08234a 100644 --- a/keyboards/kbdfans/niu_mini/config.h +++ b/keyboards/kbdfans/niu_mini/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 /* * Feature disable options diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json index af3b136f8f..9719c832ec 100644 --- a/keyboards/kbdfans/niu_mini/info.json +++ b/keyboards/kbdfans/niu_mini/info.json @@ -18,6 +18,8 @@ "levels": 4 }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 14 }, "ws2812": { diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h index 0236ebcefe..7c771d1d0d 100644 --- a/keyboards/kbdfans/odin/soldered/config.h +++ b/keyboards/kbdfans/odin/soldered/config.h @@ -27,8 +27,5 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 8) -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json index 559a21b6b4..0b99fd1eb8 100644 --- a/keyboards/kbdfans/odin/soldered/info.json +++ b/keyboards/kbdfans/odin/soldered/info.json @@ -22,6 +22,8 @@ "pin": "B15" }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 4, "max_brightness": 180, "sleep": true diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h index d67ae880ed..d82b94c5db 100644 --- a/keyboards/kbdfans/odin/v2/config.h +++ b/keyboards/kbdfans/odin/v2/config.h @@ -24,7 +24,3 @@ #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL - - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 8 - #define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json index 97d1bdc57a..5af1d84aac 100644 --- a/keyboards/kbdfans/odin/v2/info.json +++ b/keyboards/kbdfans/odin/v2/info.json @@ -22,6 +22,8 @@ "pin": "B15" }, "rgblight": { + "saturation_steps": 8, + "brightness_steps": 8, "led_count": 4, "max_brightness": 180, "sleep": true diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h index 4cbb32a859..86e1483148 100644 --- a/keyboards/kbdfans/phaseone/config.h +++ b/keyboards/kbdfans/phaseone/config.h @@ -32,8 +32,5 @@ #define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) #define RGBLIGHT_DEFAULT_SPD 15 -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 10 -#define RGBLIGHT_VAL_STEP 10 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 \ No newline at end of file diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json index 470608d223..836bc0952f 100644 --- a/keyboards/kbdfans/phaseone/info.json +++ b/keyboards/kbdfans/phaseone/info.json @@ -19,6 +19,9 @@ "on_state": 0 }, "rgblight": { + "hue_steps": 10, + "saturation_steps": 10, + "brightness_steps": 10, "led_count": 4, "sleep": true }, -- cgit v1.2.3 From 5542f5ede1356df387dfb10587f2d74e40fa62a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 27 Jun 2023 09:15:33 +1000 Subject: Get rid of `USB_LED_KANA` and `USB_LED_COMPOSE` (#21366) --- .../kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c | 11 ------ .../kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c | 12 ------ keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c | 16 -------- .../niu_mini/keymaps/codecoffeecode/keymap.c | 45 ---------------------- keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c | 24 ------------ .../kbdfans/niu_mini/keymaps/tucznak/keymap.c | 13 ------- 6 files changed, 121 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c index cd4a32ff41..33245acc51 100644 --- a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c +++ b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c @@ -163,14 +163,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void eeconfig_init_user(void) { set_unicode_input_mode(UNICODE_MODE_MACOS); } - -void matrix_init_user(void) { -} - -void matrix_scan_user(void) { - -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c index 5c307a31b1..228f648319 100644 --- a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c +++ b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c @@ -85,15 +85,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return true; } - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c b/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c index 8049c4ef5c..2e91933f44 100644 --- a/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c +++ b/keyboards/kbdfans/kbd8x_mk2/keymaps/ai03/keymap.c @@ -35,19 +35,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ) }; - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -void led_set_user(uint8_t usb_led) { - -} diff --git a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c index 523b6cf1a0..7f6f89589b 100644 --- a/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c +++ b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c @@ -56,48 +56,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - - -void matrix_init_user(void) { -} - -void matrix_scan_user(void) { -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - -void led_set_user(uint8_t usb_led) { - - if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { - - } else { - - } - - if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { - - } else { - - } - - if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) { - - } else { - - } - - if (IS_LED_ON(usb_led, USB_LED_COMPOSE)) { - - } else { - - } - - if (IS_LED_ON(usb_led, USB_LED_KANA)) { - - } else { - - } - -} diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c index 0631ceb185..4224672152 100644 --- a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c +++ b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c @@ -386,28 +386,4 @@ void led_set_user(uint8_t usb_led) { bnumlock = false; } - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_COMPOSE)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_KANA)) { - - } else { - - } - } diff --git a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c index b4f75a9d1e..e4f2eb44cf 100644 --- a/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c +++ b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c @@ -112,22 +112,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (!process_record_dynamic_macro(keycode, record)) { return false; } return true; } - -void led_set_user(uint8_t usb_led) { - -} -- cgit v1.2.3 From 9ab16e62f75dc6228549ec0aba00ec0704bbc779 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 3 Jul 2023 04:35:41 +1000 Subject: Get rid of `USB_LED_NUM_LOCK` (#21424) --- keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c index 4224672152..8c7d3b8e0e 100644 --- a/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c +++ b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c @@ -377,13 +377,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { */ -void led_set_user(uint8_t usb_led) { - - if (usb_led & (1 << USB_LED_NUM_LOCK)) { - bnumlock = true; - - } else { - bnumlock = false; - } - +bool led_update_user(led_t led_state) { + bnumlock = led_state.num_lock; + return false; } -- cgit v1.2.3 From 87b11345a55d076966846d87b60d0f315b8bb984 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Jul 2023 18:48:02 +1000 Subject: Get rid of `USB_LED_CAPS_LOCK` (#21436) --- keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c | 17 +++-------------- keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c | 6 +++--- keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c | 5 +++-- 3 files changed, 9 insertions(+), 19 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c index 682f15c445..88fe681f14 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/keymap.c @@ -69,22 +69,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______), }; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - -void matrix_init_user(void) { - -} - -void matrix_scan_user(void) { - -} - -void led_set_user(uint8_t usb_led) { - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { +bool led_update_user(led_t led_state) { + if (led_state.caps_lock) { rgblight_enable_noeeprom(); } else { rgblight_disable_noeeprom(); } + return false; } diff --git a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c index 8f2305ed4c..a8a369a611 100644 --- a/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c +++ b/keyboards/kbdfans/kbd6x/keymaps/konstantin/keymap.c @@ -43,8 +43,8 @@ static void check_light_layer(layer_state_t state) { last_checked_layer = true; } -static void check_light_led(uint8_t leds) { - if (IS_LED_ON(leds, USB_LED_CAPS_LOCK)) { +static void check_light_led(led_t led_state) { + if (led_state.caps_lock) { caps_light(); } else if (IS_LAYER_ON(L_FN)) { fn_light(); @@ -57,7 +57,7 @@ static void check_light_led(uint8_t leds) { static void inline check_light(void) { last_checked_layer ? check_light_layer(layer_state) - : check_light_led(host_keyboard_leds()); + : check_light_led(host_keyboard_led_state()); } void eeconfig_init_keymap(void) { diff --git a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c index 88272e3c72..c7f05a4e94 100644 --- a/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/tucznak/keymap.c @@ -79,11 +79,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -void led_set_user(uint8_t usb_led) { - if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { +bool led_update_user(led_t led_state) { + if (led_state.caps_lock) { setPinOutput(B2); writePinLow(B2); } else { setPinInput(B2); } + return false; } -- cgit v1.2.3 From 27ff1d4153ebe1476fdb011a5a136811e600412b Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 1 Aug 2023 01:54:28 +0100 Subject: Remove layout aliases from keyboard_aliases.hjson (#21658) --- keyboards/kbdfans/kbd67/mkiirgb/info.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/kbd67/mkiirgb/info.json b/keyboards/kbdfans/kbd67/mkiirgb/info.json index 023c6ff5db..683503b4ee 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/info.json @@ -5,5 +5,8 @@ "usb": { "vid": "0x4B42" }, - "community_layouts": ["65_ansi_blocker"] + "community_layouts": ["65_ansi_blocker"], + "layout_aliases": { + "LAYOUT": "LAYOUT_65_ansi_blocker" + } } -- cgit v1.2.3 From 37bc9499453f95e4e835faa751dbfffff9bfd644 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 23 Aug 2023 10:00:03 +1000 Subject: RGB Matrix: driver naming cleanups (#21594) --- keyboards/kbdfans/baguette66/rgb/info.json | 2 +- keyboards/kbdfans/bella/rgb/info.json | 2 +- keyboards/kbdfans/bella/rgb_iso/info.json | 2 +- keyboards/kbdfans/boop65/rgb/info.json | 2 +- keyboards/kbdfans/kbd67/mkiirgb/v1/info.json | 2 +- keyboards/kbdfans/kbd67/mkiirgb/v2/info.json | 2 +- keyboards/kbdfans/kbd67/mkiirgb/v3/info.json | 2 +- keyboards/kbdfans/kbd67/mkiirgb/v4/info.json | 2 +- keyboards/kbdfans/kbd67/mkiirgb_iso/info.json | 2 +- keyboards/kbdfans/kbd75rgb/info.json | 2 +- keyboards/kbdfans/kbdmini/info.json | 2 +- keyboards/kbdfans/kbdpad/mk3/info.json | 2 +- keyboards/kbdfans/maja/info.json | 2 +- keyboards/kbdfans/odin/rgb/info.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json index 9ac27f950a..519afbcc48 100644 --- a/keyboards/kbdfans/baguette66/rgb/info.json +++ b/keyboards/kbdfans/baguette66/rgb/info.json @@ -14,7 +14,7 @@ "pin": "E6" }, "rgb_matrix": { - "driver": "WS2812", + "driver": "ws2812", "sat_steps": 8, "val_steps": 8, "speed_steps": 10 diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json index ba39628688..b3b4e385f1 100644 --- a/keyboards/kbdfans/bella/rgb/info.json +++ b/keyboards/kbdfans/bella/rgb/info.json @@ -9,7 +9,7 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "IS31FL3741" + "driver": "is31fl3741" }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json index ffdf11155a..d407cb0f7b 100644 --- a/keyboards/kbdfans/bella/rgb_iso/info.json +++ b/keyboards/kbdfans/bella/rgb_iso/info.json @@ -9,7 +9,7 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "IS31FL3741" + "driver": "is31fl3741" }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], diff --git a/keyboards/kbdfans/boop65/rgb/info.json b/keyboards/kbdfans/boop65/rgb/info.json index 8f9028305e..cc780177dc 100644 --- a/keyboards/kbdfans/boop65/rgb/info.json +++ b/keyboards/kbdfans/boop65/rgb/info.json @@ -9,7 +9,7 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "IS31FL3741" + "driver": "is31fl3741" }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json index 733d68cc59..7b6795f07f 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json @@ -5,7 +5,7 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "IS31FL3731" + "driver": "is31fl3731" }, "matrix_pins": { "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"], diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json index 441c543913..e0fe90b6f3 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json @@ -5,7 +5,7 @@ "device_version": "0.0.2" }, "rgb_matrix": { - "driver": "IS31FL3731" + "driver": "is31fl3731" }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json index 378ffa7845..165db96293 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json @@ -5,7 +5,7 @@ "device_version": "0.0.3" }, "rgb_matrix": { - "driver": "IS31FL3741" + "driver": "is31fl3741" }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json index f66a39d799..7a62b96488 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json @@ -11,7 +11,7 @@ "pin": "C7" }, "rgb_matrix": { - "driver": "WS2812", + "driver": "ws2812", "sat_steps": 8, "val_steps": 8, "speed_steps": 10 diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json index 222742ed8f..cb8912f9a4 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json @@ -12,7 +12,7 @@ "pin": "C7" }, "rgb_matrix": { - "driver": "WS2812", + "driver": "ws2812", "sat_steps": 8, "val_steps": 8, "speed_steps": 10 diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json index bf2f596f3a..84b2a212d0 100644 --- a/keyboards/kbdfans/kbd75rgb/info.json +++ b/keyboards/kbdfans/kbd75rgb/info.json @@ -15,7 +15,7 @@ "pin": "C7" }, "rgb_matrix": { - "driver": "WS2812", + "driver": "ws2812", "sat_steps": 8, "val_steps": 8, "speed_steps": 10 diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/info.json index 533f52f012..99aa4a4113 100644 --- a/keyboards/kbdfans/kbdmini/info.json +++ b/keyboards/kbdfans/kbdmini/info.json @@ -9,7 +9,7 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "IS31FL3733" + "driver": "is31fl3733" }, "matrix_pins": { "cols": ["B3", "B2", "B1", "B0", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json index 01837a1d82..8ba02f8fa1 100644 --- a/keyboards/kbdfans/kbdpad/mk3/info.json +++ b/keyboards/kbdfans/kbdpad/mk3/info.json @@ -23,7 +23,7 @@ }, "processor": "atmega32u4", "rgb_matrix": { - "driver": "WS2812", + "driver": "ws2812", "layout": [ {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}, {"flags": 4, "matrix": [0, 1], "x": 75, "y": 0}, diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json index 68dc1d16e6..8ee6118452 100644 --- a/keyboards/kbdfans/maja/info.json +++ b/keyboards/kbdfans/maja/info.json @@ -9,7 +9,7 @@ "device_version": "0.0.1" }, "rgb_matrix": { - "driver": "IS31FL3731" + "driver": "is31fl3731" }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json index 46d9756ae9..308e9870cc 100644 --- a/keyboards/kbdfans/odin/rgb/info.json +++ b/keyboards/kbdfans/odin/rgb/info.json @@ -12,7 +12,7 @@ "pin": "B15" }, "rgb_matrix": { - "driver": "WS2812" + "driver": "ws2812" }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"], -- cgit v1.2.3 From 023d644bb69748d97feb49091e2c24f3fcd3da11 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 24 Aug 2023 07:11:39 +1000 Subject: Move RGBLight animations to data driven (#21635) * Move RGBLight animations to data driven, 0-9 * Move RGBLight animations to data driven, A * Move RGBLight animations to data driven, B * Move RGBLight animations to data driven, C * Move RGBLight animations to data driven, D * Move RGBLight animations to data driven, E * Move RGBLight animations to data driven, F * Move RGBLight animations to data driven, G * Move RGBLight animations to data driven, H * Move RGBLight animations to data driven, handwired * Move RGBLight animations to data driven, I * Move RGBLight animations to data driven, J * Move RGBLight animations to data driven, K * Move RGBLight animations to data driven, L * Move RGBLight animations to data driven, M * Move RGBLight animations to data driven, N * Move RGBLight animations to data driven, O * Move RGBLight animations to data driven, P * Move RGBLight animations to data driven, Q * Move RGBLight animations to data driven, R * Move RGBLight animations to data driven, S * Move RGBLight animations to data driven, T * Move RGBLight animations to data driven, U * Move RGBLight animations to data driven, V * Move RGBLight animations to data driven, W * Move RGBLight animations to data driven, X * Move RGBLight animations to data driven, Y * Move RGBLight animations to data driven, Z * Fix incorrect placement * Fix build failures and mismatches --- keyboards/kbdfans/baguette66/rgb/config.h | 10 --------- keyboards/kbdfans/baguette66/rgb/info.json | 14 ++++++++++++- keyboards/kbdfans/bounce/75/hotswap/config.h | 10 --------- keyboards/kbdfans/bounce/75/hotswap/info.json | 14 ++++++++++++- keyboards/kbdfans/bounce/75/soldered/config.h | 10 --------- keyboards/kbdfans/bounce/75/soldered/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd19x/config.h | 11 ---------- keyboards/kbdfans/kbd19x/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd4x/config.h | 11 ---------- keyboards/kbdfans/kbd4x/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd67/hotswap/config.h | 12 ----------- keyboards/kbdfans/kbd67/hotswap/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd67/mkiirgb/v4/config.h | 10 --------- keyboards/kbdfans/kbd67/mkiirgb/v4/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd67/rev1/config.h | 11 ---------- keyboards/kbdfans/kbd67/rev1/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd67/rev2/config.h | 29 -------------------------- keyboards/kbdfans/kbd67/rev2/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd6x/config.h | 11 ---------- keyboards/kbdfans/kbd6x/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd75/config.h | 11 ---------- keyboards/kbdfans/kbd75/rev1/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd75/rev2/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd75hs/config.h | 10 --------- keyboards/kbdfans/kbd75hs/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd75rgb/config.h | 10 --------- keyboards/kbdfans/kbd75rgb/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd8x/config.h | 11 ---------- keyboards/kbdfans/kbd8x/info.json | 14 ++++++++++++- keyboards/kbdfans/kbd8x_mk2/config.h | 11 ---------- keyboards/kbdfans/kbd8x_mk2/info.json | 14 ++++++++++++- keyboards/kbdfans/kbdpad/mk1/config.h | 29 -------------------------- keyboards/kbdfans/kbdpad/mk1/info.json | 14 ++++++++++++- keyboards/kbdfans/kbdpad/mk2/config.h | 11 ---------- keyboards/kbdfans/kbdpad/mk2/info.json | 14 ++++++++++++- keyboards/kbdfans/niu_mini/config.h | 11 ---------- keyboards/kbdfans/niu_mini/info.json | 14 ++++++++++++- keyboards/kbdfans/odin/soldered/config.h | 10 --------- keyboards/kbdfans/odin/soldered/info.json | 14 ++++++++++++- keyboards/kbdfans/odin/v2/config.h | 7 ------- keyboards/kbdfans/odin/v2/info.json | 10 ++++++++- keyboards/kbdfans/phaseone/config.h | 11 +--------- keyboards/kbdfans/phaseone/info.json | 14 ++++++++++++- 43 files changed, 283 insertions(+), 278 deletions(-) delete mode 100644 keyboards/kbdfans/kbd67/rev2/config.h delete mode 100644 keyboards/kbdfans/kbdpad/mk1/config.h (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/baguette66/rgb/config.h b/keyboards/kbdfans/baguette66/rgb/config.h index 78802b19f9..c989f1b121 100644 --- a/keyboards/kbdfans/baguette66/rgb/config.h +++ b/keyboards/kbdfans/baguette66/rgb/config.h @@ -20,16 +20,6 @@ #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 #define RGB_MATRIX_LED_COUNT 66 -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE #define RGB_MATRIX_KEYPRESSES #define ENABLE_RGB_MATRIX_ALPHAS_MODS #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json index 519afbcc48..c5ed4717a5 100644 --- a/keyboards/kbdfans/baguette66/rgb/info.json +++ b/keyboards/kbdfans/baguette66/rgb/info.json @@ -8,7 +8,19 @@ "device_version": "0.0.1" }, "rgblight": { - "led_count": 66 + "led_count": 66, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "E6" diff --git a/keyboards/kbdfans/bounce/75/hotswap/config.h b/keyboards/kbdfans/bounce/75/hotswap/config.h index 4705c300f9..79f79fdf50 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/config.h +++ b/keyboards/kbdfans/bounce/75/hotswap/config.h @@ -16,16 +16,6 @@ #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) #define RGBLIGHT_DEFAULT_SPD 15 diff --git a/keyboards/kbdfans/bounce/75/hotswap/info.json b/keyboards/kbdfans/bounce/75/hotswap/info.json index e715aab4c3..ee6f380e4e 100644 --- a/keyboards/kbdfans/bounce/75/hotswap/info.json +++ b/keyboards/kbdfans/bounce/75/hotswap/info.json @@ -21,7 +21,19 @@ "saturation_steps": 10, "brightness_steps": 10, "led_count": 4, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "F0" diff --git a/keyboards/kbdfans/bounce/75/soldered/config.h b/keyboards/kbdfans/bounce/75/soldered/config.h index 4705c300f9..79f79fdf50 100644 --- a/keyboards/kbdfans/bounce/75/soldered/config.h +++ b/keyboards/kbdfans/bounce/75/soldered/config.h @@ -16,16 +16,6 @@ #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD +8 ) #define RGBLIGHT_DEFAULT_SPD 15 diff --git a/keyboards/kbdfans/bounce/75/soldered/info.json b/keyboards/kbdfans/bounce/75/soldered/info.json index 582c3d8c55..8dd809d5c8 100644 --- a/keyboards/kbdfans/bounce/75/soldered/info.json +++ b/keyboards/kbdfans/bounce/75/soldered/info.json @@ -22,7 +22,19 @@ "saturation_steps": 10, "brightness_steps": 10, "led_count": 4, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "B7" diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h index 4ef254c5af..99c25201ad 100644 --- a/keyboards/kbdfans/kbd19x/config.h +++ b/keyboards/kbdfans/kbd19x/config.h @@ -17,17 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json index ce716804f7..c37e3587e2 100644 --- a/keyboards/kbdfans/kbd19x/info.json +++ b/keyboards/kbdfans/kbd19x/info.json @@ -26,7 +26,19 @@ "saturation_steps": 8, "brightness_steps": 8, "led_count": 18, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "E2" diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h index 3fe83f1a3a..e347de7759 100644 --- a/keyboards/kbdfans/kbd4x/config.h +++ b/keyboards/kbdfans/kbd4x/config.h @@ -17,17 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json index 7040322fc3..44c9daceb7 100644 --- a/keyboards/kbdfans/kbd4x/info.json +++ b/keyboards/kbdfans/kbd4x/info.json @@ -21,7 +21,19 @@ "saturation_steps": 8, "brightness_steps": 8, "led_count": 16, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "E2" diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h index 21548537d4..b5b661bef2 100644 --- a/keyboards/kbdfans/kbd67/hotswap/config.h +++ b/keyboards/kbdfans/kbd67/hotswap/config.h @@ -17,18 +17,6 @@ along with this program. If not, see . #pragma once -// /*== all animations enable ==*/ -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kbdfans/kbd67/hotswap/info.json b/keyboards/kbdfans/kbd67/hotswap/info.json index 8ddee65b5c..32ac10767d 100644 --- a/keyboards/kbdfans/kbd67/hotswap/info.json +++ b/keyboards/kbdfans/kbd67/hotswap/info.json @@ -21,7 +21,19 @@ "saturation_steps": 8, "brightness_steps": 8, "led_count": 8, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "B4" diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h index 2b06b9c43c..10f0bc0ec2 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h @@ -19,16 +19,6 @@ #define USB_SUSPEND_WAKEUP_DELAY 5000 #define RGB_MATRIX_LED_COUNT 68 -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json index 7a62b96488..a1ec2a1833 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json @@ -5,7 +5,19 @@ "device_version": "0.0.4" }, "rgblight": { - "led_count": 68 + "led_count": 68, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "C7" diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h index 62c2837ebe..d876570c80 100644 --- a/keyboards/kbdfans/kbd67/rev1/config.h +++ b/keyboards/kbdfans/kbd67/rev1/config.h @@ -17,17 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json index 383d1cc5a8..9119477584 100644 --- a/keyboards/kbdfans/kbd67/rev1/info.json +++ b/keyboards/kbdfans/kbd67/rev1/info.json @@ -29,7 +29,19 @@ "brightness_steps": 8, "led_count": 20, "max_brightness": 180, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/kbdfans/kbd67/rev2/config.h b/keyboards/kbdfans/kbd67/rev2/config.h deleted file mode 100644 index 7ab9c36d3b..0000000000 --- a/keyboards/kbdfans/kbd67/rev2/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2019 Vorror - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE diff --git a/keyboards/kbdfans/kbd67/rev2/info.json b/keyboards/kbdfans/kbd67/rev2/info.json index 7f053c26ce..7bd48689be 100644 --- a/keyboards/kbdfans/kbd67/rev2/info.json +++ b/keyboards/kbdfans/kbd67/rev2/info.json @@ -28,7 +28,19 @@ "brightness_steps": 8, "led_count": 16, "max_brightness": 240, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h index 62c2837ebe..d876570c80 100644 --- a/keyboards/kbdfans/kbd6x/config.h +++ b/keyboards/kbdfans/kbd6x/config.h @@ -17,17 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json index b0ff678010..654c01c0ec 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/info.json @@ -22,7 +22,19 @@ "saturation_steps": 12, "brightness_steps": 12, "led_count": 14, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "F0" diff --git a/keyboards/kbdfans/kbd75/config.h b/keyboards/kbdfans/kbd75/config.h index 8cb5bddc38..805f9ad054 100644 --- a/keyboards/kbdfans/kbd75/config.h +++ b/keyboards/kbdfans/kbd75/config.h @@ -8,14 +8,3 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE diff --git a/keyboards/kbdfans/kbd75/rev1/info.json b/keyboards/kbdfans/kbd75/rev1/info.json index fe52330c9c..d9d149f1e1 100644 --- a/keyboards/kbdfans/kbd75/rev1/info.json +++ b/keyboards/kbdfans/kbd75/rev1/info.json @@ -25,7 +25,19 @@ "saturation_steps": 8, "brightness_steps": 8, "led_count": 16, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "E2" diff --git a/keyboards/kbdfans/kbd75/rev2/info.json b/keyboards/kbdfans/kbd75/rev2/info.json index e75a10fd31..7cf43b93a7 100644 --- a/keyboards/kbdfans/kbd75/rev2/info.json +++ b/keyboards/kbdfans/kbd75/rev2/info.json @@ -25,7 +25,19 @@ "saturation_steps": 8, "brightness_steps": 8, "led_count": 16, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "E2" diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h index fab8ddf3f6..6a5b35b5b6 100644 --- a/keyboards/kbdfans/kbd75hs/config.h +++ b/keyboards/kbdfans/kbd75hs/config.h @@ -16,16 +16,6 @@ #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) #define RGBLIGHT_DEFAULT_SPD 15 diff --git a/keyboards/kbdfans/kbd75hs/info.json b/keyboards/kbdfans/kbd75hs/info.json index ec245dbbf1..fc2310993c 100644 --- a/keyboards/kbdfans/kbd75hs/info.json +++ b/keyboards/kbdfans/kbd75hs/info.json @@ -21,7 +21,19 @@ "saturation_steps": 10, "brightness_steps": 10, "led_count": 18, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "F0" diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h index 6a93d118d6..a8b20051ec 100644 --- a/keyboards/kbdfans/kbd75rgb/config.h +++ b/keyboards/kbdfans/kbd75rgb/config.h @@ -20,16 +20,6 @@ #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 #define RGB_MATRIX_LED_COUNT 84 -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE #define RGB_MATRIX_KEYPRESSES #define ENABLE_RGB_MATRIX_ALPHAS_MODS #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT diff --git a/keyboards/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json index 84b2a212d0..f501965348 100644 --- a/keyboards/kbdfans/kbd75rgb/info.json +++ b/keyboards/kbdfans/kbd75rgb/info.json @@ -9,7 +9,19 @@ "device_version": "0.0.1" }, "rgblight": { - "led_count": 84 + "led_count": 84, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "C7" diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h index e5b1e26b62..32ab8df837 100644 --- a/keyboards/kbdfans/kbd8x/config.h +++ b/keyboards/kbdfans/kbd8x/config.h @@ -17,17 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kbdfans/kbd8x/info.json b/keyboards/kbdfans/kbd8x/info.json index 0239fa78a9..4dc48901dd 100644 --- a/keyboards/kbdfans/kbd8x/info.json +++ b/keyboards/kbdfans/kbd8x/info.json @@ -26,7 +26,19 @@ "saturation_steps": 8, "brightness_steps": 8, "led_count": 20, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "E2" diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h index ee31dd7bfe..50001e978c 100644 --- a/keyboards/kbdfans/kbd8x_mk2/config.h +++ b/keyboards/kbdfans/kbd8x_mk2/config.h @@ -17,17 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kbdfans/kbd8x_mk2/info.json b/keyboards/kbdfans/kbd8x_mk2/info.json index 1029582d5b..e6e2e5c168 100644 --- a/keyboards/kbdfans/kbd8x_mk2/info.json +++ b/keyboards/kbdfans/kbd8x_mk2/info.json @@ -25,7 +25,19 @@ "brightness_steps": 8, "led_count": 20, "max_brightness": 200, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "indicators": { "caps_lock": "E6", diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h deleted file mode 100644 index d849732a07..0000000000 --- a/keyboards/kbdfans/kbdpad/mk1/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json index 4495eab886..fbb5649a8f 100644 --- a/keyboards/kbdfans/kbdpad/mk1/info.json +++ b/keyboards/kbdfans/kbdpad/mk1/info.json @@ -18,7 +18,19 @@ "breathing": true }, "rgblight": { - "led_count": 6 + "led_count": 6, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "driver": "i2c" diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index ee31dd7bfe..50001e978c 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -17,17 +17,6 @@ along with this program. If not, see . #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index 3d2afceb24..8c773f43e1 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -22,7 +22,19 @@ "saturation_steps": 8, "brightness_steps": 8, "led_count": 16, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "B5" diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h index 7eaf08234a..69c6b57a35 100644 --- a/keyboards/kbdfans/niu_mini/config.h +++ b/keyboards/kbdfans/niu_mini/config.h @@ -23,17 +23,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json index 9719c832ec..32ecfd33c6 100644 --- a/keyboards/kbdfans/niu_mini/info.json +++ b/keyboards/kbdfans/niu_mini/info.json @@ -20,7 +20,19 @@ "rgblight": { "saturation_steps": 8, "brightness_steps": 8, - "led_count": 14 + "led_count": 14, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "E2" diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h index 7c771d1d0d..3586d1d96a 100644 --- a/keyboards/kbdfans/odin/soldered/config.h +++ b/keyboards/kbdfans/odin/soldered/config.h @@ -16,16 +16,6 @@ #pragma once -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 8) #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2 diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json index 0b99fd1eb8..9eaa340a4b 100644 --- a/keyboards/kbdfans/odin/soldered/info.json +++ b/keyboards/kbdfans/odin/soldered/info.json @@ -26,7 +26,19 @@ "brightness_steps": 8, "led_count": 4, "max_brightness": 180, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "processor": "STM32F072", "bootloader": "stm32-dfu", diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h index d82b94c5db..e47ec47523 100644 --- a/keyboards/kbdfans/odin/v2/config.h +++ b/keyboards/kbdfans/odin/v2/config.h @@ -16,11 +16,4 @@ #pragma once - #define RGBLIGHT_EFFECT_STATIC_GRADIENT - #define RGBLIGHT_EFFECT_RAINBOW_SWIRL - #define RGBLIGHT_EFFECT_RAINBOW_MOOD - #define RGBLIGHT_EFFECT_CHRISTMAS - #define RGBLIGHT_EFFECT_SNAKE - #define RGBLIGHT_EFFECT_BREATHING - #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json index 5af1d84aac..7714d2407f 100644 --- a/keyboards/kbdfans/odin/v2/info.json +++ b/keyboards/kbdfans/odin/v2/info.json @@ -26,7 +26,15 @@ "brightness_steps": 8, "led_count": 4, "max_brightness": 180, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "christmas": true, + "static_gradient": true + } }, "processor": "STM32F072", "bootloader": "stm32-dfu", diff --git a/keyboards/kbdfans/phaseone/config.h b/keyboards/kbdfans/phaseone/config.h index 86e1483148..2dba9f5d35 100644 --- a/keyboards/kbdfans/phaseone/config.h +++ b/keyboards/kbdfans/phaseone/config.h @@ -20,16 +20,7 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE + #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) #define RGBLIGHT_DEFAULT_SPD 15 diff --git a/keyboards/kbdfans/phaseone/info.json b/keyboards/kbdfans/phaseone/info.json index 836bc0952f..14150a1cdd 100644 --- a/keyboards/kbdfans/phaseone/info.json +++ b/keyboards/kbdfans/phaseone/info.json @@ -23,7 +23,19 @@ "saturation_steps": 10, "brightness_steps": 10, "led_count": 4, - "sleep": true + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } }, "ws2812": { "pin": "B6" -- cgit v1.2.3