feat(underglow): maximum brightness in Kconfig

zmkfirmware · Feb 17, 2021 · 4019d1a · 4019d1a
1 parent af9d6e9
commit 4019d1a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/app/Kconfig b/app/Kconfig
@@ -230,7 +230,13 @@ config ZMK_RGB_UNDERGLOW_SAT_START
 	default 100
 
 config ZMK_RGB_UNDERGLOW_BRT_START
-	int "RGB underglow start brightness value from 0-100"
+	int "RGB underglow start brightness value from 0-ZMK_RGB_UNDERGLOW_BRT_MAX"
+	range 0 ZMK_RGB_UNDERGLOW_BRT_MAX
+	default ZMK_RGB_UNDERGLOW_BRT_MAX
+
+config ZMK_RGB_UNDERGLOW_BRT_MAX
+	int "RGB underglow maximum brightness value from 1-100"
+	range 1 100
 	default 100
 
 config ZMK_RGB_UNDERGLOW_SPD_START

diff --git a/app/src/rgb_underglow.c b/app/src/rgb_underglow.c
@@ -26,7 +26,6 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #define HUE_MAX 360
 #define SAT_MAX 100
-#define BRT_MAX 100
 
 enum rgb_underglow_effect {
     UNDERGLOW_EFFECT_SOLID,
@@ -58,7 +57,7 @@ static struct led_rgb hsb_to_rgb(struct zmk_led_hsb hsb) {
     double r, g, b;
 
     uint8_t i = hsb.h / 60;
-    double v = hsb.b / ((float)BRT_MAX);
+    double v = hsb.b / ((float)CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX);
     double s = hsb.s / ((float)SAT_MAX);
     double f = hsb.h / ((float)HUE_MAX) * 6 - i;
     double p = v * (1 - s);
@@ -335,7 +334,7 @@ int zmk_rgb_underglow_toggle() {
 }
 
 int zmk_rgb_underglow_set_hsb(struct zmk_led_hsb color) {
-    if (color.h > HUE_MAX || color.s > SAT_MAX || color.b > BRT_MAX) {
+    if (color.h > HUE_MAX || color.s > SAT_MAX || color.b > CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX) {
         return -ENOTSUP;
     }
 
@@ -373,8 +372,8 @@ struct zmk_led_hsb zmk_rgb_underglow_calc_brt(int direction) {
     int b = color.b + (direction * CONFIG_ZMK_RGB_UNDERGLOW_BRT_STEP);
     if (b < 0) {
         b = 0;
-    } else if (b > BRT_MAX) {
-        b = BRT_MAX;
+    } else if (b > CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX) {
+        b = CONFIG_ZMK_RGB_UNDERGLOW_BRT_MAX;
     }
     color.b = b;