Rename `DRIVER_ADDR_n` defines (#22200)

Co-authored-by: Nick Brassel <nick@tzarc.org>

docs/feature_led_matrix.md

@@ -23,10 +23,10 @@ You can use between 1 and 4 IS31FL3731 IC's. Do not specify `LED_DRIVER_ADDR_<N>
 | `IS31FL3731_I2C_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
 | `IS31FL3731_DRIVER_COUNT` | (Required) How many LED driver IC's are present | |
 | `LED_MATRIX_LED_COUNT` | (Required) How many LED lights are present across all drivers | |
-| `LED_DRIVER_ADDR_1` | (Required) Address for the first LED driver | |
-| `LED_DRIVER_ADDR_2` | (Optional) Address for the second LED driver | |
-| `LED_DRIVER_ADDR_3` | (Optional) Address for the third LED driver | |
-| `LED_DRIVER_ADDR_4` | (Optional) Address for the fourth LED driver | |
+| `IS31FL3731_I2C_ADDRESS_1` | (Required) Address for the first LED driver | |
+| `IS31FL3731_I2C_ADDRESS_2` | (Optional) Address for the second LED driver | |
+| `IS31FL3731_I2C_ADDRESS_3` | (Optional) Address for the third LED driver | |
+| `IS31FL3731_I2C_ADDRESS_4` | (Optional) Address for the fourth LED driver | |
 
 Here is an example using 2 drivers.
 
@@ -40,8 +40,8 @@ Here is an example using 2 drivers.
 // 11 AD <-> VCC
 // ADDR represents A1:A0 of the 7-bit address.
 // The result is: 0b11101(ADDR)
-#define LED_DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define LED_DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
 
 #define IS31FL3731_DRIVER_COUNT 2
 #define LED_DRIVER_1_LED_TOTAL 25
@@ -51,7 +51,7 @@ Here is an example using 2 drivers.
 
 !> Note the parentheses, this is so when `LED_MATRIX_LED_COUNT` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (LED_DRIVER_1_LED_TOTAL + LED_DRIVER_2_LED_TOTAL)` will give very different results than `rand() % LED_DRIVER_1_LED_TOTAL + LED_DRIVER_2_LED_TOTAL`.
 
-For split keyboards using `LED_MATRIX_SPLIT` with an LED driver, you can either have the same driver address or different driver addresses. If using different addresses, use `DRIVER_ADDR_1` for one and `DRIVER_ADDR_2` for the other one. Then, in `g_is31fl3731_leds`, fill out the correct driver index (0 or 1). If using one address, use `DRIVER_ADDR_1` for both, and use index 0 for `g_is31fl3731_leds`.
+For split keyboards using `LED_MATRIX_SPLIT` with an LED driver, you can either have the same driver address or different driver addresses. If using different addresses, use `IS31FL3731_I2C_ADDRESS_1` for one and `IS31FL3731_I2C_ADDRESS_2` for the other one. Then, in `g_is31fl3731_leds`, fill out the correct driver index (0 or 1). If using one address, use `IS31FL3731_I2C_ADDRESS_1` for both, and use index 0 for `g_is31fl3731_leds`.
 
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 

docs/feature_rgb_matrix.md

@@ -24,10 +24,10 @@ You can use between 1 and 4 IS31FL3731 IC's. Do not specify `DRIVER_ADDR_<N>` de
 | `IS31FL3731_DEGHOST` | (Optional) Set this define to enable de-ghosting by halving Vcc during blanking time | |
 | `IS31FL3731_DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
 | `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
-| `DRIVER_ADDR_1` | (Required) Address for the first RGB driver | |
-| `DRIVER_ADDR_2` | (Optional) Address for the second RGB driver | |
-| `DRIVER_ADDR_3` | (Optional) Address for the third RGB driver | |
-| `DRIVER_ADDR_4` | (Optional) Address for the fourth RGB driver | |
+| `IS31FL3731_I2C_ADDRESS_1` | (Required) Address for the first RGB driver | |
+| `IS31FL3731_I2C_ADDRESS_2` | (Optional) Address for the second RGB driver | |
+| `IS31FL3731_I2C_ADDRESS_3` | (Optional) Address for the third RGB driver | |
+| `IS31FL3731_I2C_ADDRESS_4` | (Optional) Address for the fourth RGB driver | |
 
 Here is an example using 2 drivers.
 
@@ -41,8 +41,8 @@ Here is an example using 2 drivers.
 // 11 AD <-> VCC
 // ADDR represents A1:A0 of the 7-bit address.
 // The result is: 0b11101(ADDR)
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
 
 #define IS31FL3731_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 25
@@ -52,7 +52,7 @@ Here is an example using 2 drivers.
 
 !> Note the parentheses, this is so when `RGB_MATRIX_LED_COUNT` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
 
-For split keyboards using `RGB_MATRIX_SPLIT` with an LED driver, you can either have the same driver address or different driver addresses. If using different addresses, use `DRIVER_ADDR_1` for one and `DRIVER_ADDR_2` for the other one. Then, in `g_is31fl3731_leds`, fill out the correct driver index (0 or 1). If using one address, use `DRIVER_ADDR_1` for both, and use index 0 for `g_is31fl3731_leds`.
+For split keyboards using `RGB_MATRIX_SPLIT` with an LED driver, you can either have the same driver address or different driver addresses. If using different addresses, use `IS31FL3731_I2C_ADDRESS_1` for one and `IS31FL3731_I2C_ADDRESS_2` for the other one. Then, in `g_is31fl3731_leds`, fill out the correct driver index (0 or 1). If using one address, use `IS31FL3731_I2C_ADDRESS_1` for both, and use index 0 for `g_is31fl3731_leds`.
 
 Define these arrays listing all the LEDs in your `<keyboard>.c`:
 
@@ -93,14 +93,14 @@ You can use between 1 and 4 IS31FL3733 IC's. Do not specify `DRIVER_ADDR_<N>` de
 | `IS31FL3733_CSPULLUP` | (Optional) Set the value of the CSx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `IS31FL3733_DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
 | `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
-| `DRIVER_ADDR_1` | (Required) Address for the first RGB driver | |
-| `DRIVER_ADDR_2` | (Optional) Address for the second RGB driver | |
-| `DRIVER_ADDR_3` | (Optional) Address for the third RGB driver | |
-| `DRIVER_ADDR_4` | (Optional) Address for the fourth RGB driver | |
-| `DRIVER_SYNC_1` | (Optional) Sync configuration for the first RGB driver | 0 |
-| `DRIVER_SYNC_2` | (Optional) Sync configuration for the second RGB driver | 0 |
-| `DRIVER_SYNC_3` | (Optional) Sync configuration for the third RGB driver | 0 |
-| `DRIVER_SYNC_4` | (Optional) Sync configuration for the fourth RGB driver | 0 |
+| `IS31FL3733_I2C_ADDRESS_1` | (Required) Address for the first RGB driver | |
+| `IS31FL3733_I2C_ADDRESS_2` | (Optional) Address for the second RGB driver | |
+| `IS31FL3733_I2C_ADDRESS_3` | (Optional) Address for the third RGB driver | |
+| `IS31FL3733_I2C_ADDRESS_4` | (Optional) Address for the fourth RGB driver | |
+| `IS31FL3733_SYNC_1` | (Optional) Sync configuration for the first RGB driver | 0 |
+| `IS31FL3733_SYNC_2` | (Optional) Sync configuration for the second RGB driver | 0 |
+| `IS31FL3733_SYNC_3` | (Optional) Sync configuration for the third RGB driver | 0 |
+| `IS31FL3733_SYNC_4` | (Optional) Sync configuration for the fourth RGB driver | 0 |
 
 The IS31FL3733 IC's have on-chip resistors that can be enabled to allow for de-ghosting of the RGB matrix. By default these resistors are not enabled (`IS31FL3733_SWPULLUP`/`IS31FL3733_CSPULLUP` are given the value of `IS31FL3733_PUR_0R`), the values that can be set to enable de-ghosting are as follows:
 
@@ -127,8 +127,8 @@ Here is an example using 2 drivers.
 // ADDR1 represents A1:A0 of the 7-bit address.
 // ADDR2 represents A3:A2 of the 7-bit address.
 // The result is: 0b101(ADDR2)(ADDR1)
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_GND_VCC
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
 
 #define IS31FL3733_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 58
@@ -180,10 +180,10 @@ Configure the hardware via your `config.h`:
 | `IS31FL3736_CSPULLUP` | (Optional) Set the value of the CSx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `IS31FL3736_DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
 | `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
-| `DRIVER_ADDR_1` | (Required) Address for the first RGB driver | |
-| `DRIVER_ADDR_2` | (Optional) Address for the second RGB driver | |
-| `DRIVER_ADDR_3` | (Optional) Address for the third RGB driver | |
-| `DRIVER_ADDR_4` | (Optional) Address for the fourth RGB driver | |
+| `IS31FL3736_I2C_ADDRESS_1` | (Required) Address for the first RGB driver | |
+| `IS31FL3736_I2C_ADDRESS_2` | (Optional) Address for the second RGB driver | |
+| `IS31FL3736_I2C_ADDRESS_3` | (Optional) Address for the third RGB driver | |
+| `IS31FL3736_I2C_ADDRESS_4` | (Optional) Address for the fourth RGB driver | |
 
 The IS31FL3736 IC's have on-chip resistors that can be enabled to allow for de-ghosting of the RGB matrix. By default these resistors are not enabled (`IS31FL3736_SWPULLUP`/`IS31FL3736_CSPULLUP` are given the value of `IS31FL3736_PUR_0R`), the values that can be set to enable de-ghosting are as follows:
 
@@ -211,8 +211,8 @@ Here is an example using 2 drivers.
 // ADDR1 represents A1:A0 of the 7-bit address.
 // ADDR2 represents A3:A2 of the 7-bit address.
 // The result is: 0b101(ADDR2)(ADDR1)
-#define DRIVER_ADDR_1 IS31FL3736_I2C_ADDRESS_GND_GND
-#define DRIVER_ADDR_2 IS31FL3736_I2C_ADDRESS_GND_SCL
+#define IS31FL3736_I2C_ADDRESS_1 IS31FL3736_I2C_ADDRESS_GND_GND
+#define IS31FL3736_I2C_ADDRESS_2 IS31FL3736_I2C_ADDRESS_GND_SCL
 
 #define IS31FL3736_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 30
@@ -257,10 +257,10 @@ Configure the hardware via your `config.h`:
 | `IS31FL3737_CSPULLUP` | (Optional) Set the value of the CSx lines on-chip de-ghosting resistors | PUR_0R (Disabled) |
 | `IS31FL3737_DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
 | `RGB_MATRIX_LED_COUNT` | (Required) How many RGB lights are present across all drivers | |
-| `DRIVER_ADDR_1` | (Required) Address for the first RGB driver | |
-| `DRIVER_ADDR_2` | (Optional) Address for the second RGB driver | |
-| `DRIVER_ADDR_3` | (Optional) Address for the third RGB driver | |
-| `DRIVER_ADDR_4` | (Optional) Address for the fourth RGB driver | |
+| `IS31FL3737_I2C_ADDRESS_1` | (Required) Address for the first RGB driver | |
+| `IS31FL3737_I2C_ADDRESS_2` | (Optional) Address for the second RGB driver | |
+| `IS31FL3737_I2C_ADDRESS_3` | (Optional) Address for the third RGB driver | |
+| `IS31FL3737_I2C_ADDRESS_4` | (Optional) Address for the fourth RGB driver | |
 
 The IS31FL3737 IC's have on-chip resistors that can be enabled to allow for de-ghosting of the RGB matrix. By default these resistors are not enabled (`IS31FL3737_SWPULLUP`/`IS31FL3737_CSPULLUP` are given the value of `IS31FL3737_PUR_0R`), the values that can be set to enable de-ghosting are as follows:
 
@@ -287,8 +287,8 @@ Here is an example using 2 drivers.
 // 1111 ADDR <-> VCC
 // ADDR represents A3:A0 of the 7-bit address.
 // The result is: 0b101(ADDR)
-#define DRIVER_ADDR_1 IS31FL3737_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3737_I2C_ADDRESS_SCL
+#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
+#define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_SCL
 
 #define IS31FL3737_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 30
@@ -480,10 +480,10 @@ You can use up to 2 AW20216S IC's. Do not specify `DRIVER_<N>_xxx` defines for I
 
 | Variable | Description | Default |
 |----------|-------------|---------|
-| `AW20216S_DRIVER_1_CS` | (Required) MCU pin connected to first RGB driver chip select line  | B13 |
-| `AW20216S_DRIVER_2_CS` | (Optional) MCU pin connected to second RGB driver chip select line  | |
-| `AW20216S_DRIVER_1_EN` | (Required) MCU pin connected to first RGB driver hardware enable line  | C13 |
-| `AW20216S_DRIVER_2_EN` | (Optional) MCU pin connected to second RGB driver hardware enable line  | |
+| `AW20216S_CS_PIN_1` | (Required) MCU pin connected to first RGB driver chip select line  | B13 |
+| `AW20216S_CS_PIN_2` | (Optional) MCU pin connected to second RGB driver chip select line  | |
+| `AW20216S_EN_PIN_1` | (Required) MCU pin connected to first RGB driver hardware enable line  | C13 |
+| `AW20216S_EN_PIN_2` | (Optional) MCU pin connected to second RGB driver hardware enable line  | |
 | `DRIVER_1_LED_TOTAL` | (Required) How many RGB lights are connected to first RGB driver  | |
 | `DRIVER_2_LED_TOTAL` | (Optional) How many RGB lights are connected to second RGB driver  | |
 | `AW20216S_DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
@@ -496,11 +496,11 @@ You can use up to 2 AW20216S IC's. Do not specify `DRIVER_<N>_xxx` defines for I
 Here is an example using 2 drivers.
 
 ```c
-#define AW20216S_DRIVER_1_CS B13
-#define AW20216S_DRIVER_2_CS B14
+#define AW20216S_CS_PIN_1 B13
+#define AW20216S_CS_PIN_2 B14
 // Hardware enable lines may be connected to the same pin
-#define AW20216S_DRIVER_1_EN C13
-#define AW20216S_DRIVER_2_EN C13
+#define AW20216S_EN_PIN_1 C13
+#define AW20216S_EN_PIN_2 C13
 
 #define AW20216S_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 66

drivers/led/aw20216s.h

@@ -38,16 +38,16 @@
 #    define AW20216S_SPI_DIVISOR AW_SPI_DIVISOR
 #endif
 #ifdef DRIVER_1_CS
-#    define AW20216S_DRIVER_1_CS DRIVER_1_CS
+#    define AW20216S_CS_PIN_1 DRIVER_1_CS
 #endif
 #ifdef DRIVER_2_CS
-#    define AW20216S_DRIVER_2_CS DRIVER_2_CS
+#    define AW20216S_CS_PIN_2 DRIVER_2_CS
 #endif
 #ifdef DRIVER_1_EN
-#    define AW20216S_DRIVER_1_EN DRIVER_1_EN
+#    define AW20216S_EN_PIN_1 DRIVER_1_EN
 #endif
 #ifdef DRIVER_2_EN
-#    define AW20216S_DRIVER_2_EN DRIVER_2_EN
+#    define AW20216S_EN_PIN_2 DRIVER_2_EN
 #endif
 
 #define aw_led aw20216s_led_t

drivers/led/issi/is31fl3731-simple.h

@@ -23,6 +23,18 @@
 #include "progmem.h"
 
 // ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef LED_DRIVER_ADDR_1
+#    define IS31FL3731_I2C_ADDRESS_1 LED_DRIVER_ADDR_1
+#endif
+#ifdef LED_DRIVER_ADDR_2
+#    define IS31FL3731_I2C_ADDRESS_2 LED_DRIVER_ADDR_2
+#endif
+#ifdef LED_DRIVER_ADDR_3
+#    define IS31FL3731_I2C_ADDRESS_3 LED_DRIVER_ADDR_3
+#endif
+#ifdef LED_DRIVER_ADDR_4
+#    define IS31FL3731_I2C_ADDRESS_4 LED_DRIVER_ADDR_4
+#endif
 #ifdef LED_DRIVER_COUNT
 #    define IS31FL3731_DRIVER_COUNT LED_DRIVER_COUNT
 #endif

drivers/led/issi/is31fl3731.h

@@ -22,6 +22,18 @@
 #include "progmem.h"
 
 // ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef DRIVER_ADDR_1
+#    define IS31FL3731_I2C_ADDRESS_1 DRIVER_ADDR_1
+#endif
+#ifdef DRIVER_ADDR_2
+#    define IS31FL3731_I2C_ADDRESS_2 DRIVER_ADDR_2
+#endif
+#ifdef DRIVER_ADDR_3
+#    define IS31FL3731_I2C_ADDRESS_3 DRIVER_ADDR_3
+#endif
+#ifdef DRIVER_ADDR_4
+#    define IS31FL3731_I2C_ADDRESS_4 DRIVER_ADDR_4
+#endif
 #ifdef DRIVER_COUNT
 #    define IS31FL3731_DRIVER_COUNT DRIVER_COUNT
 #endif

drivers/led/issi/is31fl3733.h

@@ -24,6 +24,30 @@
 #include "progmem.h"
 
 // ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef DRIVER_ADDR_1
+#    define IS31FL3733_I2C_ADDRESS_1 DRIVER_ADDR_1
+#endif
+#ifdef DRIVER_ADDR_2
+#    define IS31FL3733_I2C_ADDRESS_2 DRIVER_ADDR_2
+#endif
+#ifdef DRIVER_ADDR_3
+#    define IS31FL3733_I2C_ADDRESS_3 DRIVER_ADDR_3
+#endif
+#ifdef DRIVER_ADDR_4
+#    define IS31FL3733_I2C_ADDRESS_4 DRIVER_ADDR_4
+#endif
+#ifdef DRIVER_SYNC_1
+#    define IS31FL3733_SYNC_1 DRIVER_SYNC_1
+#endif
+#ifdef DRIVER_ADDR_2
+#    define IS31FL3733_SYNC_2 DRIVER_SYNC_2
+#endif
+#ifdef DRIVER_ADDR_3
+#    define IS31FL3733_SYNC_3 DRIVER_SYNC_3
+#endif
+#ifdef DRIVER_ADDR_4
+#    define IS31FL3733_SYNC_4 DRIVER_SYNC_4
+#endif
 #ifdef DRIVER_COUNT
 #    define IS31FL3733_DRIVER_COUNT DRIVER_COUNT
 #endif

drivers/led/issi/is31fl3736.h

@@ -22,6 +22,18 @@
 #include "progmem.h"
 
 // ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef DRIVER_ADDR_1
+#    define IS31FL3736_I2C_ADDRESS_1 DRIVER_ADDR_1
+#endif
+#ifdef DRIVER_ADDR_2
+#    define IS31FL3736_I2C_ADDRESS_2 DRIVER_ADDR_2
+#endif
+#ifdef DRIVER_ADDR_3
+#    define IS31FL3736_I2C_ADDRESS_3 DRIVER_ADDR_3
+#endif
+#ifdef DRIVER_ADDR_4
+#    define IS31FL3736_I2C_ADDRESS_4 DRIVER_ADDR_4
+#endif
 #ifdef DRIVER_COUNT
 #    define IS31FL3736_DRIVER_COUNT DRIVER_COUNT
 #endif

drivers/led/issi/is31fl3737.h

@@ -24,6 +24,18 @@
 #include "progmem.h"
 
 // ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef DRIVER_ADDR_1
+#    define IS31FL3737_I2C_ADDRESS_1 DRIVER_ADDR_1
+#endif
+#ifdef DRIVER_ADDR_2
+#    define IS31FL3737_I2C_ADDRESS_2 DRIVER_ADDR_2
+#endif
+#ifdef DRIVER_ADDR_3
+#    define IS31FL3737_I2C_ADDRESS_3 DRIVER_ADDR_3
+#endif
+#ifdef DRIVER_ADDR_4
+#    define IS31FL3737_I2C_ADDRESS_4 DRIVER_ADDR_4
+#endif
 #ifdef DRIVER_COUNT
 #    define IS31FL3737_DRIVER_COUNT DRIVER_COUNT
 #endif

drivers/led/issi/is31fl3741.h

@@ -24,6 +24,18 @@
 #include "progmem.h"
 
 // ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef DRIVER_ADDR_1
+#    define IS31FL3741_I2C_ADDRESS_1 DRIVER_ADDR_1
+#endif
+#ifdef DRIVER_ADDR_2
+#    define IS31FL3741_I2C_ADDRESS_2 DRIVER_ADDR_2
+#endif
+#ifdef DRIVER_ADDR_3
+#    define IS31FL3741_I2C_ADDRESS_3 DRIVER_ADDR_3
+#endif
+#ifdef DRIVER_ADDR_4
+#    define IS31FL3741_I2C_ADDRESS_4 DRIVER_ADDR_4
+#endif
 #ifdef DRIVER_COUNT
 #    define IS31FL3741_DRIVER_COUNT DRIVER_COUNT
 #endif

keyboards/4pplet/perk60_iso/rev_a/config.h

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 62
 #define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ

keyboards/abko/ak84bt/config.h

@@ -17,8 +17,8 @@
 #pragma once
 
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_GND_VCC
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
 
 #define IS31FL3733_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 45

keyboards/acheron/apollo/87h/gamma/config.h

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 
 // RGB Matrix defines
-#define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 
 #define IS31FL3741_DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 87

keyboards/aeboards/satellite/rev1/config.h

@@ -17,8 +17,8 @@
 #pragma once
 
 //RGB Matrix defines
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
 
 #define IS31FL3731_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 36

keyboards/aeboards/satellite/rev1/rev1.c

@@ -145,8 +145,8 @@ led_config_t g_led_config = { {
 // Custom Driver
 static void init(void) {
     i2c_init();
-    is31fl3731_init(DRIVER_ADDR_1);
-    is31fl3731_init(DRIVER_ADDR_2);
+    is31fl3731_init(IS31FL3731_I2C_ADDRESS_1);
+    is31fl3731_init(IS31FL3731_I2C_ADDRESS_2);
     for (int index = 0; index < ISSI_DRIVER_TOTAL; index++) {
         bool enabled = !(   ( index == 18+5) || //B5
                             ( index == 36+17) || //C17
@@ -154,13 +154,13 @@ static void init(void) {
                         );
         is31fl3731_set_led_control_register(index, enabled, enabled, enabled);
     }
-    is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
-    is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_1, 0);
+    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_2, 1);
 }
 
 static void flush(void) {
-    is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
-    is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_1, 0);
+    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_2, 1);
 }
 
 static void set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {

keyboards/akko/5108/config.h

@@ -35,8 +35,8 @@
 
 /* I2C Config for LED Driver */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
 #define I2C1_SCL_PAL_MODE 4
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */

keyboards/akko/acr87/config.h

@@ -32,9 +32,9 @@
 
 /* I2C Config for LED Driver */
 #define SNLED27351_DRIVER_COUNT 3
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_3 SNLED27351_I2C_ADDRESS_SDA
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_3 SNLED27351_I2C_ADDRESS_SDA
 
 #define I2C1_SCL_PAL_MODE 4
 #define I2C1_OPMODE OPMODE_I2C

keyboards/akko/top40/config.h

@@ -32,8 +32,8 @@
 
 /* I2C Config for LED Driver */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
 #define I2C1_SCL_PAL_MODE 4
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */

keyboards/axolstudio/yeti/hotswap/config.h

@@ -61,7 +61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16       // 16 is equivalent to limiting to 60fps
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 64
 #endif

keyboards/canary/canary60rgb/v1/config.h

@@ -33,7 +33,7 @@
 #    define DISABLE_RGB_MATRIX_MULTISPLASH
 #    define DISABLE_RGB_MATRIX_SOLID_SPLASH
 #    define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 63
 #endif

keyboards/chosfox/cf81/config.h

@@ -32,8 +32,8 @@
 
 /* I2C Config for LED Driver */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
 #define I2C1_OPMODE OPMODE_I2C
 #define I2C1_CLOCK_SPEED 400000 /* 400000 */
 

keyboards/clueboard/66_hotswap/gen1/config.h

@@ -33,7 +33,7 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define LED_DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define I2C1_SCL_PIN B8
 #define I2C1_SDA_PIN B9
 

keyboards/dp60/config.h

@@ -33,8 +33,8 @@
 //#define NO_PRINT
 
 //rgb matrix setting
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 #define IS31FL3731_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 36

keyboards/drop/alt/v2/config.h

@@ -14,8 +14,8 @@
 #define EXTERNAL_EEPROM_WP_PIN B5
 #define EEPROM_I2C_24LC256
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_VCC
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_VCC
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
 #define IS31FL3733_DRIVER_COUNT 2
 #define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
 

keyboards/drop/cstm80/config.h

@@ -9,8 +9,8 @@
 #define EXTERNAL_EEPROM_WP_PIN B7
 #define EEPROM_I2C_24LC256
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
 #define IS31FL3733_DRIVER_COUNT 2
 #define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
 

keyboards/drop/ctrl/v2/config.h

@@ -14,8 +14,8 @@
 #define EXTERNAL_EEPROM_WP_PIN B5
 #define EEPROM_I2C_24LC256
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_VCC
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_VCC
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
 #define IS31FL3733_DRIVER_COUNT 2
 #define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
 

keyboards/drop/sense75/config.h

@@ -9,8 +9,8 @@
 #define EXTERNAL_EEPROM_WP_PIN B7
 #define EEPROM_I2C_24LC256
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
 #define IS31FL3733_DRIVER_COUNT 2
 #define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
 

keyboards/drop/shift/v2/config.h

@@ -14,9 +14,9 @@
 #define EXTERNAL_EEPROM_WP_PIN B5
 #define EEPROM_I2C_24LC256
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_VCC
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
-#define DRIVER_ADDR_3 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_VCC
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC
+#define IS31FL3733_I2C_ADDRESS_3 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_DRIVER_COUNT 3
 #define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ
 

keyboards/durgod/dgk6x/config.h

@@ -34,8 +34,8 @@
 #define LED_MR_LOCK_PIN     LED_SCROLL_LOCK_PIN
 
 #ifdef RGB_MATRIX_ENABLE
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_GND_VCC
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
 
 #define IS31FL3733_DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)

keyboards/dztech/dz60rgb/v1/config.h

@@ -55,7 +55,7 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 63
 #endif

keyboards/dztech/dz60rgb/v2/config.h

@@ -53,7 +53,7 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 63
 #endif

keyboards/dztech/dz60rgb/v2_1/config.h

@@ -69,7 +69,7 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 63
 #endif

keyboards/dztech/dz60rgb_ansi/v1/config.h

@@ -55,7 +55,7 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 61
 #endif

keyboards/dztech/dz60rgb_ansi/v2/config.h

@@ -53,7 +53,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 61
 #endif

keyboards/dztech/dz60rgb_ansi/v2_1/config.h

@@ -69,7 +69,7 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 61
 #endif

keyboards/dztech/dz60rgb_wkl/v1/config.h

@@ -55,7 +55,7 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 62
 #endif

keyboards/dztech/dz60rgb_wkl/v2/config.h

@@ -50,7 +50,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 62
 #endif

keyboards/dztech/dz60rgb_wkl/v2_1/config.h

@@ -69,7 +69,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1      IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1      IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT       1
 #    define RGB_MATRIX_LED_COUNT   62
 #endif

keyboards/dztech/dz64rgb/config.h

@@ -48,7 +48,7 @@
 #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 64
 #endif

keyboards/dztech/dz65rgb/v1/config.h

@@ -70,8 +70,8 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 #    define IS31FL3731_DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 35
 #    define DRIVER_2_LED_TOTAL 33

keyboards/dztech/dz65rgb/v2/config.h

@@ -70,8 +70,8 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 #    define IS31FL3731_DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 35
 #    define DRIVER_2_LED_TOTAL 33

keyboards/dztech/dz65rgb/v3/config.h

@@ -72,7 +72,7 @@
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND
+#    define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 #    define IS31FL3741_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 68
 #    define DRIVER_INDICATOR_LED_TOTAL 0

keyboards/dztech/tofu/ii/v1/config.h

@@ -79,8 +79,8 @@
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DRIVER_ADDR_1 IS31FL3737_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3737_I2C_ADDRESS_VCC
+#    define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
+#    define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
 #    define IS31FL3737_DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 46
 #    define DRIVER_2_LED_TOTAL 20

keyboards/dztech/tofu/jr/v1/config.h

@@ -79,8 +79,8 @@
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DRIVER_ADDR_1 IS31FL3737_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3737_I2C_ADDRESS_VCC
+#    define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
+#    define IS31FL3737_I2C_ADDRESS_2 IS31FL3737_I2C_ADDRESS_VCC
 #    define IS31FL3737_DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 48
 #    define DRIVER_2_LED_TOTAL 20

keyboards/ergodox_ez/config.h

@@ -91,8 +91,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 // RGB backlight
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 #define IS31FL3731_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 24
 #define DRIVER_2_LED_TOTAL 24

keyboards/evyd13/atom47/rev5/config.h

@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 64
 

keyboards/exclusive/e6_rgb/config.h

@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 
 #define IS31FL3733_DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 63

keyboards/fallacy/config.h

@@ -18,7 +18,7 @@
 /* IS31FL3731 driver address (for status LEDs)
  * Using the default defines here, but using a custom implementation
  */
-#define LED_DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_DRIVER_COUNT 1
 #define LED_MATRIX_LED_COUNT 3
 

keyboards/fallacy/indicators.c

@@ -23,20 +23,20 @@
  */
 void init_fallacy_leds(void) {
     i2c_init();
-    is31fl3731_init(LED_DRIVER_ADDR_1);
+    is31fl3731_init(IS31FL3731_I2C_ADDRESS_1);
 
     for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
         is31fl3731_set_led_control_register(i, true);
     }
 
-    is31fl3731_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
+    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_1, 0);
 }
 
 
 /* update the buffer
  */
 void update_fallacy_leds(void) {
-    is31fl3731_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);    
+    is31fl3731_update_pwm_buffers(IS31FL3731_I2C_ADDRESS_1, 0);    
 }
 
 

keyboards/feker/ik75/config.h

@@ -25,8 +25,8 @@
     #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 
     /* RGB Matrix config */
-    #define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_VCC_VCC
-    #define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_GND_GND
+    #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_VCC_VCC
+    #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND
     #define IS31FL3733_DRIVER_COUNT 2
     #define DRIVER_1_LED_TOTAL 63
     #define DRIVER_2_LED_TOTAL 64

keyboards/ferris/0_2/bling/config.h

@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* LED Drivers */
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SCL
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
 #define IS31FL3731_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 7
 #define DRIVER_2_LED_TOTAL 7

keyboards/flashquark/horizon_z/config.h

@@ -72,7 +72,7 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 62
 #endif

keyboards/frooastboard/walnut/config.h

@@ -6,7 +6,7 @@
 #define IS31FL3737_PWM_FREQUENCY IS31FL3737_PWM_FREQUENCY_26K7_HZ
 #define IS31FL3737_DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 48
-#define DRIVER_ADDR_1 IS31FL3737_I2C_ADDRESS_GND
+#define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 191
 

keyboards/geekboards/tester/config.h

@@ -55,8 +55,8 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SCL
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
 #    define IS31FL3731_DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 8
 #    define DRIVER_2_LED_TOTAL 0

keyboards/gizmo_engineering/gk6/config.h

@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 // RGB Matrix
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 
 #define IS31FL3731_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 32

keyboards/gmmk/gmmk2/p65/config.h

@@ -29,10 +29,10 @@
 #define SPI_MOSI_PIN B15
 #define SPI_MISO_PIN B14
 
-#define AW20216S_DRIVER_1_CS A15
-#define AW20216S_DRIVER_2_CS B9
-#define AW20216S_DRIVER_1_EN C13
-#define AW20216S_DRIVER_2_EN C13
+#define AW20216S_CS_PIN_1 A15
+#define AW20216S_CS_PIN_2 B9
+#define AW20216S_EN_PIN_1 C13
+#define AW20216S_EN_PIN_2 C13
 
 #define AW20216S_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 54

keyboards/gmmk/gmmk2/p96/config.h

@@ -32,10 +32,10 @@
 #define SPI_MOSI_PIN A7
 #define SPI_MISO_PIN A6
 
-#define AW20216S_DRIVER_1_CS A15
-#define AW20216S_DRIVER_2_CS B15
-#define AW20216S_DRIVER_1_EN C13
-#define AW20216S_DRIVER_2_EN C13
+#define AW20216S_CS_PIN_1 A15
+#define AW20216S_CS_PIN_2 B15
+#define AW20216S_EN_PIN_1 C13
+#define AW20216S_EN_PIN_2 C13
 
 #define AW20216S_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 66

keyboards/gmmk/numpad/config.h

@@ -28,9 +28,9 @@
 #define SPI_MOSI_PIN B5
 #define SPI_MISO_PIN B4
 
-#define AW20216S_DRIVER_1_CS B12
-#define AW20216S_DRIVER_1_EN A15
-#define AW20216S_DRIVER_1_PW_EN B13
+#define AW20216S_CS_PIN_1 B12
+#define AW20216S_EN_PIN_1 A15
+#define AW20216S_PW_EN_PIN_1 B13
 
 #define AW20216S_DRIVER_COUNT 1
 

keyboards/gmmk/numpad/numpad.c

@@ -107,12 +107,12 @@ led_config_t g_led_config = {{
 	2, 2, 2, 2, 2, 2, 2
 } };
 
-#    ifdef AW20216S_DRIVER_1_PW_EN
+#    ifdef AW20216S_PW_EN_PIN_1
 
 void keyboard_pre_init_user(void) {
     wait_ms(2000);
-    setPinOutput(AW20216S_DRIVER_1_PW_EN);
-    writePinHigh(AW20216S_DRIVER_1_PW_EN);
+    setPinOutput(AW20216S_PW_EN_PIN_1);
+    writePinHigh(AW20216S_PW_EN_PIN_1);
 }
 #    endif
 

keyboards/gmmk/pro/config.h

@@ -26,10 +26,10 @@
 #define SPI_MOSI_PIN A6
 #define SPI_MISO_PIN A7
 
-#define AW20216S_DRIVER_1_CS B13
-#define AW20216S_DRIVER_2_CS B14
-#define AW20216S_DRIVER_1_EN C13
-#define AW20216S_DRIVER_2_EN C13
+#define AW20216S_CS_PIN_1 B13
+#define AW20216S_CS_PIN_2 B14
+#define AW20216S_EN_PIN_1 C13
+#define AW20216S_EN_PIN_2 C13
 
 #define AW20216S_DRIVER_COUNT 2
 

keyboards/handwired/orbweaver/config.h

@@ -18,7 +18,7 @@
 #pragma once
 
 #define IS31FL3731_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define RGB_MATRIX_LED_COUNT 20
 #define I2C1_CLOCK_SPEED 100000
 #define RGB_MATRIX_CENTER { 40, 30 }

keyboards/hs60/v1/config.h

@@ -41,8 +41,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 215
 
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SCL
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
 
 #define IS31FL3731_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 30

keyboards/ilumkb/simpler61/config.h

@@ -21,7 +21,7 @@
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 #define IS31FL3741_DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 61
 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL

keyboards/ilumkb/simpler64/config.h

@@ -21,7 +21,7 @@
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 #define IS31FL3741_DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 64
 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL

keyboards/inett_studio/sqx/hotswap/config.h

@@ -32,8 +32,8 @@
 //rgb matrix setting
 #define DRIVER_1_LED_TOTAL 33
 #define DRIVER_2_LED_TOTAL 31
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 #define IS31FL3731_DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 

keyboards/inett_studio/sqx/universal/config.h

@@ -32,8 +32,8 @@
 //rgb matrix setting
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 36
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 #define IS31FL3731_DRIVER_COUNT 2
 #define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 

keyboards/inland/kb83/config.h

@@ -39,8 +39,8 @@
 
 /* I2C Config for LED Driver */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_VDDIO
 #define I2C1_SDA_PIN B7
 #define I2C1_SCL_PIN B6
 #define I2C1_SCL_PAL_MODE 4

keyboards/inland/mk47/config.h

@@ -26,7 +26,7 @@
 
 /* I2C Config for LED Driver */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* WB32 MCU has no default definition */
 #define I2C1_OPMODE OPMODE_I2C

keyboards/input_club/ergodox_infinity/config.h

@@ -43,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_BRIGHTNESS_HI       255
 
 /* LED matrix driver */
-#define LED_DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_DRIVER_COUNT 1
 #define LED_MATRIX_LED_COUNT 76
 #define LED_MATRIX_SPLIT { 38, 38 }

keyboards/input_club/infinity60/led/config.h

@@ -6,7 +6,7 @@
 #define LED_MATRIX_LED_COUNT 63
 
 #define IS31FL3731_DRIVER_COUNT 1
-#define LED_DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 
 #define I2C1_CLOCK_SPEED 400000
 #define I2C1_SCL_PIN B0

keyboards/input_club/k_type/config.h

@@ -103,8 +103,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define I2C2_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
 #    define I2C2_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2
 
-#    define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#    define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#    define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_GND
 #    define IS31FL3733_DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 64
 #    define DRIVER_2_LED_TOTAL 55

keyboards/input_club/k_type/k_type-rgbdriver.c

@@ -22,26 +22,26 @@
 
 static void init(void) {
     i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN);
-    is31fl3733_init(0, DRIVER_ADDR_1, 0);
+    is31fl3733_init(0, IS31FL3733_I2C_ADDRESS_1, 0);
 #    ifdef USE_I2C2
     i2c_init(&I2CD2, I2C2_SCL_PIN, I2C2_SDA_PIN);
-    is31fl3733_init(1, DRIVER_ADDR_2, 0);
+    is31fl3733_init(1, IS31FL3733_I2C_ADDRESS_2, 0);
 #    endif
     for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
         bool enabled = true;
         // This only caches it for later
         is31fl3733_set_led_control_register(index, enabled, enabled, enabled);
     }
-    is31fl3733_update_led_control_registers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0);
 #    ifdef USE_I2C2
-    is31fl3733_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_2, 1);
 #    endif
 }
 
 static void flush(void) {
-    is31fl3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
+    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0);
 #    ifdef USE_I2C2
-    is31fl3733_update_pwm_buffers(DRIVER_ADDR_2, 1);
+    is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_2, 1);
 #    endif
 }
 

keyboards/input_club/whitefox/config.h

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_BRIGHTNESS_HI 255
 
 /* LED matrix driver */
-#define LED_DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_DRIVER_COUNT 1
 #define LED_MATRIX_LED_COUNT 71
 #define LED_DISABLE_WHEN_USB_SUSPENDED

keyboards/kbdcraft/adam64/config.h

@@ -24,7 +24,7 @@
 #define I2C1_DUTY_CYCLE	FAST_DUTY_CYCLE_16_9
 
 #define IS31FL3741_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 #define RGB_MATRIX_LED_COUNT 64
 
 /* turn off effects when suspended */

keyboards/kbdfans/bella/rgb/config.h

@@ -71,7 +71,7 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 //#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 #define IS31FL3741_DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 108
 #define DRIVER_INDICATOR_LED_TOTAL 0

keyboards/kbdfans/bella/rgb_iso/config.h

@@ -71,7 +71,7 @@
 // #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 //#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 #define IS31FL3741_DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 109
 #define DRIVER_INDICATOR_LED_TOTAL 0

keyboards/kbdfans/boop65/rgb/config.h

@@ -26,7 +26,7 @@
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#    define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND
+#    define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 #    define IS31FL3741_DRIVER_COUNT 1
 #    define RGB_MATRIX_LED_COUNT 83
 #    define DRIVER_INDICATOR_LED_TOTAL 0

keyboards/kbdfans/kbd67/mkiirgb/v1/config.h

@@ -55,8 +55,8 @@
 
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 #define IS31FL3731_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 35
 #define DRIVER_2_LED_TOTAL 32

keyboards/kbdfans/kbd67/mkiirgb/v2/config.h

@@ -55,8 +55,8 @@
 // #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
-#    define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#    define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC
+#    define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#    define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
 #    define IS31FL3731_DRIVER_COUNT 2
 #    define DRIVER_1_LED_TOTAL 35
 #    define DRIVER_2_LED_TOTAL 32

keyboards/kbdfans/kbd67/mkiirgb/v3/config.h

@@ -72,7 +72,7 @@
 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
 #define IS31FL3741_DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 67
 #define DRIVER_INDICATOR_LED_TOTAL 0

keyboards/kbdfans/kbdmini/config.h

@@ -53,7 +53,7 @@
 // #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 #define IS31FL3733_DRIVER_COUNT 1
 #define RGB_MATRIX_LED_COUNT 52
 #endif

keyboards/kbdfans/maja/config.h

@@ -54,8 +54,8 @@
 // #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
-#define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND
-#define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_SDA
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
+#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
 #define IS31FL3731_DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 36
 #define DRIVER_2_LED_TOTAL 31

keyboards/keychron/c1_pro/ansi/rgb/config.h

@@ -21,8 +21,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 49

keyboards/keychron/c1_pro/ansi/white/config.h

@@ -21,7 +21,7 @@
 
 /* LED Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* LED Matrix Configuration */
 #define LED_MATRIX_LED_COUNT 90

keyboards/keychron/c2_pro/ansi/rgb/config.h

@@ -18,8 +18,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Set LED driver current */
 #define SNLED27351_CURRENT_TUNE \

keyboards/keychron/c2_pro/ansi/white/config.h

@@ -18,7 +18,7 @@
 
 /* LED Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* Set LED driver current */
 #define SNLED27351_CURRENT_TUNE \

keyboards/keychron/q0/base/config.h

@@ -18,7 +18,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* RGB Matrix Configuration */
 #define RGB_MATRIX_LED_COUNT 21

keyboards/keychron/q0/plus/config.h

@@ -18,7 +18,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
 
 /* RGB Matrix Configuration */
 #define RGB_MATRIX_LED_COUNT 26

keyboards/keychron/q10/config.h

@@ -31,8 +31,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U

keyboards/keychron/q11/config.h

@@ -28,7 +28,7 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 1
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U

keyboards/keychron/q12/config.h

@@ -27,8 +27,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U

keyboards/keychron/q1v1/config.h

@@ -18,8 +18,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define IS31FL3733_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 IS31FL3733_I2C_ADDRESS_GND_GND
-#define DRIVER_ADDR_2 IS31FL3733_I2C_ADDRESS_GND_VCC
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
+#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_VCC
 
 /* DIP switch */
 #define DIP_SWITCH_MATRIX_GRID  { {0,1} }

keyboards/keychron/q1v2/ansi/ansi.c

@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location

keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c

@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location

keyboards/keychron/q1v2/config.h

@@ -17,9 +17,9 @@
 #pragma once
 
 /* RGB Matrix Driver Configuration */
-#define DRIVER_COUNT 2
-#define DRIVER_ADDR_1 0b1110111
-#define DRIVER_ADDR_2 0b1110100
+#define SNLED27351_DRIVER_COUNT 2
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
@@ -44,10 +44,9 @@
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
 
-/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
-#define PHASE_CHANNEL MSKPHASE_9CHANNEL
+#define SNLED27351_PHASE_CHANNEL SNLED27351_MSKPHASE_9CHANNEL
 /* Set LED driver current */
-#define CKLED2001_CURRENT_TUNE \
+#define SNLED27351_CURRENT_TUNE \
     { 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50, 0xA6, 0xA6, 0x50 }
 
 // RGB Matrix Animation modes. Explicitly enabled

keyboards/keychron/q1v2/info.json

@@ -30,7 +30,7 @@
     },
     "diode_direction": "ROW2COL",
     "rgb_matrix": {
-        "driver": "ckled2001",
+        "driver": "snled27351",
         "animations": {
             "band_spiral_val": true,
             "breathing": true,

keyboards/keychron/q1v2/iso/iso.c

@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location

keyboards/keychron/q1v2/iso_encoder/iso_encoder.c

@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location

keyboards/keychron/q1v2/jis/jis.c

@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location

keyboards/keychron/q1v2/jis_encoder/jis_encoder.c

@@ -18,8 +18,8 @@
 
 #ifdef RGB_MATRIX_ENABLE
 
-const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
+const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location

keyboards/keychron/q2/config.h

@@ -23,8 +23,8 @@
 
 /* RGB Matrix Driver Configuration */
 #define SNLED27351_DRIVER_COUNT 2
-#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO
-#define DRIVER_ADDR_2 SNLED27351_I2C_ADDRESS_GND
+#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO
+#define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND
 
 #define SNLED27351_PHASE_CHANNEL SNLED27351_MSKPHASE_9CHANNEL