3 files changed, 18 insertions, 20 deletions
diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index 91d96c6a4d..22a25a0d92 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -32,7 +32,7 @@
 
 #define DRIVER_1_LED_TOTAL 32
 #define DRIVER_2_LED_TOTAL 32
-#define DRIVER_ADDR_1 0b1110100
-#define DRIVER_ADDR_2 0b1110111
-#define DRIVER_COUNT 2
+#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)
diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
index cf99404641..5f3ae3a169 100644
--- a/keyboards/neson_design/n6/n6.c
+++ b/keyboards/neson_design/n6/n6.c
@@ -48,18 +48,18 @@ enum {
 
 // led index
 #define ST_LEFT_BEGIN       0
-#ifdef DRIVER_ADDR_2
+#ifdef IS31FL3731_I2C_ADDRESS_2
 #define ST_LEFT_SIZE        4
 #else
 #define ST_LEFT_SIZE        2
 #endif
 #define ST_LEFT_END         (ST_LEFT_BEGIN+ST_LEFT_SIZE-1)
-#ifdef DRIVER_ADDR_2
+#ifdef IS31FL3731_I2C_ADDRESS_2
 #define ST_RIGHT_BEGIN      60
 #else
 #define ST_RIGHT_BEGIN      30
 #endif
-#ifdef DRIVER_ADDR_2
+#ifdef IS31FL3731_I2C_ADDRESS_2
 #define ST_RIGHT_SIZE       4
 #else
 #define ST_RIGHT_SIZE       2
@@ -211,7 +211,7 @@ static void self_testing(void)
     update_ticks();
 }
 
-const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = {
     /* Refer to IS31 manual for these locations
      *   driver
      *   |  R location
@@ -299,16 +299,16 @@ void matrix_init_kb(void)
     writePinLow(LED_CAPS_LOCK_PIN);
 
     i2c_init();
-    is31fl3731_init(DRIVER_ADDR_1);
-#ifdef DRIVER_ADDR_2
-    is31fl3731_init(DRIVER_ADDR_2);
+    is31fl3731_init(IS31FL3731_I2C_ADDRESS_1);
+#ifdef IS31FL3731_I2C_ADDRESS_2
+    is31fl3731_init(IS31FL3731_I2C_ADDRESS_2);
 #endif
     for (int index = 0; index < RGB_MATRIX_LED_COUNT; index++) {
         is31fl3731_set_led_control_register(index, true, true, true);
     }
-    is31fl3731_update_led_control_registers(DRIVER_ADDR_1, 0);
-#ifdef DRIVER_ADDR_2
-    is31fl3731_update_led_control_registers(DRIVER_ADDR_2, 1);
+    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_1, 0);
+#ifdef IS31FL3731_I2C_ADDRESS_2
+    is31fl3731_update_led_control_registers(IS31FL3731_I2C_ADDRESS_2, 1);
 #endif
     update_ticks();
     matrix_init_user();
@@ -320,7 +320,7 @@ void housekeeping_task_kb(void)
         self_testing();
     } else if (rgb_state.state == CAPS_ALERT) {
         //gold 0xFF, 0xD9, 0x00
-        LED_TYPE led = {
+        rgb_led_t led = {
             .r = 0xFF,
             //.g = 0xD9,
             .g = 0xA5,
@@ -343,15 +343,12 @@ void housekeeping_task_kb(void)
         }
     }
 
-    is31fl3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
-#ifdef DRIVER_ADDR_2
-    is31fl3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
-#endif
+    is31fl3731_flush();
 
     housekeeping_task_user();
 }
 
-void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
+void rgblight_call_driver(rgb_led_t *start_led, uint8_t num_leds)
 {
     if (rgb_state.state != NORMAL) return;
 
diff --git a/keyboards/neson_design/n6/rules.mk b/keyboards/neson_design/n6/rules.mk
index 5d8397653e..a3e4abe6cd 100644
--- a/keyboards/neson_design/n6/rules.mk
+++ b/keyboards/neson_design/n6/rules.mk
@@ -10,4 +10,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes		# Enable keyboard RGB underglow
 
-QUANTUM_LIB_SRC += i2c_master.c drivers/led/issi/is31fl3731.c
+QUANTUM_LIB_SRC += drivers/led/issi/is31fl3731.c
+I2C_DRIVER_REQUIRED = yes