Move RGBLIGHT_LIMIT_VAL to data driven

qmk · tzarc · May 27, 2023 · May 17, 2023 · May 17, 2023 · May 27, 2023
commit 20399eda32dd415f0cd4fc06fcaad3e3027d92b3
diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h
@@ -19,7 +19,6 @@
 
 /* underglow */
 #define RGBLED_NUM 24
-#define RGBLIGHT_LIMIT_VAL 185 // limit max I to 400mA 
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/0_sixty/underglow/info.json b/keyboards/0_sixty/underglow/info.json
@@ -8,5 +8,8 @@
     },
     "ws2812": {
         "pin": "B6"
+    },
+    "rgblight": {
+        "max_brightness": 185
     }
 }
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
@@ -12,7 +12,6 @@
 
 #    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGBLIGHT_LIMIT_VAL 150
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150

diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PAL_MODE 1
 
 #define RGBLED_NUM 16
-#define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json
@@ -19,6 +19,9 @@
         "breathing": true,
         "breathing_period": 3
     },
+    "rgblight": {
+        "max_brightness": 200
+    },
     "ws2812": {
         "pin": "B15"
     },

diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h
@@ -21,7 +21,6 @@
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_LIMIT_VAL 200 /* 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

diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "F0"
     },
+    "rgblight": {
+        "max_brightness": 200
+    },
     "matrix_pins": {
         "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B3", "B2", "B1"],
         "rows": ["D0", "D1", "D2", "D3", "D5"]

diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
@@ -21,7 +21,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 200 /* 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

diff --git a/keyboards/ai03/polaris/info.json b/keyboards/ai03/polaris/info.json
@@ -18,6 +18,9 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "max_brightness": 200
+    },
     "ws2812": {
         "pin": "D2"
     },

diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 68
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT { 34, 34 }
-#define RGBLIGHT_LIMIT_VAL 170
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "B5"
     },
+    "rgblight": {
+        "max_brightness": 170
+    },
     "rgb_matrix": {
         "driver": "WS2812"
     },

diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h
@@ -21,7 +21,6 @@
     #define RGBLIGHT_HUE_STEP 8
     #define RGBLIGHT_SAT_STEP 8
     #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_LIMIT_VAL 100 /* 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

diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
@@ -8,6 +8,9 @@
         "pid": "0xD4C3",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "max_brightness": 100
+    },
     "ws2812": {
         "pin": "D2"
     },

diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 #define RGBLED_NUM 68
-#define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0065",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "max_brightness": 200
+    },
     "ws2812": {
         "pin": "B15"
     },

diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h
@@ -35,4 +35,3 @@ 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 50
diff --git a/keyboards/aos/tkl/info.json b/keyboards/aos/tkl/info.json
@@ -10,6 +10,9 @@
     "ws2812": {
         "pin": "E6"
     },
+    "rgblight": {
+        "max_brightness": 50
+    },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"],
         "rows": ["D3", "D2", "B7", "F1", "C7", "D5"]

diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h
@@ -7,7 +7,6 @@
 #    define RGBLED_NUM 64
 #    define RGBLED_SPLIT { 32, 32 }
 #    define RGBLIGHT_SPLIT
-#    define RGBLIGHT_LIMIT_VAL 100 // LED Brightness, high power draw may exceed the USB limitations of 0.6A and cause a crash.    
 #    define RGBLIGHT_HUE_STEP  10    
 #    define RGBLIGHT_SAT_STEP  17    
 #    define RGBLIGHT_VAL_STEP  17    

diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
@@ -24,6 +24,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgblight": {
+        "max_brightness": 100
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 69    // Number of LEDs. backlight x69
 #define RGBLED_SPLIT { 34, 35 }
-#define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17

diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
@@ -19,6 +19,9 @@
     "ws2812": {
         "pin": "D3"
     },
+    "rgblight": {
+        "max_brightness": 120
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
@@ -36,9 +36,6 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 #endif
 
-/* Limits the brightness of the LEDS range of 255-0 (255 is default)*/
-#define RGBLIGHT_LIMIT_VAL 128
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 

diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
@@ -26,6 +26,9 @@
     "ws2812": {
         "pin": "E6"
     },
+    "rgblight": {
+        "max_brightness": 128
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
    "layouts": {

diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h
@@ -32,7 +32,6 @@
   #define RGBLED_SPLIT \
         { 18, 18 }
   #define RGBLIGHT_SPLIT
-  #define RGBLIGHT_LIMIT_VAL 150
   #define RGBLIGHT_HUE_STEP 10
   #define RGBLIGHT_SAT_STEP 17
   #define RGBLIGHT_VAL_STEP 17

diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json
@@ -11,6 +11,9 @@
   "ws2812": {
     "pin": "D3"
   },
+  "rgblight": {
+    "max_brightness": 150
+  },
   "matrix_pins": {
     "cols": ["B1", "F7", "F6", "F5", "F4"],
     "rows": ["D4", "C6", "D7", "E6"]

diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
@@ -52,5 +52,4 @@ 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
 #define RGBLIGHT_SLEEP
diff --git a/keyboards/buildakb/potato65/info.json b/keyboards/buildakb/potato65/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "B1"
     },
+    "rgblight": {
+        "max_brightness": 240
+    },
     "matrix_pins": {
         "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
         "rows": ["E6", "B7", "F7", "F4", "F5"]

diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
@@ -37,5 +37,4 @@ 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
 #    define RGBLIGHT_SLEEP
diff --git a/keyboards/buildakb/potato65hs/info.json b/keyboards/buildakb/potato65hs/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "D5"
     },
+    "rgblight": {
+        "max_brightness": 240
+    },
     "matrix_pins": {
         "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
         "rows": ["F5", "F4", "F6", "F0", "D2"]

diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
@@ -37,5 +37,4 @@ 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
 #    define RGBLIGHT_SLEEP
diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "D5"
     },
+    "rgblight": {
+        "max_brightness": 240
+    },
     "matrix_pins": {
         "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
         "rows": ["F5", "F4", "F6", "F0", "D2"]

diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
@@ -35,7 +35,6 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 36
-#define RGBLIGHT_LIMIT_VAL 230
 #define RGBLIGHT_HUE_STEP 12
 #define RGBLIGHT_SAT_STEP 12
 #define RGBLIGHT_VAL_STEP 12
diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "D4"
     },
+    "rgblight": {
+        "max_brightness": 230
+    },
     "matrix_pins": {
         "cols": ["B6", "C6", "D2", "E6", "C7", "B3", "F7", "F6", "F5", "F4", "F1", "F0"],
         "rows": ["B5", "B4", "D1", "D7", "D6"]

diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h
@@ -37,4 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
-#define RGBLIGHT_LIMIT_VAL 50
diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "F1"
     },
+    "rgblight": {
+        "max_brightness": 50
+    },
     "matrix_pins": {
         "cols": ["F5", "F7", "F4"],
         "rows": ["D7", "F0", "F6"]

diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 #define RGBLED_NUM 16
-#define RGBLIGHT_LIMIT_VAL 200
 #define RGBLIGHT_SLEEP
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json
@@ -23,6 +23,9 @@
         "levels": 6,
         "breathing": true
     },
+    "rgblight": {
+        "max_brightness": 200
+    },
     "ws2812": {
         "pin": "B15"
     },

diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h
@@ -29,7 +29,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 32 /* 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

diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "C6"
     },
+    "rgblight": {
+        "max_brightness": 32
+    },
     "matrix_pins": {
         "cols": ["C7", "D6", "B3", "B0", "B1"],
         "rows": ["D4", "D3", "B5", "B7", "B4", "B2"]

diff --git a/keyboards/custommk/genesis/rev1/config.h b/keyboards/custommk/genesis/rev1/config.h
@@ -32,6 +32,5 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 128
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 4
 
diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E6"
     },
+    "rgblight": {
+        "max_brightness": 128
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "D7", "B4"],
         "rows": ["F0", "C7", "C6", "B6", "B5"]

diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
@@ -33,6 +33,5 @@
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 128
 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 4
 
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
@@ -11,6 +11,9 @@
     "ws2812": {
         "pin": "E6"
     },
+    "rgblight": {
+        "max_brightness": 128
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "D7", "B4"],
         "rows": ["F0", "C7", "C6", "B6", "B5", "B0"]

diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_LIMIT_VAL 153
 
 /*
  * Feature disable options

diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
@@ -16,6 +16,9 @@
     "ws2812": {
         "pin": "F1"
     },
+    "rgblight": {
+        "max_brightness": 153
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {

diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
@@ -31,4 +31,3 @@
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 10
 #define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_LIMIT_VAL 130 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.