Move RGBLIGHT_HUE/SAT/VAL_STEP to data driven (qmk#21292)

jpskenn · Nov 5, 2023 · 08aaaff · 08aaaff
1 parent 27c6242
commit 08aaaff
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 20 deletions.
diff --git a/keyboards/nora/v01/config.h b/keyboards/nora/v01/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* RGBLIGHT */
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_DEFAULT_VAL 127 /* The default brightness level */
   /* Lighting Layers */
   #define RGBLIGHT_LAYERS

diff --git a/keyboards/nora/v01/info.json b/keyboards/nora/v01/info.json
@@ -20,7 +20,9 @@
     },
     "rgblight": {
         "led_count": 16,
-        "max_brightness": 240
+        "max_brightness": 240,
+        "saturation_steps": 8,
+        "brightness_steps": 8
     },
     "layouts": {
         "LAYOUT": {

diff --git a/keyboards/nora/v03/config.h b/keyboards/nora/v03/config.h
@@ -20,17 +20,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGBLIGHT */
 #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_LED_COUNT 71
-  #define RGB_MATRIX_HUE_STEP 8
-  #define RGB_MATRIX_SAT_STEP 8
-  #define RGB_MATRIX_VAL_STEP 8
-  #define RGB_MATRIX_SPD_STEP 8
   #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
   #define RGB_MATRIX_KEYPRESSES
 
 #else
-  #define RGBLIGHT_HUE_STEP 8
-  #define RGBLIGHT_SAT_STEP 8
-  #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_DEFAULT_VAL 127 /* The default brightness level */
   /* Lighting Layers */
   #define RGBLIGHT_LAYERS

diff --git a/keyboards/nora/v03/info.json b/keyboards/nora/v03/info.json
@@ -20,11 +20,16 @@
     },
     "rgb_matrix": {
         "driver": "ws2812",
+        "sat_steps": 8,
+        "speed_steps": 8,
+        "val_steps": 8,
         "max_brightness": 150
     },
     "rgblight": {
         "led_count": 71,
-        "max_brightness": 150
+        "max_brightness": 150,
+        "saturation_steps": 8,
+        "brightness_steps": 8
     },
     "layouts": {
         "LAYOUT": {

diff --git a/keyboards/nora/v031/config.h b/keyboards/nora/v031/config.h
@@ -34,10 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGB_MATRIX_LED_COUNT 64
 
   #define RGB_MATRIX_STARTUP_VAL 40
-  #define RGB_MATRIX_HUE_STEP 4
-  #define RGB_MATRIX_SAT_STEP 8
-  #define RGB_MATRIX_VAL_STEP 8
-  #define RGB_MATRIX_SPD_STEP 8
 
   #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
   #define RGB_MATRIX_FRAMEBUFFER_EFFECTS

diff --git a/keyboards/nora/v031/info.json b/keyboards/nora/v031/info.json
@@ -20,6 +20,10 @@
     },
     "rgb_matrix": {
         "driver": "ws2812",
+        "hue_steps": 4,
+        "sat_steps": 8,
+        "speed_steps": 8,
+        "val_steps": 8,
         "max_brightness": 128
     },
     "encoder": {

diff --git a/keyboards/nora/v1/config.h b/keyboards/nora/v1/config.h
@@ -34,10 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGB_MATRIX_LED_COUNT 71
 
   #define RGB_MATRIX_STARTUP_VAL 40
-  #define RGB_MATRIX_HUE_STEP 4
-  #define RGB_MATRIX_SAT_STEP 8
-  #define RGB_MATRIX_VAL_STEP 8
-  #define RGB_MATRIX_SPD_STEP 8
 
   #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
   #define RGB_MATRIX_FRAMEBUFFER_EFFECTS

diff --git a/keyboards/nora/v1/info.json b/keyboards/nora/v1/info.json
@@ -20,6 +20,10 @@
     },
     "rgb_matrix": {
         "driver": "ws2812",
+        "hue_steps": 4,
+        "sat_steps": 8,
+        "speed_steps": 8,
+        "val_steps": 8,
         "max_brightness": 128
     },
     "encoder": {