b9e81c06911a4e3345acf09cd499a9661eea67b8

Message

Update keyboard LED driver configs (#22638)

Diff

This diff is truncated to protect this page.

  1diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
  2index b1ce09d34946a055ac5ba96ee27bb1e59a8d1048..d803fcf101e4ccd32b8884050a3b346db48bfd65 100644
  3--- a/docs/feature_led_matrix.md
  4+++ b/docs/feature_led_matrix.md
  5@@ -54,7 +54,7 @@ For split keyboards using `LED_MATRIX_SPLIT` with an LED driver, you can either
  6 Define these arrays listing all the LEDs in your `<keyboard>.c`:
  7 
  8 ```c
  9-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
 10+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 11 /* Refer to IS31 manual for these locations
 12  *    driver
 13  *    |  LED address
 14diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
 15index 824ff50648a2b95e8f2fa11e2a1bdc99add3a701..53e387ee7092745eda62822c6502c09e9c4be023 100644
 16--- a/docs/feature_rgb_matrix.md
 17+++ b/docs/feature_rgb_matrix.md
 18@@ -55,7 +55,7 @@ For split keyboards using `RGB_MATRIX_SPLIT` with an LED driver, you can either
 19 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 20 
 21 ```c
 22-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
 23+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
 24 /* Refer to IS31 manual for these locations
 25  *   driver
 26  *   |  R location
 27@@ -139,7 +139,7 @@ Currently only 4 drivers are supported, but it would be trivial to support all 8
 28 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 29 
 30 ```c
 31-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
 32+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 33 /* Refer to IS31 manual for these locations
 34  *   driver
 35  *   |  R location
 36@@ -218,7 +218,7 @@ Here is an example using 2 drivers.
 37 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 38 
 39 ```c
 40-const is31fl3736_led_t PROGMEM g_is31fl3736_leds[RGB_MATRIX_LED_COUNT] = {
 41+const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
 42 /* Refer to IS31 manual for these locations
 43  *   driver
 44  *   |  R location
 45@@ -292,7 +292,7 @@ Here is an example using 2 drivers.
 46 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 47 
 48 ```c
 49-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
 50+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
 51 /* Refer to IS31 manual for these locations
 52  *   driver
 53  *   |  R location
 54@@ -501,7 +501,7 @@ Here is an example using 2 drivers.
 55 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 56 
 57 ```c
 58-const aw20216s_led_t PROGMEM g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
 59+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 60 /* Each AW20216S channel is controlled by a register at some offset between 0x00
 61  * and 0xD7 inclusive.
 62  * See drivers/led/aw20216s.h for the mapping between register offsets and
 63diff --git a/drivers/led/issi/is31fl3218-simple.c b/drivers/led/issi/is31fl3218-simple.c
 64index e58b7d8bc0a06f73a42babc28fbd3cd87752e6bc..d9faa8677db8e556e2f79f2edbff9948d84c5da2 100644
 65--- a/drivers/led/issi/is31fl3218-simple.c
 66+++ b/drivers/led/issi/is31fl3218-simple.c
 67@@ -13,7 +13,7 @@
 68  * You should have received a copy of the GNU General Public License
 69  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 70  */
 71-#include "is31fl3218.h"
 72+#include "is31fl3218-simple.h"
 73 #include <string.h>
 74 #include "i2c_master.h"
 75 
 76diff --git a/drivers/led/issi/is31fl3733-simple.c b/drivers/led/issi/is31fl3733-simple.c
 77index 805905ebc23837d7d6265db55bd211938c6aae20..889d9ef389c7df0e0397c9d0d7c7a08b315f0824 100644
 78--- a/drivers/led/issi/is31fl3733-simple.c
 79+++ b/drivers/led/issi/is31fl3733-simple.c
 80@@ -43,7 +43,7 @@
 81 #endif
 82 
 83 #ifndef IS31FL3733_CS_PULLDOWN
 84-#    define IS31FL3733_CSPULLDOWN IS31FL3733_PDR_0_OHM
 85+#    define IS31FL3733_CS_PULLDOWN IS31FL3733_PDR_0_OHM
 86 #endif
 87 
 88 #ifndef IS31FL3733_GLOBAL_CURRENT
 89diff --git a/drivers/led/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c
 90index 384b815850f8a74fd1d8a1f89ff99392d35af5d6..0d7b08e7e8817ccb54313d4912c8b623a1c82942 100644
 91--- a/drivers/led/issi/is31fl3736.c
 92+++ b/drivers/led/issi/is31fl3736.c
 93@@ -139,7 +139,7 @@ void is31fl3736_init(uint8_t addr) {
 94     // Set up the mode and other settings, clear the PWM registers,
 95     // then disable software shutdown.
 96 
 97-    is31fl3736_select_page(addr, IS31FL3736_REG_LED_CONTROL);
 98+    is31fl3736_select_page(addr, IS31FL3736_COMMAND_LED_CONTROL);
 99 
100     // Turn off all LEDs.
101     for (int i = 0; i < IS31FL3736_LED_CONTROL_REGISTER_COUNT; i++) {
102diff --git a/drivers/led/issi/is31fl3741-simple.c b/drivers/led/issi/is31fl3741-simple.c
103index db245af4dad62b593cd89870e58abaea8765b890..3e9b3d8b25273d4efad7836d40a447efff4078a5 100644
104--- a/drivers/led/issi/is31fl3741-simple.c
105+++ b/drivers/led/issi/is31fl3741-simple.c
106@@ -23,6 +23,7 @@
107 #include "wait.h"
108 
109 #define IS31FL3741_PWM_REGISTER_COUNT 351
110+#define IS31FL3741_SCALING_REGISTER_COUNT 351
111 
112 #ifndef IS31FL3741_I2C_TIMEOUT
113 #    define IS31FL3741_I2C_TIMEOUT 100
114@@ -64,7 +65,7 @@ uint8_t g_pwm_buffer[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
115 bool    g_pwm_buffer_update_required[IS31FL3741_DRIVER_COUNT]        = {false};
116 bool    g_scaling_registers_update_required[IS31FL3741_DRIVER_COUNT] = {false};
117 
118-uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
119+uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_SCALING_REGISTER_COUNT];
120 
121 void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
122     i2c_transfer_buffer[0] = reg;
123diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
124index 0575f312541f723db422425b049a3694702b6e9a..08b86f917167a10de6180e98ab439ee862e496c3 100644
125--- a/drivers/led/issi/is31fl3741.c
126+++ b/drivers/led/issi/is31fl3741.c
127@@ -23,6 +23,7 @@
128 #include "wait.h"
129 
130 #define IS31FL3741_PWM_REGISTER_COUNT 351
131+#define IS31FL3741_SCALING_REGISTER_COUNT 351
132 
133 #ifndef IS31FL3741_I2C_TIMEOUT
134 #    define IS31FL3741_I2C_TIMEOUT 100
135@@ -64,7 +65,7 @@ uint8_t g_pwm_buffer[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
136 bool    g_pwm_buffer_update_required[IS31FL3741_DRIVER_COUNT]        = {false};
137 bool    g_scaling_registers_update_required[IS31FL3741_DRIVER_COUNT] = {false};
138 
139-uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_PWM_REGISTER_COUNT];
140+uint8_t g_scaling_registers[IS31FL3741_DRIVER_COUNT][IS31FL3741_SCALING_REGISTER_COUNT];
141 
142 void is31fl3741_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
143     i2c_transfer_buffer[0] = reg;
144diff --git a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
145index e3b8d71a904221e4a9d4f0a7cde7115b92912669..55af271f3b1d94007c3ff978a7ca5bdfaaa3dc99 100644
146--- a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
147+++ b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
148@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
149 #include "rev_a.h"
150 
151 #ifdef RGB_MATRIX_ENABLE
152-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
153+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
154     { 0, K_2,  J_2,  L_2 }, //D402
155     { 0, K_3,  J_3,  L_3 }, //D403
156     { 0, K_4,  J_4,  L_4 }, //D404
157diff --git a/keyboards/abko/ak84bt/ak84bt.c b/keyboards/abko/ak84bt/ak84bt.c
158index a51f1f458f6aa76339a69d9abcab48ef97f13fc6..86f28a1bb2939a9d3b470e48623628efe0a7814c 100644
159--- a/keyboards/abko/ak84bt/ak84bt.c
160+++ b/keyboards/abko/ak84bt/ak84bt.c
161@@ -16,7 +16,7 @@
162 
163 #include QMK_KEYBOARD_H
164 
165-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
166+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
167     {0, G_1,    I_1,    H_1},
168     {0, G_3,    I_3,    H_3},
169     {0, G_4,    I_4,    H_4},
170diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.c b/keyboards/acheron/apollo/87h/gamma/gamma.c
171index 19e91062873ea4c533fc19662b3f0195e29b2525..43802bb4ad82090f2765be71dd1d82e6756a7a35 100644
172--- a/keyboards/acheron/apollo/87h/gamma/gamma.c
173+++ b/keyboards/acheron/apollo/87h/gamma/gamma.c
174@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
175 #include "quantum.h"
176 
177 #ifdef RGB_MATRIX_ENABLE
178-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
179+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
180 /* Refer to IS31 manual for these locations
181  *   driver
182  *   |  R location
183diff --git a/keyboards/akko/5087/5087.c b/keyboards/akko/5087/5087.c
184index 4d6cf949009eb79db24121c21d61529ed90beb5d..6374adc301ef44ff05e45bb69d3cfbc38dcafca2 100644
185--- a/keyboards/akko/5087/5087.c
186+++ b/keyboards/akko/5087/5087.c
187@@ -17,7 +17,7 @@
188 #include "quantum.h"
189 // clang-format off
190 #ifdef RGB_MATRIX_ENABLE
191-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
192+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
193 /* Refer to IS31 manual for these locations
194  *   driver
195  *   |  R location
196diff --git a/keyboards/akko/5108/5108.c b/keyboards/akko/5108/5108.c
197index 91f53e1e550d7eaa1fd7c1770e3f1ec16c580331..0fd71834d1924a0322c437a1a3d82a3491d9dd9b 100644
198--- a/keyboards/akko/5108/5108.c
199+++ b/keyboards/akko/5108/5108.c
200@@ -17,7 +17,7 @@
201 #include "quantum.h"
202 // clang-format off
203 #ifdef RGB_MATRIX_ENABLE
204-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
205+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
206 /* Refer to SNLED27351 manual for these locations
207  *   driver
208  *   |  R location
209diff --git a/keyboards/akko/acr87/acr87.c b/keyboards/akko/acr87/acr87.c
210index 7ee9ec6470c64ccd07e7f1b74422281f8e249e2b..3e7f60347419b2ff92ae0c95d4838c4a1a0bacec 100644
211--- a/keyboards/akko/acr87/acr87.c
212+++ b/keyboards/akko/acr87/acr87.c
213@@ -17,7 +17,7 @@
214 #include "quantum.h"
215 // clang-format off
216 #ifdef RGB_MATRIX_ENABLE
217-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
218+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
219 /* Refer to SNLED27351 manual for these locations
220  *   driver
221  *   |  R location
222diff --git a/keyboards/akko/top40/top40.c b/keyboards/akko/top40/top40.c
223index 028e4bdd057b3933f90c9e44d3b4a7037709892a..2d75b774972ef4f2f888ec2fb18e6671e876ffef 100644
224--- a/keyboards/akko/top40/top40.c
225+++ b/keyboards/akko/top40/top40.c
226@@ -17,7 +17,7 @@
227 #include "quantum.h"
228 // clang-format off
229 #ifdef RGB_MATRIX_ENABLE
230-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
231+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
232 /* Refer to SNLED27351 manual for these locations
233  *   driver
234  *   |  R location
235diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
236index 527bec17ee16e85d60c86f9d1306fdda66d6e2d7..dd65a16a80af4c0268a19cc46aed22073ca0c4b5 100644
237--- a/keyboards/axolstudio/yeti/hotswap/hotswap.c
238+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
239@@ -17,7 +17,7 @@
240 #include "quantum.h"
241 
242 #ifdef RGB_MATRIX_ENABLE
243-const is31fl3733_led_t g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
244+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
245     { 0, B_1,  A_1,  C_1 },
246     { 0, B_2,  A_2,  C_2 },
247     { 0, B_3,  A_3,  C_3 },
248diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/canary60rgb.c
249index 065268c5318a696a7fcdf2a0f973c7dbc4634bf8..55569f5049214928a8aecc95a24dae9d56027bfd 100644
250--- a/keyboards/canary/canary60rgb/canary60rgb.c
251+++ b/keyboards/canary/canary60rgb/canary60rgb.c
252@@ -16,7 +16,7 @@
253  #include "quantum.h"
254 
255 #ifdef RGB_MATRIX_ENABLE
256-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
257+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
258     { 0, J_14, K_14,  L_14 },
259     { 0, J_13, K_13,  L_13 },
260     { 0, J_12, K_12,  L_12 },
261diff --git a/keyboards/chosfox/cf81/cf81.c b/keyboards/chosfox/cf81/cf81.c
262index ad7ec9bc553e64eaa5df8e20e5620ca7bc06c172..b864a56bc651d9e59cf8b3c587abfeabe48fe777 100644
263--- a/keyboards/chosfox/cf81/cf81.c
264+++ b/keyboards/chosfox/cf81/cf81.c
265@@ -18,7 +18,7 @@
266 
267 // clang-format off
268 #ifdef RGB_MATRIX_ENABLE
269-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
270+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
271 /* Refer to SNLED27351 manual for these locations
272  *   driver
273  *   |  R location
274diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.c b/keyboards/clueboard/66_hotswap/gen1/gen1.c
275index 7af0b964da5e3712016cc28ea808d072445a3c00..e13a05de054f9422a7fdfcde39b8854ec4c7805f 100644
276--- a/keyboards/clueboard/66_hotswap/gen1/gen1.c
277+++ b/keyboards/clueboard/66_hotswap/gen1/gen1.c
278@@ -16,7 +16,7 @@
279 #include "quantum.h"
280 
281 #ifdef LED_MATRIX_ENABLE
282-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[LED_MATRIX_LED_COUNT] = {
283+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
284 /* Refer to IS31 manual for these locations
285  *    driver
286  *    |  LED address
287diff --git a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
288index e78de78bf80bf131672b5e3259c518bd8a3bd8a0..550520e790a81676c26ac1dcdf203f8a1c3d8a5a 100644
289--- a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
290+++ b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
291@@ -18,7 +18,7 @@
292 
293 #ifdef RGB_MATRIX_ENABLE
294 
295-const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
296+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
297 /* Refer to IS31 manual for these locations
298  *   driver
299  *   |     R location
300diff --git a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
301index 0ce0799e14cb0a83a7e664d2f57dc5d8366dc449..22d10488d2d21d528200787b22906689f19e27b4 100644
302--- a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
303+++ b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
304@@ -18,7 +18,7 @@
305 
306 #ifdef RGB_MATRIX_ENABLE
307 
308-const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
309+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
310 /* Refer to IS31 manual for these locations
311  *   driver
312  *   |     R location
313diff --git a/keyboards/dp60/dp60.c b/keyboards/dp60/dp60.c
314index 588acd591d1030524640434c36aac4770dbdb1fc..5f23b355424b4498def3c8798e35c0a4bd3456e9 100644
315--- a/keyboards/dp60/dp60.c
316+++ b/keyboards/dp60/dp60.c
317@@ -17,7 +17,7 @@
318 #include "quantum.h"
319 
320 #ifdef RGB_MATRIX_ENABLE
321-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
322+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
323 /* Refer to IS31 manual for these locations
324  *   driver
325  *   |  R location
326diff --git a/keyboards/drop/alt/v2/v2.c b/keyboards/drop/alt/v2/v2.c
327index fcdad7f2df9448585f9a2847bc61c9a4702793c3..d3bb78fd12c8f7c1496435f9ad62c617e5812b6e 100644
328--- a/keyboards/drop/alt/v2/v2.c
329+++ b/keyboards/drop/alt/v2/v2.c
330@@ -3,7 +3,7 @@
331 #ifdef RGB_MATRIX_ENABLE
332 #    include "rgb_matrix.h"
333 
334-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
335+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
336      { 1, B_2, A_2, C_2 },
337      { 1, E_3, D_3, F_3 },
338      { 1, E_4, D_4, F_4 },
339diff --git a/keyboards/drop/cstm65/cstm65.c b/keyboards/drop/cstm65/cstm65.c
340index ccb86f1d3e9bbb68ffdd0654cf68bff446cafe96..1c8e6bb0bbc7d7302016bff15136c02dd7597cc9 100644
341--- a/keyboards/drop/cstm65/cstm65.c
342+++ b/keyboards/drop/cstm65/cstm65.c
343@@ -3,7 +3,7 @@
344 #ifdef RGB_MATRIX_ENABLE
345 #    include "rgb_matrix.h"
346 
347-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
348+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
349     { 0, B_1,  A_1,  C_1  },
350     { 0, B_2,  A_2,  C_2  },
351     { 0, B_3,  A_3,  C_3  },
352diff --git a/keyboards/drop/cstm80/cstm80.c b/keyboards/drop/cstm80/cstm80.c
353index 75e7049c20078d30d09da4aae35c5a29463f6953..e99c7801e58b1be894da9efa15540b4aa609d4ab 100644
354--- a/keyboards/drop/cstm80/cstm80.c
355+++ b/keyboards/drop/cstm80/cstm80.c
356@@ -3,7 +3,7 @@
357 #ifdef RGB_MATRIX_ENABLE
358 #    include "rgb_matrix.h"
359 
360-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
361+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
362     { 0, E_1,  D_1,  F_1  },
363     { 0, E_2,  D_2,  F_2  },
364     { 0, E_3,  D_3,  F_3  },
365diff --git a/keyboards/drop/ctrl/v2/v2.c b/keyboards/drop/ctrl/v2/v2.c
366index 6b565efbe1bd554bbf28fe58f2f9c25bc902fe48..0c1d8210c63456041eb52767129b92886839983a 100644
367--- a/keyboards/drop/ctrl/v2/v2.c
368+++ b/keyboards/drop/ctrl/v2/v2.c
369@@ -3,7 +3,7 @@
370 #ifdef RGB_MATRIX_ENABLE
371 #    include "rgb_matrix.h"
372 
373-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
374+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
375      { 1, B_2, A_2, C_2 },
376      { 1, E_3, D_3, F_3 },
377      { 1, E_4, D_4, F_4 },
378diff --git a/keyboards/drop/sense75/sense75.c b/keyboards/drop/sense75/sense75.c
379index 057e31074892d195ad6da0d0bf68b58a4f1a028b..bbe5a3aa4717c50734a1cfa62dd7c751a20fe20d 100644
380--- a/keyboards/drop/sense75/sense75.c
381+++ b/keyboards/drop/sense75/sense75.c
382@@ -3,7 +3,7 @@
383 #ifdef RGB_MATRIX_ENABLE
384 #    include "rgb_matrix.h"
385 
386-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
387+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
388 // top underglow sd2-sd17
389     { 0, B_2,  A_2,  C_2  },
390     { 0, B_3,  A_3,  C_3  },
391diff --git a/keyboards/drop/shift/v2/v2.c b/keyboards/drop/shift/v2/v2.c
392index 8565a0cb269b6b7cf2783ee5f261e92d9419073a..cbfbeda4294dfc3468c0fd31b2bbc7233922f9b2 100644
393--- a/keyboards/drop/shift/v2/v2.c
394+++ b/keyboards/drop/shift/v2/v2.c
395@@ -4,7 +4,7 @@
396 #    include "host.h"
397 #    include "rgb_matrix.h"
398 
399-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
400+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
401      { 0, K_1,  J_1,  L_1  },// LED1
402      { 0, K_2,  J_2,  L_2  },
403      { 0, K_3,  J_3,  L_3  },
404diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c
405index aa903c3a0a0f0225b7f68a5267a0d1fb4ee8a807..cd1f10c4f99ef332894e32fc260e24d162084827 100644
406--- a/keyboards/durgod/dgk6x/galaxy/galaxy.c
407+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c
408@@ -18,7 +18,7 @@
409 
410 #ifdef RGB_MATRIX_ENABLE
411 
412-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
413+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
414 /* Refer to IS31 manual for these locations
415  *   driver
416  *   |  R location
417diff --git a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
418index 2d1907f4dbb07f3398a5bb0f1ce3624c50c74d9d..225a7c13ddf4574c55b1fb92f3d2e66b9165f58e 100644
419--- a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
420+++ b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
421@@ -19,7 +19,7 @@
422 #ifdef RGB_MATRIX_ENABLE
423 
424 
425-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
426+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
427 /* Refer to IS31 manual for these locations
428  *   driver
429  *   |  R location
430diff --git a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
431index 42f43645f580bc4a0ba8528d7bbbe204415394d0..6dd732c454b62c52523e0f031061d9381682ab74 100644
432--- a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
433+++ b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
434@@ -19,7 +19,7 @@
435 #ifdef RGB_MATRIX_ENABLE
436 
437 
438-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
439+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
440 /* Refer to IS31 manual for these locations
441  *   driver
442  *   |  R location
443diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c
444index d48e95fb212abca8e1e703a10dc448ad8e3effb4..9de5f2e63d567a8f9822ff593b559f5fd4b976dd 100644
445--- a/keyboards/durgod/dgk6x/venus/venus.c
446+++ b/keyboards/durgod/dgk6x/venus/venus.c
447@@ -18,7 +18,7 @@
448 
449 #ifdef RGB_MATRIX_ENABLE
450 
451-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
452+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
453 /* Refer to IS31 manual for these locations
454  *   driver
455  *   |  R location
456diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
457index 826e3502ebf5102f4a608fd50f318c3dac6e621e..593b2d96ff336df88d09eb900c4c3dc1120639c6 100644
458--- a/keyboards/dztech/dz60rgb/dz60rgb.c
459+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
460@@ -1,7 +1,7 @@
461 #include "quantum.h"
462 
463 #ifdef RGB_MATRIX_ENABLE
464-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
465+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
466     { 0, K_14, J_14, L_14 },
467     { 0, K_13, J_13, L_13 },
468     { 0, K_12, J_12, L_12 },
469diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
470index 5c0692202856a94452742e804959e7094bd01dfb..a4cfd2551ecc4bc3b101042116e64402a34b79cb 100644
471--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
472+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
473@@ -1,7 +1,7 @@
474 #include "quantum.h"
475 
476 #ifdef RGB_MATRIX_ENABLE
477-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
478+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
479     { 0, K_14, J_14, L_14 },
480     { 0, K_13, J_13, L_13 },
481     { 0, K_12, J_12, L_12 },
482diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
483index d6506389a680c4e7a124bf659bef7861cb981931..4326b6f9afdd1733afdbe7b588b43065b2eaa0d2 100644
484--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
485+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
486@@ -1,7 +1,7 @@
487 #include "quantum.h"
488 
489 #ifdef RGB_MATRIX_ENABLE
490-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
491+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
492     { 0, H_15, G_15, I_15 },
493     { 0, K_14, J_14, L_14 },
494     { 0, K_13, J_13, L_13 },
495diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c
496index 561a9727e50d2856064103ef7a2ea0c7e1f0d600..09a535ab474da770b1fd503b9090b3eba11fc05d 100644
497--- a/keyboards/dztech/dz64rgb/dz64rgb.c
498+++ b/keyboards/dztech/dz64rgb/dz64rgb.c
499@@ -17,7 +17,7 @@
500 #include "quantum.h"
501 
502 #ifdef RGB_MATRIX_ENABLE
503-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
504+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
505     { 0, K_14, J_14, L_14 },
506     { 0, K_13, J_13, L_13 },
507     { 0, K_12, J_12, L_12 },
508diff --git a/keyboards/dztech/dz65rgb/v1/v1.c b/keyboards/dztech/dz65rgb/v1/v1.c
509index a0a355e1209e533ffdb2225232d0d6868afb3e70..6e8cf96e4c84207eb8fc63b5d727d049e3bc25b1 100644
510--- a/keyboards/dztech/dz65rgb/v1/v1.c
511+++ b/keyboards/dztech/dz65rgb/v1/v1.c
512@@ -16,7 +16,7 @@
513 #include "quantum.h"
514 
515 #ifdef RGB_MATRIX_ENABLE
516-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
517+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
518     { 0, C8_8,  C7_8,  C6_8 },
519     { 0, C9_8,  C7_7,  C6_7 },
520     { 0, C9_7,  C8_7,  C6_6 },
521diff --git a/keyboards/dztech/dz65rgb/v2/v2.c b/keyboards/dztech/dz65rgb/v2/v2.c
522index 7754bc4ee51182bc3e0e9a30c807ca9bc76b0666..a9f7fc104f98ff6b8e50d407d25b579960c401a4 100644
523--- a/keyboards/dztech/dz65rgb/v2/v2.c
524+++ b/keyboards/dztech/dz65rgb/v2/v2.c
525@@ -16,7 +16,7 @@
526 #include "quantum.h"
527 
528 #ifdef RGB_MATRIX_ENABLE
529-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
530+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
531     { 0, C8_8,  C7_8,  C6_8 },
532     { 0, C9_8,  C7_7,  C6_7 },
533     { 0, C9_7,  C8_7,  C6_6 },
534diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c
535index 0fb8ba49de752d5aeaeb76a8da141531db8c19a3..2055e6e3c2f6c7ec2c0e36df500fda20d90fb7ac 100755
536--- a/keyboards/dztech/dz65rgb/v3/v3.c
537+++ b/keyboards/dztech/dz65rgb/v3/v3.c
538@@ -18,7 +18,7 @@
539 
540 #ifdef RGB_MATRIX_ENABLE
541 
542-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
543+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
544     {0, CS21_SW1, CS20_SW1, CS19_SW1},
545     {0, CS21_SW2, CS20_SW2, CS19_SW2},
546     {0, CS21_SW3, CS20_SW3, CS19_SW3},
547diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c
548index 8baf0235bd2fb19532ba7ac664f5955986c04883..dd18f86bf89b5d898b488d1a24ffc8c207db1943 100644
549--- a/keyboards/dztech/tofu/ii/v1/v1.c
550+++ b/keyboards/dztech/tofu/ii/v1/v1.c
551@@ -17,7 +17,7 @@
552 
553 #ifdef RGB_MATRIX_ENABLE
554 
555-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
556+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
557     { 1, K_12, J_12, L_12 },
558     { 1, K_11, J_11, L_11 },
559     { 1, K_10, J_10, L_10 },
560diff --git a/keyboards/dztech/tofu/jr/v1/v1.c b/keyboards/dztech/tofu/jr/v1/v1.c
561index 474134cb5efb57043787a7fa51986ebce62d57e8..46b16317ac70086e49a72988a5c5168da9bd6e85 100644
562--- a/keyboards/dztech/tofu/jr/v1/v1.c
563+++ b/keyboards/dztech/tofu/jr/v1/v1.c
564@@ -18,7 +18,7 @@
565 
566 #ifdef RGB_MATRIX_ENABLE
567 
568-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
569+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
570     { 1, K_12, J_12, L_12 },
571     { 1, K_11, J_11, L_11 },
572     { 1, K_10, J_10, L_10 },
573diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
574index 455d294ef57fb22a05f960919337d5a7ac94050e..f088036c4ab73eac9fd9069043a8e53f2ad5f2e9 100644
575--- a/keyboards/ergodox_ez/ergodox_ez.c
576+++ b/keyboards/ergodox_ez/ergodox_ez.c
577@@ -243,7 +243,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
578 
579 #ifdef RGB_MATRIX_ENABLE
580 // clang-format off
581-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
582+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
583 /*   driver
584  *   |  R location
585  *   |  |      G location
586diff --git a/keyboards/evyd13/atom47/rev5/rev5.c b/keyboards/evyd13/atom47/rev5/rev5.c
587index 7bf2a961ff6d87f77122c97e91d9512bed8f9030..6dad8466142bc61edcbf7214687b6333223740de 100644
588--- a/keyboards/evyd13/atom47/rev5/rev5.c
589+++ b/keyboards/evyd13/atom47/rev5/rev5.c
590@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
591 
592 #include "quantum.h"
593 
594-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
595+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
596 /* Refer to IS31 manual for these locations
597  *   driver
598  *   |  R location
599diff --git a/keyboards/exclusive/e6_rgb/e6_rgb.c b/keyboards/exclusive/e6_rgb/e6_rgb.c
600index f34f40cc1f64372137cf549386728d8bd41c03df..24676e891000e8f8cab14994731fc97b9df67f71 100644
601--- a/keyboards/exclusive/e6_rgb/e6_rgb.c
602+++ b/keyboards/exclusive/e6_rgb/e6_rgb.c
603@@ -7,7 +7,7 @@ void matrix_init_kb(void) {
604   matrix_init_user();
605 }
606 
607-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
608+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
609 /* Refer to IS31 manual for these locations
610  *   driver
611  *   |  R location
612diff --git a/keyboards/feker/ik75/ik75.c b/keyboards/feker/ik75/ik75.c
613index 826afab01b448ee3b813e5b78ba96074ddfbaab3..e6424491bd11848529976c6d8e043350c1c64432 100644
614--- a/keyboards/feker/ik75/ik75.c
615+++ b/keyboards/feker/ik75/ik75.c
616@@ -18,7 +18,7 @@
617 #include "quantum.h"
618 
619 #ifdef RGB_MATRIX_ENABLE
620-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
621+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
622 /* Refer to IS31 manual for these locations
623  *   driver
624  *   |  G location
625diff --git a/keyboards/ferris/0_2/bling/bling.c b/keyboards/ferris/0_2/bling/bling.c
626index 07f58149cc9f1cbf670eb521a7bf993c31e916fe..69fbe411ebe03b557696cac374b26747c5cdb4e7 100644
627--- a/keyboards/ferris/0_2/bling/bling.c
628+++ b/keyboards/ferris/0_2/bling/bling.c
629@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
630 |    | 4  |   |    ||   |   | 4  |   |
631 | 6  |    |   | 2  || 2 |   |    | 5 |
632 */
633-const is31fl3731_led_t g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
634+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
635     /* Refer to IS31 manual for these locations
636      *   driver
637      *   |  R location
638diff --git a/keyboards/flashquark/horizon_z/horizon_z.c b/keyboards/flashquark/horizon_z/horizon_z.c
639index a9faa5a943fe6221c903d45f64519d6af20fd319..5ab6e22434d385141ab12e8b73d3499d803a7f5d 100755
640--- a/keyboards/flashquark/horizon_z/horizon_z.c
641+++ b/keyboards/flashquark/horizon_z/horizon_z.c
642@@ -17,7 +17,7 @@
643 #include "quantum.h"
644 
645 #ifdef RGB_MATRIX_ENABLE
646-const is31fl3733_led_t PROGMEM g_is31fl3733_leds[RGB_MATRIX_LED_COUNT] = {
647+const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
648     {0, B_1,    A_1,    C_1},
649     {0, B_2,    A_2,    C_2},
650     {0, B_3,    A_3,    C_3},
651diff --git a/keyboards/frooastboard/walnut/walnut.c b/keyboards/frooastboard/walnut/walnut.c
652index 48d1677f7ac6e0900c970b2513651219bfa14d1f..e3205e07f3c5dc7fe3f3c6ee622c434423097e2c 100644
653--- a/keyboards/frooastboard/walnut/walnut.c
654+++ b/keyboards/frooastboard/walnut/walnut.c
655@@ -5,7 +5,7 @@
656 
657 #if defined(RGB_MATRIX_ENABLE)
658 
659-const is31fl3737_led_t PROGMEM g_is31fl3737_leds[RGB_MATRIX_LED_COUNT] = {
660+const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
661 /* Refer to IS31 manual for these locations
662  *   driver
663  *   |  R location
664diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
665index 187d887d58139a0733e1becefd6da7b98cf9e1f1..11d2eb4db2985a4ec4c8919a5b55a2a1c4046906 100644
666--- a/keyboards/geekboards/tester/tester.c
667+++ b/keyboards/geekboards/tester/tester.c
668@@ -1,6 +1,6 @@
669 #include "quantum.h"
670 
671-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
672+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
673 /* Refer to IS31 manual for these locations
674  *   driver
675  *   |  R location
676diff --git a/keyboards/gizmo_engineering/gk6/gk6.c b/keyboards/gizmo_engineering/gk6/gk6.c
677index 18883727b88df3b7fc49fd3113907c0ee637512a..fe85ecc23532f4cea20a06ad460563e138fc0ce8 100755
678--- a/keyboards/gizmo_engineering/gk6/gk6.c
679+++ b/keyboards/gizmo_engineering/gk6/gk6.c
680@@ -17,7 +17,7 @@
681 #include "quantum.h"
682 
683 #ifdef RGB_MATRIX_ENABLE
684-const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
685+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
686     {0, C1_8, C2_8, C3_8},     //0 led1
687     {0, C1_7, C2_7, C3_7},     //1 led2
688     {0, C1_6, C2_6, C3_6},     //2 led3
689diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
690index 774006d5291ea8771fb76829b558041a55eb89b8..7c43f8d5eca52c9a915998c0a2dae0be80681498 100644
691--- a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
692+++ b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
693@@ -18,7 +18,7 @@
694 
695 #ifdef RGB_MATRIX_ENABLE
696 
697-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
698+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
699 /* Refer to AW20216S manual for these locations
700  *   driver
701  *   |     R location