Move RGBLIGHT_SPLIT to data driven (qmk#21190)

* Move `RGBLIGHT_SPLIT` to data driven * Remove where `split_count` is already set
jesperhellberg · Sep 9, 2023 · 49bf970 · 49bf970
1 parent e0a813e
commit 49bf970
Show file tree

Hide file tree

Showing 73 changed files with 25 additions and 67 deletions.
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 68
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h
@@ -4,4 +4,3 @@
 #pragma once
 
 #define RGBLED_NUM 12
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h
@@ -4,4 +4,3 @@
 #pragma once
 
 #define RGBLED_NUM 12
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h
@@ -5,7 +5,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 #    define RGBLED_NUM 64
-#    define RGBLIGHT_SPLIT
 #    define RGBLIGHT_HUE_STEP  10    
 #    define RGBLIGHT_SAT_STEP  17    
 #    define RGBLIGHT_VAL_STEP  17    

diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #define RGBLED_NUM 38
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h
@@ -29,7 +29,6 @@
   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
   #define RGBLIGHT_EFFECT_BREATHING
   #define RGBLED_NUM 36
-  #define RGBLIGHT_SPLIT
   #define RGBLIGHT_HUE_STEP 10
   #define RGBLIGHT_SAT_STEP 17
   #define RGBLIGHT_VAL_STEP 17

diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGBLIGHT_ENABLE
 #    define RGBLED_NUM 54 // Number of LEDs
-#    define RGBLIGHT_SPLIT
 #endif
 
 #ifdef RGB_MATRIX_ENABLE

diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define USE_I2C
 
 #define RGBLED_NUM 2
-#define RGBLIGHT_SPLIT
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE

diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLED_NUM 10
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8

diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1B1E",
         "device_version": "0.0.1"
     },
+    "rgblight": {
+        "split": true
+    },
     "ws2812": {
         "pin": "D3"
     },

diff --git a/keyboards/flxlb/zplit/config.h b/keyboards/flxlb/zplit/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGBLED_NUM 16
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
 
    #define RGBLED_NUM 10
-   #define RGBLIGHT_SPLIT
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8

diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
@@ -44,8 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGBLED_NUM 28  // Number of LEDs
 
-#define RGBLIGHT_SPLIT
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
@@ -20,6 +20,7 @@
         "pin": "D3"
     },
     "rgblight": {
+        "split": true,
         "max_brightness": 120
     },
     "split": {

diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* ws2812 RGB LED */
 #if !defined(RGBLED_NUM)
 #    define RGBLED_NUM 30
-#    define RGBLIGHT_SPLIT
 #    define RGBLIGHT_LAYERS
 #endif
 #define RGBLIGHT_EFFECT_BREATHING

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // WS2812 RGB LED strip input and number of LEDs
 #define RGBLED_NUM      20
-#define RGBLIGHT_SPLIT
 
 #define AUDIO_PIN       C6
 

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_CHANNEL  3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 
 #define RGBLED_NUM          20
-#define RGBLIGHT_SPLIT
 
 #define DEBUG_LED_PIN C13
 

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -33,7 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define RGBLED_NUM          57
-#define RGBLIGHT_SPLIT
 
 #define DEBUG_LED_PIN      C13
 

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // WS2812 RGB LED strip input and number of LEDs
 #define RGBLED_NUM      20
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_LIMIT_VAL 80
 
 #define DEBUG_LED_PIN   D6

diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_RIGHT
 
 #    define RGBLED_NUM 12
-#    define RGBLIGHT_SPLIT
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 1
 #    define RGBLIGHT_VAL_STEP 1

diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
@@ -62,7 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_SPLIT
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
 //   #define RGBLIGHT_VAL_STEP 8

diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
@@ -62,7 +62,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #ifdef RGBLIGHT_ENABLE
-  #define RGBLIGHT_SPLIT
 //   #define RGBLIGHT_HUE_STEP 8
 //   #define RGBLIGHT_SAT_STEP 8
 //   #define RGBLIGHT_VAL_STEP 8

diff --git a/keyboards/hidtech/bastyl/config.h b/keyboards/hidtech/bastyl/config.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #define RGBLED_NUM 38
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
@@ -19,6 +19,9 @@
     "ws2812": {
         "pin": "D2"
     },
+    "rgblight": {
+        "split": true
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/jian/nsrev2/config.h b/keyboards/jian/nsrev2/config.h
@@ -34,7 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_SPLIT
 
 #ifndef IOS_DEVICE_ENABLE
 #if RGBLED_NUM <= 6

diff --git a/keyboards/jian/nsrev2/info.json b/keyboards/jian/nsrev2/info.json
@@ -13,6 +13,9 @@
         "levels": 5,
         "breathing": true
     },
+    "rgblight": {
+        "split": true
+    },
     "ws2812": {
         "pin": "D4"
     },

diff --git a/keyboards/jian/rev1/config.h b/keyboards/jian/rev1/config.h
@@ -87,7 +87,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_SPLIT
 
 #ifndef IOS_DEVICE_ENABLE
 #if RGBLED_NUM <= 6

diff --git a/keyboards/jian/rev1/info.json b/keyboards/jian/rev1/info.json
@@ -12,6 +12,9 @@
         "pin": "B6",
         "levels": 5
     },
+    "rgblight": {
+        "split": true
+    },
     "ws2812": {
         "pin": "D4"
     },

diff --git a/keyboards/jian/rev2/config.h b/keyboards/jian/rev2/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_SPLIT
 
 #ifndef IOS_DEVICE_ENABLE
 #if RGBLED_NUM <= 6

diff --git a/keyboards/jian/rev2/info.json b/keyboards/jian/rev2/info.json
@@ -12,6 +12,9 @@
         "pin": "C6",
         "levels": 5
     },
+    "rgblight": {
+        "split": true
+    },
     "ws2812": {
         "pin": "D4"
     },

diff --git a/keyboards/jiran/rev2/config.h b/keyboards/jiran/rev2/config.h
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 56
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
@@ -16,7 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define RGBLIGHT_SPLIT 1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
@@ -19,6 +19,9 @@
     "split": {
         "soft_serial_pin": "D0"
     },
+    "rgblight": {
+        "split": true
+    },
     "ws2812": {
         "pin": "F0"
     },

diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
@@ -6,7 +6,6 @@
 #define MASTER_LEFT
 
 #define RGBLED_NUM 88
-#define RGBLIGHT_SPLIT
 
 #define RGB_MATRIX_LED_COUNT 88
 #define RGB_MATRIX_SPLIT { 44, 44 }

diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h
@@ -18,7 +18,6 @@
 
 #ifdef RGBLIGHT_ENABLE
 #   define RGBLED_NUM 60  // Total number of LEDs
-#   define RGBLIGHT_SPLIT
 #endif
 
 // Limit the power draw

diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h
@@ -21,5 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBLED_NUM 72    // Number of LEDs
-
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/lily58/light/config.h b/keyboards/lily58/light/config.h
@@ -21,4 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBLED_NUM 70
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SELECT_SOFT_SERIAL_SPEED 1
 
 #    define RGBLED_NUM 68
-#    define RGBLIGHT_SPLIT
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    ifndef IOS_DEVICE_ENABLE

diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -9,7 +9,6 @@
 
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-#define RGBLIGHT_SPLIT
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
 #define SPLIT_MODS_ENABLE

diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
@@ -9,7 +9,6 @@
 
 #define MASTER_LEFT
 //#define MASTER_RIGHT
-#define RGBLIGHT_SPLIT
 #define SPLIT_LAYER_STATE_ENABLE
 #define SPLIT_LED_STATE_ENABLE
 #define SPLIT_MODS_ENABLE

diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
@@ -20,7 +20,6 @@
 #define MASTER_LEFT
 #define SPLIT_MODS_ENABLE
 
-#define RGBLIGHT_SPLIT
 #define RGBLED_NUM 83
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM

diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
@@ -20,7 +20,6 @@
 #define MASTER_LEFT
 #define SPLIT_MODS_ENABLE
 
-#define RGBLIGHT_SPLIT
 #define RGBLED_NUM 100
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM

diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define USE_I2C
 
    #define RGBLED_NUM 10
-   #define RGBLIGHT_SPLIT
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8

diff --git a/keyboards/mint60/config.h b/keyboards/mint60/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 8
-#define RGBLIGHT_SPLIT
 
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17

diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
@@ -16,6 +16,9 @@
   "split": {
     "soft_serial_pin": "D2"
   },
+  "rgblight": {
+    "split": true
+  },
   "ws2812": {
     "pin": "D3"
   },

diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
@@ -24,7 +24,6 @@
 #define SERIAL_USART_SPEED 921600
 
 #ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_LAYERS
 
 #define RGBLIGHT_DEFAULT_HUE 213

diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
@@ -26,7 +26,6 @@
 
 
 #ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_SPLIT
 #define RGBLIGHT_LAYERS
 #define RGBLED_NUM 16
 #define RGBLIGHT_EFFECT_BREATHING

diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 20
-#define RGBLIGHT_SPLIT
 
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/

diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h
@@ -40,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 24
-#define RGBLIGHT_SPLIT
 
 #define SELECT_SOFT_SERIAL_SPEED 1
 /*Sets the protocol speed when using serial communication*/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@
		#pragma once

		#define RGBLED_NUM 12
		#define RGBLIGHT_SPLIT
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.


		#define RGBLED_NUM 57
		#define RGBLIGHT_SPLIT

		#define DEBUG_LED_PIN C13

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,5 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
		#pragma once

		#define RGBLED_NUM 72 // Number of LEDs

		#define RGBLIGHT_SPLIT
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,4 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
		#pragma once

		#define RGBLED_NUM 70
		#define RGBLIGHT_SPLIT