From 363bfdbfda5ea9fa996390920a9e8982535b76c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 27 May 2023 12:27:44 +1000 Subject: Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974) Co-authored-by: Nick Brassel --- keyboards/kprepublic/bm40hsrgb/config.h | 1 - keyboards/kprepublic/bm40hsrgb/info.json | 3 +++ keyboards/kprepublic/bm43a/config.h | 1 - keyboards/kprepublic/bm43a/info.json | 3 +++ keyboards/kprepublic/bm43hsrgb/config.h | 1 - keyboards/kprepublic/bm43hsrgb/info.json | 3 +++ keyboards/kprepublic/bm60hsrgb/rev1/config.h | 1 - keyboards/kprepublic/bm60hsrgb/rev1/info.json | 3 +++ keyboards/kprepublic/bm60hsrgb/rev2/config.h | 1 - keyboards/kprepublic/bm60hsrgb/rev2/info.json | 3 +++ keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h | 1 - keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json | 3 +++ keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h | 1 - keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json | 3 +++ keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h | 1 - keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json | 3 +++ keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h | 1 - keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json | 3 +++ keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h | 1 - keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json | 3 +++ keyboards/kprepublic/bm68hsrgb/rev1/config.h | 1 - keyboards/kprepublic/bm68hsrgb/rev1/info.json | 3 +++ keyboards/kprepublic/bm68hsrgb/rev2/config.h | 1 - keyboards/kprepublic/bm68hsrgb/rev2/info.json | 3 +++ keyboards/kprepublic/cospad/config.h | 1 - 25 files changed, 36 insertions(+), 13 deletions(-) (limited to 'keyboards/kprepublic') diff --git a/keyboards/kprepublic/bm40hsrgb/config.h b/keyboards/kprepublic/bm40hsrgb/config.h index f6b358d2bb..ac0261a608 100755 --- a/keyboards/kprepublic/bm40hsrgb/config.h +++ b/keyboards/kprepublic/bm40hsrgb/config.h @@ -23,7 +23,6 @@ #define RGB_MATRIX_LED_COUNT 53 # define RGB_MATRIX_KEYPRESSES // reacts to keypresses -# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value diff --git a/keyboards/kprepublic/bm40hsrgb/info.json b/keyboards/kprepublic/bm40hsrgb/info.json index bf0bf727bd..4007cc7360 100644 --- a/keyboards/kprepublic/bm40hsrgb/info.json +++ b/keyboards/kprepublic/bm40hsrgb/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "WS2812" }, + "rgblight": { + "max_brightness": 180 + }, "matrix_pins": { "cols": ["B6", "C6", "B4", "D7", "D4", "D6", "C7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B3", "B2", "E6", "B5"] diff --git a/keyboards/kprepublic/bm43a/config.h b/keyboards/kprepublic/bm43a/config.h index d48bc690b1..c3303237f7 100644 --- a/keyboards/kprepublic/bm43a/config.h +++ b/keyboards/kprepublic/bm43a/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_LIMIT_VAL 180 // Limit to vendor-recommended value #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json index bee05ba036..8cd3487567 100644 --- a/keyboards/kprepublic/bm43a/info.json +++ b/keyboards/kprepublic/bm43a/info.json @@ -20,6 +20,9 @@ "ws2812": { "pin": "E2" }, + "rgblight": { + "max_brightness": 180 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/kprepublic/bm43hsrgb/config.h b/keyboards/kprepublic/bm43hsrgb/config.h index 3e8def8541..fb800abc06 100755 --- a/keyboards/kprepublic/bm43hsrgb/config.h +++ b/keyboards/kprepublic/bm43hsrgb/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_LIMIT_VAL 180 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json index 70e418e894..1cdaa64602 100755 --- a/keyboards/kprepublic/bm43hsrgb/info.json +++ b/keyboards/kprepublic/bm43hsrgb/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "E2" }, + "rgblight": { + "max_brightness": 180 + }, "matrix_pins": { "cols": ["C6", "D2", "D1", "D0", "D7", "D6", "D4", "D5", "D3", "B7", "B3", "B2"], "rows": ["E6", "B6", "B4", "B5"] diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/config.h b/keyboards/kprepublic/bm60hsrgb/rev1/config.h index 8f4ab997f4..eebd3381d5 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb/rev1/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define RGB_MATRIX_LED_COUNT 69 # define RGBLED_NUM 69 # define RGB_MATRIX_KEYPRESSES -# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/info.json b/keyboards/kprepublic/bm60hsrgb/rev1/info.json index 6c39b9ef12..f73af590d3 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev1/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "WS2812" }, + "rgblight": { + "max_brightness": 180 + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h index dcb7dfcd00..c2aafb9adc 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h @@ -16,7 +16,6 @@ #pragma once //rgb light setting -#define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json index 0aecea352c..bb6533b823 100644 --- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "custom" }, + "rgblight": { + "max_brightness": 150 + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h index eada5a6c85..1cc17d6c86 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/config.h @@ -16,7 +16,6 @@ #pragma once //rgb light setting -#define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json index 2d2f4d6ef5..d91f6a8531 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "IS31FL3733" }, + "rgblight": { + "max_brightness": 150 + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h index 62008d679a..d4ba498987 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/config.h @@ -23,7 +23,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_LIMIT_VAL 180 // Limit to vendor-recommended value // #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json index 800ff0de31..6e9256523f 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "WS2812" }, + "rgblight": { + "max_brightness": 180 + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h index 29e89da4d4..7af983c5e7 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h @@ -18,7 +18,6 @@ #pragma once //rgb light setting -#define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json index bbd8049581..6326d871df 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "custom" }, + "rgblight": { + "max_brightness": 150 + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h index a831ee9a7d..aac03cec4d 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/config.h @@ -23,7 +23,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_LIMIT_VAL 180 // Limit to vendor-recommended value #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 diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json index 1cb03ddb77..5746594468 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "WS2812" }, + "rgblight": { + "max_brightness": 180 + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h index ce593d1605..2feead3386 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h @@ -16,7 +16,6 @@ #pragma once //rgb light setting -#define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json index 1620ac77da..01d09b5946 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "custom" }, + "rgblight": { + "max_brightness": 150 + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h index c7b27fab46..cef5a0939b 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h +++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . #define RGB_MATRIX_LED_COUNT 74 # define RGBLED_NUM 74 # define RGB_MATRIX_KEYPRESSES // reacts to keypresses -# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json index a965121f64..b3747af5b1 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev1/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev1/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "WS2812" }, + "rgblight": { + "max_brightness": 180 + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h index 2810b2096e..53aabdaf94 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h +++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h @@ -18,7 +18,6 @@ #define USB_POLLING_INTERVAL_MS 1 -#define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json index 7e4623804b..b7c827e0ea 100644 --- a/keyboards/kprepublic/bm68hsrgb/rev2/info.json +++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json @@ -14,6 +14,9 @@ "rgb_matrix": { "driver": "IS31FL3741" }, + "rgblight": { + "max_brightness": 150 + }, "matrix_pins": { "cols": ["F0", "F1", "B0", "B1", "B2", "B3", "E6", "B7", "D2", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D6", "D4", "D5", "D3", "F6"] diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h index f6154f76d4..d9727b63c7 100644 --- a/keyboards/kprepublic/cospad/config.h +++ b/keyboards/kprepublic/cospad/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_LIMIT_VAL 255 /* The maximum brightness level */ #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 -- cgit v1.2.3