Squashed commit of the following:

commit 4c60ebd Merge: 806b61c 2322819 Author: QMK Bot <[email protected]> Date: Fri Jun 9 01:46:47 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 2322819 Author: Jack Humbert <[email protected]> Date: Thu Jun 8 21:46:09 2023 -0400 Adds Planck Rev 7 & Updates rev6_drop to Matrix Lite Implementation (qmk#21175) * adds planck/rev7 * Remove config.h include Co-authored-by: Drashna Jaelre <[email protected]> * convert planck matrices to lite implementation --------- Co-authored-by: Drashna Jaelre <[email protected]> commit 806b61c Author: Xelus22 <[email protected]> Date: Fri Jun 9 10:00:22 2023 +1000 [Core] RGB matrix ws2812 update (qmk#21135) * ws2812_update boolean to stop update every single cycle * lint1 Co-authored-by: Joel Challis <[email protected]> * lint2 Co-authored-by: Joel Challis <[email protected]> * Update quantum/rgb_matrix/rgb_matrix_drivers.c --------- Co-authored-by: Joel Challis <[email protected]> commit 760a976 Merge: f861695 a9f677b Author: QMK Bot <[email protected]> Date: Thu Jun 8 20:08:49 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit a9f677b Author: Ryan <[email protected]> Date: Fri Jun 9 06:08:02 2023 +1000 Slightly refine `g_led_config` parsing (qmk#21170) commit f861695 Merge: d1d0925 4c6c387 Author: QMK Bot <[email protected]> Date: Thu Jun 8 09:11:17 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 4c6c387 Author: Albert Y <[email protected]> Date: Thu Jun 8 17:10:30 2023 +0800 Add an emphasis on QMK MSYS terminal (qmk#21168) * Add an emphasis on QMK MSYS terminal Not using MSYS terminal is a frequent user error. This change adds an additional statement to guide users to run the first command in MSYS itself. Edited the same statement for consistency in the other OSes. * Update instructions for the other operating systems commit d1d0925 Author: Xelus22 <[email protected]> Date: Thu Jun 8 11:58:53 2023 +1000 [Core] Optimisation - Add RGB LED colour set check in drivers (qmk#21134) commit 9a6056d Merge: cc64247 d042b92 Author: QMK Bot <[email protected]> Date: Thu Jun 8 01:47:47 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit d042b92 Author: NortonTech <[email protected]> Date: Wed Jun 7 19:47:06 2023 -0600 Add NortonTech handwired keypad (NortonTechPad) (qmk#21148) commit cc64247 Merge: 90ea9e4 f136171 Author: QMK Bot <[email protected]> Date: Thu Jun 8 01:03:58 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit f136171 Author: biuboom-jun <[email protected]> Date: Thu Jun 8 09:03:17 2023 +0800 add kibou/wendy (qmk#21150) commit 90ea9e4 Author: dexter93 <[email protected]> Date: Thu Jun 8 04:01:45 2023 +0300 Reset `matrix_need_update` properly in eager debouncing algorithms (qmk#21154) The `matrix_need_update` variable needs to be reset to `false` in `transfer_matrix_values()`, otherwise that function continues to be invoked for every scanning loop (forever with `sym_eager_pk` and `sym_eager_pk`, or until some key gets released with `asym_eager_defer_pk`), and the scanning rate gets much lower because of all that useless work. Co-authored-by: Sergey Vlasov <[email protected]> commit a059d12 Merge: 3fa92a4 dffbe1e Author: QMK Bot <[email protected]> Date: Wed Jun 7 23:57:41 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit dffbe1e Author: James Young <[email protected]> Date: Wed Jun 7 16:57:05 2023 -0700 monoflex60: fix LAYOUT_60_iso_tsangan implementation (qmk#21158) commit 3fa92a4 Merge: 5427494 57c5f3e Author: QMK Bot <[email protected]> Date: Wed Jun 7 23:56:53 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 57c5f3e Author: James Young <[email protected]> Date: Wed Jun 7 16:55:49 2023 -0700 poker87d: correct layout data (qmk#21159) commit 5427494 Merge: fd1e638 ae0342c Author: QMK Bot <[email protected]> Date: Wed Jun 7 23:00:02 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit ae0342c Author: Pablo Martínez <[email protected]> Date: Thu Jun 8 00:59:13 2023 +0200 [Bugfix] LVGL bindings wrong offset math (qmk#21147) commit fd1e638 Author: Albert Y <[email protected]> Date: Thu Jun 8 04:12:49 2023 +0800 Use unsigned integer for mousekey kinetic speed (qmk#21151) commit a02230f Merge: ff1d7d2 bb57aa2 Author: QMK Bot <[email protected]> Date: Tue Jun 6 21:55:10 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit bb57aa2 Author: James Young <[email protected]> Date: Tue Jun 6 14:54:31 2023 -0700 peej/tripel: correct layout data (qmk#21145) Corrects the layout data for all three versions of the Peej Tripel. commit ff1d7d2 Merge: 64eb985 45d0608 Author: QMK Bot <[email protected]> Date: Tue Jun 6 21:46:52 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 45d0608 Author: James Young <[email protected]> Date: Tue Jun 6 14:46:15 2023 -0700 xelus/rs108: correct layout data (qmk#21146) commit 64eb985 Merge: 6c9c948 dd9712c Author: QMK Bot <[email protected]> Date: Tue Jun 6 07:04:38 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit dd9712c Author: Travis Mick <[email protected]> Date: Tue Jun 6 01:03:57 2023 -0600 [Keyboard] Add egg58 (qmk#21021) commit 6c9c948 Merge: f61abde 97014f0 Author: QMK Bot <[email protected]> Date: Tue Jun 6 05:46:59 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 97014f0 Author: Joe Scotto <[email protected]> Date: Tue Jun 6 01:46:21 2023 -0400 [Keyboard] Add Scotto36 handwired keyboard (qmk#21104) Co-authored-by: Albert Y <[email protected]> commit f61abde Merge: 5b3e41c eaef139 Author: QMK Bot <[email protected]> Date: Tue Jun 6 05:43:14 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit eaef139 Author: Joe Scotto <[email protected]> Date: Tue Jun 6 01:42:27 2023 -0400 [Keyboard] Add Scotto40 handwired keyboard (qmk#21103) commit 5b3e41c Merge: b0c483b e1c4b7c Author: QMK Bot <[email protected]> Date: Tue Jun 6 05:35:05 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit e1c4b7c Author: Joe Scotto <[email protected]> Date: Tue Jun 6 01:34:28 2023 -0400 [Keyboard] Add ScottoStarter handwired keyboard (qmk#21101) commit b0c483b Merge: 4c928b0 43ce7b0 Author: QMK Bot <[email protected]> Date: Tue Jun 6 05:18:16 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 43ce7b0 Author: Albert Y <[email protected]> Date: Tue Jun 6 13:17:39 2023 +0800 [Docs] Highlight keymap name entry (qmk#21138) commit 4c928b0 Merge: c9cf971 9167e66 Author: QMK Bot <[email protected]> Date: Tue Jun 6 05:14:31 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 9167e66 Author: FanXingStudio <[email protected]> Date: Tue Jun 6 13:13:47 2023 +0800 [Keyboard] add kibou/harbour (qmk#21131) commit c9cf971 Author: Ryan <[email protected]> Date: Tue Jun 6 11:08:04 2023 +1000 Move `RGBLED_SPLIT` to data driven (qmk#21113) Co-authored-by: Joel Challis <[email protected]> commit f91ca76 Merge: 3617cbd 04812e9 Author: QMK Bot <[email protected]> Date: Mon Jun 5 20:43:42 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 04812e9 Author: Jeayo Keh <[email protected]> Date: Tue Jun 6 04:43:02 2023 +0800 [Keyboard] Add soda/mango (qmk#21100) Co-authored-by: jack <[email protected]> Co-authored-by: Joel Challis <[email protected]> commit 3617cbd Merge: 83a726c 8f108d1 Author: QMK Bot <[email protected]> Date: Mon Jun 5 20:35:00 2023 +0000 Merge remote-tracking branch 'origin/master' into develop commit 8f108d1 Author: Will Hedges <[email protected]> Date: Mon Jun 5 15:34:22 2023 -0500 [Keyboard] Upddate bioi/G60BLE to use bluetooth (qmk#21120) Co-authored-by: jack <[email protected]>
freznel10 · Jun 9, 2023 · 1aabcfd · 1aabcfd
1 parent 2667e2c
commit 1aabcfd
Show file tree

Hide file tree

Showing 335 changed files with 3,861 additions and 418 deletions.
diff --git a/docs/newbs_building_firmware_workflow.md b/docs/newbs_building_firmware_workflow.md
@@ -85,6 +85,8 @@ Visit the [QMK Configurator](https://config.qmk.fm/#/) to create a keymap file:
 3. Customise the key layout according to your preference.
 4. Select download next to **KEYMAP.JSON** and save the JSON file into the `~/qmk_keymap/` folder.
 
+!> **Important:** Make sure that the GitHub username you use in step 2 is correct. If it is not, the build process will fail to locate your files in the right folder.
+
 ### Add a GitHub Action workflow
 
 Open the file `~/qmk_keymap/.github/workflows/build.yml` with your favorite [text editor](newbs_learn_more_resources.md#text-editor-resources), paste the following workflow content, and save it:

diff --git a/docs/newbs_getting_started.md b/docs/newbs_getting_started.md
@@ -120,23 +120,23 @@ NOTE: remember to follow the instructions printed at the end of installation (us
 
 ### ** Windows **
 
-After installing QMK you can set it up with this command:
+Open QMK MSYS and run the following command:
 
     qmk setup
 
 In most situations you will want to answer `y` to all of the prompts.
 
 ### ** macOS **
 
-After installing QMK you can set it up with this command:
+Open Terminal and run the following command:
 
     qmk setup
 
 In most situations you will want to answer `y` to all of the prompts.
 
 ### ** Linux/WSL **
 
-After installing QMK you can set it up with this command:
+Open your preferred terminal app and run the following command:
 
     qmk setup
 
@@ -150,7 +150,7 @@ Luckily, the fix is easy. Run this as your user: `echo 'PATH="$HOME/.local/bin:$
 
 ###  ** FreeBSD **
 
-After installing QMK you can set it up with this command:
+Open your preferred terminal app and run the following command:
 
     qmk setup
 

diff --git a/drivers/led/aw20216.c b/drivers/led/aw20216.c
@@ -145,6 +145,9 @@ void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     aw_led led;
     memcpy_P(&led, (&g_aw_leds[index]), sizeof(led));
 
+    if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+        return;
+    }
     g_pwm_buffer[led.driver][led.r]          = red;
     g_pwm_buffer[led.driver][led.g]          = green;
     g_pwm_buffer[led.driver][led.b]          = blue;

diff --git a/drivers/led/ckled2001-simple.c b/drivers/led/ckled2001-simple.c
@@ -151,6 +151,9 @@ void CKLED2001_set_value(int index, uint8_t value) {
     if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
 
+        if (g_pwm_buffer[led.driver][led.v] == value) {
+            return;
+        }
         g_pwm_buffer[led.driver][led.v]          = value;
         g_pwm_buffer_update_required[led.driver] = true;
     }

diff --git a/drivers/led/ckled2001.c b/drivers/led/ckled2001.c
@@ -150,6 +150,9 @@ void CKLED2001_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_ckled2001_leds[index]), sizeof(led));
 
+        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+            return;
+        }
         g_pwm_buffer[led.driver][led.r]          = red;
         g_pwm_buffer[led.driver][led.g]          = green;
         g_pwm_buffer[led.driver][led.b]          = blue;

diff --git a/drivers/led/issi/is31fl3218.c b/drivers/led/issi/is31fl3218.c
@@ -72,6 +72,9 @@ void IS31FL3218_init(void) {
 }
 
 void IS31FL3218_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    if (g_pwm_buffer[index * 3 + 0] == red && g_pwm_buffer[index * 3 + 1] == green && g_pwm_buffer[index * 3 + 2] == blue) {
+        return;
+    }
     g_pwm_buffer[index * 3 + 0]  = red;
     g_pwm_buffer[index * 3 + 1]  = green;
     g_pwm_buffer[index * 3 + 2]  = blue;

diff --git a/drivers/led/issi/is31fl3731-simple.c b/drivers/led/issi/is31fl3731-simple.c
@@ -196,6 +196,10 @@ void IS31FL3731_set_value(int index, uint8_t value) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
         // Subtract 0x24 to get the second index of g_pwm_buffer
+
+        if (g_pwm_buffer[led.driver][led.v - 0x24] == value) {
+            return;
+        }
         g_pwm_buffer[led.driver][led.v - 0x24]   = value;
         g_pwm_buffer_update_required[led.driver] = true;
     }

diff --git a/drivers/led/issi/is31fl3731.c b/drivers/led/issi/is31fl3731.c
@@ -184,6 +184,9 @@ void IS31FL3731_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
         // Subtract 0x24 to get the second index of g_pwm_buffer
+        if (g_pwm_buffer[led.driver][led.r - 0x24] == red && g_pwm_buffer[led.driver][led.g - 0x24] == green && g_pwm_buffer[led.driver][led.b - 0x24] == blue) {
+            return;
+        }
         g_pwm_buffer[led.driver][led.r - 0x24]   = red;
         g_pwm_buffer[led.driver][led.g - 0x24]   = green;
         g_pwm_buffer[led.driver][led.b - 0x24]   = blue;

diff --git a/drivers/led/issi/is31fl3733-simple.c b/drivers/led/issi/is31fl3733-simple.c
@@ -196,6 +196,9 @@ void IS31FL3733_set_value(int index, uint8_t value) {
     if (index >= 0 && index < LED_MATRIX_LED_COUNT) {
         is31_led led = g_is31_leds[index];
 
+        if (g_pwm_buffer[led.driver][led.v] == value) {
+            return;
+        }
         g_pwm_buffer[led.driver][led.v]          = value;
         g_pwm_buffer_update_required[led.driver] = true;
     }

diff --git a/drivers/led/issi/is31fl3733.c b/drivers/led/issi/is31fl3733.c
@@ -189,6 +189,9 @@ void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
+        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+            return;
+        }
         g_pwm_buffer[led.driver][led.r]          = red;
         g_pwm_buffer[led.driver][led.g]          = green;
         g_pwm_buffer[led.driver][led.b]          = blue;

diff --git a/drivers/led/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c
@@ -169,6 +169,9 @@ void IS31FL3736_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
+        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+            return;
+        }
         g_pwm_buffer[led.driver][led.r]          = red;
         g_pwm_buffer[led.driver][led.g]          = green;
         g_pwm_buffer[led.driver][led.b]          = blue;

diff --git a/drivers/led/issi/is31fl3737.c b/drivers/led/issi/is31fl3737.c
@@ -176,6 +176,9 @@ void IS31FL3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
+        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+            return;
+        }
         g_pwm_buffer[led.driver][led.r]          = red;
         g_pwm_buffer[led.driver][led.g]          = green;
         g_pwm_buffer[led.driver][led.b]          = blue;

diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
@@ -180,10 +180,13 @@ void IS31FL3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
     if (index >= 0 && index < RGB_MATRIX_LED_COUNT) {
         memcpy_P(&led, (&g_is31_leds[index]), sizeof(led));
 
+        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+            return;
+        }
+        g_pwm_buffer_update_required[led.driver] = true;
         g_pwm_buffer[led.driver][led.r]          = red;
         g_pwm_buffer[led.driver][led.g]          = green;
         g_pwm_buffer[led.driver][led.b]          = blue;
-        g_pwm_buffer_update_required[led.driver] = true;
     }
 }
 

diff --git a/drivers/led/issi/is31flcommon.c b/drivers/led/issi/is31flcommon.c
@@ -139,13 +139,19 @@ void IS31FL_set_manual_scaling_buffer(void) {
         if (scale.driver >= 0 && scale.driver < RGB_MATRIX_LED_COUNT) {
             is31_led led = g_is31_leds[scale.driver];
 
+            if (g_scaling_buffer[led.driver][led.r] = scale.r && g_scaling_buffer[led.driver][led.g] = scale.g && g_scaling_buffer[led.driver][led.b] = scale.b) {
+                return;
+            }
             g_scaling_buffer[led.driver][led.r] = scale.r;
             g_scaling_buffer[led.driver][led.g] = scale.g;
             g_scaling_buffer[led.driver][led.b] = scale.b;
 #    elif defined(LED_MATRIX_ENABLE)
         if (scale.driver >= 0 && scale.driver < LED_MATRIX_LED_COUNT) {
             is31_led led = g_is31_leds[scale.driver];
 
+            if (g_scaling_buffer[led.driver][led.v] == scale.v) {
+                return;
+            }
             g_scaling_buffer[led.driver][led.v] = scale.v;
 #    endif
             g_scaling_buffer_update_required[led.driver] = true;

diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 68
 #define RGBLIGHT_SPLIT
-#define RGBLED_SPLIT { 34, 34 }
 #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
@@ -12,7 +12,8 @@
         "pin": "B5"
     },
     "rgblight": {
-        "max_brightness": 170
+        "max_brightness": 170,
+        "split_count": [34, 34]
     },
     "rgb_matrix": {
         "driver": "WS2812"

diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define RGBLED_NUM 50    // Number of LEDs
-#define RGBLED_SPLIT {25, 25}
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
@@ -16,6 +16,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "split_count": [25, 25]
+    },
     "ws2812": {
         "pin": "D3"
     },

diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h
@@ -4,5 +4,4 @@
 #pragma once
 
 #define RGBLED_NUM 12
-#define RGBLED_SPLIT { 6, 6 }
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
@@ -18,6 +18,9 @@
             {"pin_a": "B5", "pin_b": "F4", "resolution": 2}
         ]
     },
+    "rgblight": {
+        "split_count": [6, 6]
+    },
     "ws2812": {
         "pin": "D3"
     },

diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h
@@ -4,5 +4,4 @@
 #pragma once
 
 #define RGBLED_NUM 12
-#define RGBLED_SPLIT { 7, 7 }
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
@@ -21,6 +21,9 @@
     "split": {
         "soft_serial_pin": "D2"
     },
+    "rgblight": {
+        "split_count": [7, 7]
+    },
     "ws2812": {
         "pin": "D3"
     },

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 RGBLED_SPLIT { 32, 32 }
 #    define RGBLIGHT_SPLIT
 #    define RGBLIGHT_HUE_STEP  10    
 #    define RGBLIGHT_SAT_STEP  17    

diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
@@ -25,7 +25,8 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 100
+        "max_brightness": 100,
+        "split_count": [32, 32]
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",

diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* RGB LED */
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 69    // Number of LEDs. backlight x69
-#define RGBLED_SPLIT { 34, 35 }
 #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
@@ -20,7 +20,8 @@
         "pin": "D3"
     },
     "rgblight": {
-        "max_brightness": 120
+        "max_brightness": 120,
+        "split_count": [34, 35]
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",

diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -43,14 +43,12 @@
 
 /* RGB settings. */
 #define RGBLED_NUM 36
-#define RGBLED_SPLIT \
-    { 18, 18 }
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_SPLIT { 18, 18 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED

diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -15,6 +15,9 @@
     "split": {
         "soft_serial_pin": "GP1"
     },
+    "rgblight": {
+        "split_count": [18, 18]
+    },
     "ws2812": {
         "pin": "GP0",
         "driver": "vendor"

diff --git a/keyboards/bastardkb/scylla/config.h b/keyboards/bastardkb/scylla/config.h
@@ -20,14 +20,12 @@
 
 /* RGB settings. */
 #define RGBLED_NUM 58
-#define RGBLED_SPLIT \
-    { 29, 29 }
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_SPLIT { 29, 29 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED

diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "pid": "0x1829"
     },
+    "rgblight": {
+        "split_count": [29, 29]
+    },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [

diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
@@ -20,14 +20,12 @@
 
 /* RGB settings. */
 #define RGBLED_NUM 36
-#define RGBLED_SPLIT \
-    { 18, 18 }
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_SPLIT { 18, 18 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED

diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
@@ -3,6 +3,9 @@
     "usb": {
         "pid": "0x1830"
     },
+    "rgblight": {
+        "split_count": [18, 18]
+    },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {

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 RGBLED_SPLIT { 19, 19 }
 #define RGBLIGHT_SPLIT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD

diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
@@ -5,6 +5,9 @@
         "device_version": "0.0.1",
         "pid": "0x1828"
     },
+    "rgblight": {
+        "split_count": [19, 19]
+    },
     "ws2812": {
         "pin": "D2"
     },

diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
@@ -20,14 +20,12 @@
 
 /* RGB settings. */
 #define RGBLED_NUM 42
-#define RGBLED_SPLIT \
-    { 21, 21 }
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
 #    define SPLIT_TRANSPORT_MIRROR
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_SPLIT { 21, 21 }
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED