Move RGBLIGHT_LIMIT_VAL to data driven (qmk#20974)

jpskenn · Nov 4, 2023 · ab03e4e · ab03e4e
1 parent 1b1876c
commit ab03e4e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 7 deletions.
diff --git a/keyboards/nora/v01/config.h b/keyboards/nora/v01/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_LIMIT_VAL 240 /* The maximum brightness level */
   #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
@@ -18,10 +18,12 @@
     "ws2812": {
         "pin": "E6"
     },
+    "rgblight": {
+        "max_brightness": 240
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-
                 {"label": "", "matrix": [0, 0], "x":0, "y":0},
                 {"label": "", "matrix": [5, 0], "x":1, "y":0},
                 {"label": "", "matrix": [0, 1], "x":2, "y":0},

diff --git a/keyboards/nora/v03/config.h b/keyboards/nora/v03/config.h
@@ -20,7 +20,6 @@ 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_MAXIMUM_BRIGHTNESS 150
   #define RGB_MATRIX_HUE_STEP 8
   #define RGB_MATRIX_SAT_STEP 8
   #define RGB_MATRIX_VAL_STEP 8
@@ -33,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
-  #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
   #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
@@ -18,6 +18,12 @@
     "ws2812": {
         "pin": "E6"
     },
+    "rgb_matrix": {
+        "max_brightness": 150
+    },
+    "rgblight": {
+        "max_brightness": 150
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nora/v031/config.h b/keyboards/nora/v031/config.h
@@ -49,7 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // Full:                71
   #define RGB_MATRIX_LED_COUNT 64
 
-  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
   #define RGB_MATRIX_STARTUP_VAL 40
   #define RGB_MATRIX_HUE_STEP 4
   #define RGB_MATRIX_SAT_STEP 8
@@ -111,7 +110,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       /* RGB Lighting */
       #define RGBLED_NUM 64
 
-      #define RGBLIGHT_LIMIT_VAL 128
       #define RGBLIGHT_DEFAULT_VAL 40
       #define RGBLIGHT_HUE_STEP 8
       #define RGBLIGHT_SAT_STEP 8

diff --git a/keyboards/nora/v031/info.json b/keyboards/nora/v031/info.json
@@ -18,6 +18,12 @@
     "ws2812": {
         "pin": "E6"
     },
+    "rgb_matrix": {
+        "max_brightness": 128
+    },
+    "rgblight": {
+        "max_brightness": 128
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B2"}

diff --git a/keyboards/nora/v1/config.h b/keyboards/nora/v1/config.h
@@ -49,7 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   // RE :  62
   #define RGB_MATRIX_LED_COUNT 71
 
-  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
   #define RGB_MATRIX_STARTUP_VAL 40
   #define RGB_MATRIX_HUE_STEP 4
   #define RGB_MATRIX_SAT_STEP 8

diff --git a/keyboards/nora/v1/info.json b/keyboards/nora/v1/info.json
@@ -18,6 +18,9 @@
     "ws2812": {
         "pin": "E6"
     },
+    "rgb_matrix": {
+        "max_brightness": 128
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B1", "pin_b": "B2"}