LED drivers: extract IS31FL3743A from IS31COMMON (#22635)

builddefs/common_features.mk

@@ -402,10 +402,9 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3743a)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3743a-simple.c
     endif
 
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3745)
@@ -508,10 +507,9 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     endif
 
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3743a)
-        OPT_DEFS += -DIS31FLCOMMON
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
-        SRC += is31flcommon.c
+        SRC += is31fl3743a.c
     endif
 
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3745)

drivers/led/issi/is31fl3743a-simple.c

@@ -0,0 +1,216 @@
+#include "is31fl3743a-simple.h"
+#include <string.h>
+#include "i2c_master.h"
+#include "wait.h"
+
+#define IS31FL3743A_PWM_REGISTER_COUNT 198
+#define IS31FL3743A_SCALING_REGISTER_COUNT 198
+
+#ifndef IS31FL3743A_I2C_TIMEOUT
+#    define IS31FL3743A_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3743A_I2C_PERSISTENCE
+#    define IS31FL3743A_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3743A_CONFIGURATION
+#    define IS31FL3743A_CONFIGURATION 0x01
+#endif
+
+#ifndef IS31FL3743A_SW_PULLDOWN
+#    define IS31FL3743A_SW_PULLDOWN IS31FL3743A_PDR_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3743A_CS_PULLUP
+#    define IS31FL3743A_CS_PULLUP IS31FL3743A_PUR_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3743A_GLOBAL_CURRENT
+#    define IS31FL3743A_GLOBAL_CURRENT 0xFF
+#endif
+
+#ifndef IS31FL3743A_SYNC_1
+#    define IS31FL3743A_SYNC_1 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_2
+#    define IS31FL3743A_SYNC_2 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_3
+#    define IS31FL3743A_SYNC_3 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_4
+#    define IS31FL3743A_SYNC_4 IS31FL3743A_SYNC_NONE
+#endif
+
+uint8_t i2c_transfer_buffer[20] = {0xFF};
+
+uint8_t g_pwm_buffer[IS31FL3743A_DRIVER_COUNT][IS31FL3743A_PWM_REGISTER_COUNT];
+bool    g_pwm_buffer_update_required[IS31FL3743A_DRIVER_COUNT]        = {false};
+bool    g_scaling_registers_update_required[IS31FL3743A_DRIVER_COUNT] = {false};
+
+uint8_t g_scaling_registers[IS31FL3743A_DRIVER_COUNT][IS31FL3743A_SCALING_REGISTER_COUNT];
+
+void is31fl3743a_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+    i2c_transfer_buffer[0] = reg;
+    i2c_transfer_buffer[1] = data;
+
+#if IS31FL3743A_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3743A_I2C_PERSISTENCE; i++) {
+        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3743A_I2C_TIMEOUT) == 0) break;
+    }
+#else
+    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3743A_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3743a_select_page(uint8_t addr, uint8_t page) {
+    is31fl3743a_write_register(addr, IS31FL3743A_REG_COMMAND_WRITE_LOCK, IS31FL3743A_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3743a_write_register(addr, IS31FL3743A_REG_COMMAND, page);
+}
+
+void is31fl3743a_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+    // Assumes page 0 is already selected.
+    // If any of the transactions fails function returns false.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
+    // i2c_transfer_buffer[] is 20 bytes
+
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (int i = 0; i < IS31FL3743A_PWM_REGISTER_COUNT; i += 16) {
+        i2c_transfer_buffer[0] = i + 1;
+        // Copy the data from i to i+15.
+        // Device will auto-increment register for data after the first byte
+        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
+        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+
+#if IS31FL3743A_I2C_PERSISTENCE > 0
+        for (uint8_t i = 0; i < IS31FL3743A_I2C_PERSISTENCE; i++) {
+            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3743A_I2C_TIMEOUT) != 0) break;
+        }
+#else
+        i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3743A_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3743a_init_drivers(void) {
+    i2c_init();
+
+    is31fl3743a_init(IS31FL3743A_I2C_ADDRESS_1, IS31FL3743A_SYNC_1);
+#if defined(IS31FL3743A_I2C_ADDRESS_2)
+    is31fl3743a_init(IS31FL3743A_I2C_ADDRESS_2, IS31FL3743A_SYNC_2);
+#    if defined(IS31FL3743A_I2C_ADDRESS_3)
+    is31fl3743a_init(IS31FL3743A_I2C_ADDRESS_3, IS31FL3743A_SYNC_3);
+#        if defined(IS31FL3743A_I2C_ADDRESS_4)
+    is31fl3743a_init(IS31FL3743A_I2C_ADDRESS_4, IS31FL3743A_SYNC_4);
+#        endif
+#    endif
+#endif
+
+    for (int i = 0; i < IS31FL3743A_LED_COUNT; i++) {
+        is31fl3743a_set_scaling_register(i, 0xFF);
+    }
+
+    is31fl3743a_update_scaling_registers(IS31FL3743A_I2C_ADDRESS_1, 0);
+#if defined(IS31FL3743A_I2C_ADDRESS_2)
+    is31fl3743a_update_scaling_registers(IS31FL3743A_I2C_ADDRESS_2, 1);
+#    if defined(IS31FL3743A_I2C_ADDRESS_3)
+    is31fl3743a_update_scaling_registers(IS31FL3743A_I2C_ADDRESS_3, 2);
+#        if defined(IS31FL3743A_I2C_ADDRESS_4)
+    is31fl3743a_update_scaling_registers(IS31FL3743A_I2C_ADDRESS_4, 3);
+#        endif
+#    endif
+#endif
+}
+
+void is31fl3743a_init(uint8_t addr, uint8_t sync) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (int i = 0; i < IS31FL3743A_SCALING_REGISTER_COUNT; i++) {
+        is31fl3743a_write_register(addr, i + 1, 0x00);
+    }
+
+    is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_PWM);
+
+    for (int i = 0; i < IS31FL3743A_PWM_REGISTER_COUNT; i++) {
+        is31fl3743a_write_register(addr, i + 1, 0x00);
+    }
+
+    is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_FUNCTION);
+
+    is31fl3743a_write_register(addr, IS31FL3743A_FUNCTION_REG_PULLDOWNUP, (IS31FL3743A_SW_PULLDOWN << 4) | IS31FL3743A_CS_PULLUP);
+    is31fl3743a_write_register(addr, IS31FL3743A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3743A_GLOBAL_CURRENT);
+    is31fl3743a_write_register(addr, IS31FL3743A_FUNCTION_REG_SPREAD_SPECTRUM, (sync & 0b11) << 6);
+    is31fl3743a_write_register(addr, IS31FL3743A_FUNCTION_REG_CONFIGURATION, IS31FL3743A_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3743a_set_value(int index, uint8_t value) {
+    is31fl3743a_led_t led;
+    if (index >= 0 && index < IS31FL3743A_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3743a_leds[index]), sizeof(led));
+
+        if (g_pwm_buffer[led.driver][led.v] == value) {
+            return;
+        }
+        g_pwm_buffer_update_required[led.driver] = true;
+        g_pwm_buffer[led.driver][led.v]          = value;
+    }
+}
+
+void is31fl3743a_set_value_all(uint8_t value) {
+    for (int i = 0; i < IS31FL3743A_LED_COUNT; i++) {
+        is31fl3743a_set_value(i, value);
+    }
+}
+
+void is31fl3743a_set_scaling_register(uint8_t index, uint8_t value) {
+    is31fl3743a_led_t led;
+    memcpy_P(&led, (&g_is31fl3743a_leds[index]), sizeof(led));
+
+    g_scaling_registers[led.driver][led.v] = value;
+
+    g_scaling_registers_update_required[led.driver] = true;
+}
+
+void is31fl3743a_update_pwm_buffers(uint8_t addr, uint8_t index) {
+    if (g_pwm_buffer_update_required[index]) {
+        is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_PWM);
+
+        is31fl3743a_write_pwm_buffer(addr, g_pwm_buffer[index]);
+    }
+
+    g_pwm_buffer_update_required[index] = false;
+}
+
+void is31fl3743a_update_scaling_registers(uint8_t addr, uint8_t index) {
+    if (g_scaling_registers_update_required[index]) {
+        is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_SCALING);
+
+        for (int i = 0; i < IS31FL3743A_SCALING_REGISTER_COUNT; i++) {
+            is31fl3743a_write_register(addr, i + 1, g_scaling_registers[index][i]);
+        }
+        g_scaling_registers_update_required[index] = false;
+    }
+}
+
+void is31fl3743a_flush(void) {
+    is31fl3743a_update_pwm_buffers(IS31FL3743A_I2C_ADDRESS_1, 0);
+#if defined(IS31FL3743A_I2C_ADDRESS_2)
+    is31fl3743a_update_pwm_buffers(IS31FL3743A_I2C_ADDRESS_2, 1);
+#    if defined(IS31FL3743A_I2C_ADDRESS_3)
+    is31fl3743a_update_pwm_buffers(IS31FL3743A_I2C_ADDRESS_3, 2);
+#        if defined(IS31FL3743A_I2C_ADDRESS_4)
+    is31fl3743a_update_pwm_buffers(IS31FL3743A_I2C_ADDRESS_4, 3);
+#        endif
+#    endif
+#endif
+}

drivers/led/issi/is31fl3743a-simple.h

@@ -20,103 +20,105 @@
 
 #pragma once
 
-// This is a 7-bit address, that gets left-shifted and bit 0
-// set to 0 for write, 1 for read (as per I2C protocol)
-// The address will vary depending on your wiring:
-// 00 <-> GND
-// 01 <-> SCL
-// 10 <-> SDA
-// 11 <-> VCC
-// ADDR1 represents A1:A0 of the 7-bit address.
-// ADDR2 represents A3:A2 of the 7-bit address.
-// The result is: 0b010(ADDR2)(ADDR1)
-#ifndef DRIVER_ADDR_1
-#    define DRIVER_ADDR_1 0b0100000
+#include <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+#include "util.h"
+
+#define IS31FL3743A_REG_ID 0xFC
+
+#define IS31FL3743A_REG_COMMAND 0xFD
+
+#define IS31FL3743A_COMMAND_PWM 0x00
+#define IS31FL3743A_COMMAND_SCALING 0x01
+#define IS31FL3743A_COMMAND_FUNCTION 0x02
+
+#define IS31FL3743A_FUNCTION_REG_CONFIGURATION 0x00
+#define IS31FL3743A_FUNCTION_REG_GLOBAL_CURRENT 0x01
+#define IS31FL3743A_FUNCTION_REG_PULLDOWNUP 0x02
+#define IS31FL3743A_FUNCTION_REG_TEMPERATURE 0x24
+#define IS31FL3743A_FUNCTION_REG_SPREAD_SPECTRUM 0x25
+#define IS31FL3743A_FUNCTION_REG_RESET 0x2F
+
+#define IS31FL3743A_REG_COMMAND_WRITE_LOCK 0xFE
+#define IS31FL3743A_COMMAND_WRITE_LOCK_MAGIC 0xC5
+
+#define IS31FL3743A_I2C_ADDRESS_GND_GND 0x20
+#define IS31FL3743A_I2C_ADDRESS_GND_SCL 0x21
+#define IS31FL3743A_I2C_ADDRESS_GND_SDA 0x22
+#define IS31FL3743A_I2C_ADDRESS_GND_VCC 0x23
+#define IS31FL3743A_I2C_ADDRESS_SCL_GND 0x24
+#define IS31FL3743A_I2C_ADDRESS_SCL_SCL 0x25
+#define IS31FL3743A_I2C_ADDRESS_SCL_SDA 0x26
+#define IS31FL3743A_I2C_ADDRESS_SCL_VCC 0x27
+#define IS31FL3743A_I2C_ADDRESS_SDA_GND 0x28
+#define IS31FL3743A_I2C_ADDRESS_SDA_SCL 0x29
+#define IS31FL3743A_I2C_ADDRESS_SDA_SDA 0x2A
+#define IS31FL3743A_I2C_ADDRESS_SDA_VCC 0x2B
+#define IS31FL3743A_I2C_ADDRESS_VCC_GND 0x2C
+#define IS31FL3743A_I2C_ADDRESS_VCC_SCL 0x2D
+#define IS31FL3743A_I2C_ADDRESS_VCC_SDA 0x2E
+#define IS31FL3743A_I2C_ADDRESS_VCC_VCC 0x2F
+
+#if defined(LED_MATRIX_IS31FL3743A)
+#    define IS31FL3743A_LED_COUNT LED_MATRIX_LED_COUNT
 #endif
 
-// Set defaults for Spread Spectrum Register
-#ifndef ISSI_SSR_1
-#    ifndef DRIVER_ADDR_2
-#        define ISSI_SSR_1 0x00
-#    else
-#        define ISSI_SSR_1 0xC0
-#    endif
-#endif
-#ifndef ISSI_SSR_2
-#    define ISSI_SSR_2 0x80
-#endif
-#ifndef ISSI_SSR_3
-#    define ISSI_SSR_3 0x80
-#endif
-#ifndef ISSI_SSR_4
-#    define ISSI_SSR_4 0x80
+#if defined(IS31FL3743A_I2C_ADDRESS_4)
+#    define IS31FL3743A_DRIVER_COUNT 4
+#elif defined(IS31FL3743A_I2C_ADDRESS_3)
+#    define IS31FL3743A_DRIVER_COUNT 3
+#elif defined(IS31FL3743A_I2C_ADDRESS_2)
+#    define IS31FL3743A_DRIVER_COUNT 2
+#elif defined(IS31FL3743A_I2C_ADDRESS_1)
+#    define IS31FL3743A_DRIVER_COUNT 1
 #endif
 
-// Command Registers
-#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
-#define ISSI_COMMANDREGISTER 0xFD
-#define ISSI_IDREGISTER 0xFC
-#define ISSI_REGISTER_UNLOCK 0xC5
+typedef struct is31fl3743a_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3743a_led_t;
 
-// Response Registers
-#define ISSI_PAGE_PWM 0x00
-#define ISSI_PAGE_SCALING 0x01
-#define ISSI_PAGE_FUNCTION 0x02
+extern const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT];
 
-// Registers under Function Register
-#define ISSI_REG_CONFIGURATION 0x00
-#define ISSI_REG_GLOBALCURRENT 0x01
-#define ISSI_REG_PULLDOWNUP 0x02
-#define ISSI_REG_TEMP 0x24
-#define ISSI_REG_SSR 0x25
-#define ISSI_REG_RESET 0x2F
+void is31fl3743a_init_drivers(void);
+void is31fl3743a_init(uint8_t addr, uint8_t sync);
+void is31fl3743a_write_register(uint8_t addr, uint8_t reg, uint8_t data);
+void is31fl3743a_select_page(uint8_t addr, uint8_t page);
+void is31fl3743a_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
 
-// Set defaults for Function Registers
-#ifndef ISSI_CONFIGURATION
-#    define ISSI_CONFIGURATION 0x01
-#endif
-#ifndef ISSI_GLOBALCURRENT
-#    define ISSI_GLOBALCURRENT 0xFF
-#endif
-#ifndef ISSI_PULLDOWNUP
-#    define ISSI_PULLDOWNUP 0x33
-#endif
-#ifndef ISSI_TEMP
-#    define ISSI_TEMP 0x00
-#endif
+void is31fl3743a_set_value(int index, uint8_t value);
+void is31fl3743a_set_value_all(uint8_t value);
 
-// Set defaults for Scaling registers
-#ifndef ISSI_SCAL_RED
-#    define ISSI_SCAL_RED 0xFF
-#endif
-#ifndef ISSI_SCAL_BLUE
-#    define ISSI_SCAL_BLUE 0xFF
-#endif
-#ifndef ISSI_SCAL_GREEN
-#    define ISSI_SCAL_GREEN 0xFF
-#endif
-#define ISSI_SCAL_RED_OFF 0x00
-#define ISSI_SCAL_GREEN_OFF 0x00
-#define ISSI_SCAL_BLUE_OFF 0x00
+void is31fl3743a_set_scaling_register(uint8_t index, uint8_t value);
 
-#ifndef ISSI_SCAL_LED
-#    define ISSI_SCAL_LED 0xFF
-#endif
-#define ISSI_SCAL_LED_OFF 0x00
+void is31fl3743a_update_pwm_buffers(uint8_t addr, uint8_t index);
+void is31fl3743a_update_scaling_registers(uint8_t addr, uint8_t index);
 
-// Set buffer sizes
-#define ISSI_MAX_LEDS 198
-#define ISSI_SCALING_SIZE 198
-#define ISSI_PWM_TRF_SIZE 18
-#define ISSI_SCALING_TRF_SIZE 18
+void is31fl3743a_flush(void);
 
-// Location of 1st bit for PWM and Scaling registers
-#define ISSI_PWM_REG_1ST 0x01
-#define ISSI_SCL_REG_1ST 0x01
+#define IS31FL3743A_PDR_0_OHM 0b000          // No pull-down resistor
+#define IS31FL3743A_PDR_0K5_OHM_SW_OFF 0b001 // 0.5 kOhm resistor in SWx off time
+#define IS31FL3743A_PDR_1K_OHM_SW_OFF 0b010  // 1 kOhm resistor in SWx off time
+#define IS31FL3743A_PDR_2K_OHM_SW_OFF 0b011  // 2 kOhm resistor in SWx off time
+#define IS31FL3743A_PDR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3743A_PDR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3743A_PDR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3743A_PDR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3743A_PUR_0_OHM 0b000          // No pull-up resistor
+#define IS31FL3743A_PUR_0K5_OHM_CS_OFF 0b001 // 0.5 kOhm resistor in CSy off time
+#define IS31FL3743A_PUR_1K_OHM_CS_OFF 0b010  // 1 kOhm resistor in CSy off time
+#define IS31FL3743A_PUR_2K_OHM_CS_OFF 0b011  // 2 kOhm resistor in CSy off time
+#define IS31FL3743A_PUR_1K_OHM 0b100         // 1 kOhm resistor
+#define IS31FL3743A_PUR_2K_OHM 0b101         // 2 kOhm resistor
+#define IS31FL3743A_PUR_4K_OHM 0b110         // 4 kOhm resistor
+#define IS31FL3743A_PUR_8K_OHM 0b111         // 8 kOhm resistor
+
+#define IS31FL3743A_SYNC_NONE 0b00
+#define IS31FL3743A_SYNC_SLAVE 0b10
+#define IS31FL3743A_SYNC_MASTER 0b11
 
-// Map CS SW locations to order in PWM / Scaling buffers
-// This matches the ORDER in the Datasheet Register not the POSITION
-// It will always count from 0x00 to (ISSI_MAX_LEDS - 1)
 #define CS1_SW1 0x00
 #define CS2_SW1 0x01
 #define CS3_SW1 0x02

drivers/led/issi/is31fl3743a.c

@@ -0,0 +1,220 @@
+#include "is31fl3743a.h"
+#include <string.h>
+#include "i2c_master.h"
+#include "wait.h"
+
+#define IS31FL3743A_PWM_REGISTER_COUNT 198
+#define IS31FL3743A_SCALING_REGISTER_COUNT 198
+
+#ifndef IS31FL3743A_I2C_TIMEOUT
+#    define IS31FL3743A_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3743A_I2C_PERSISTENCE
+#    define IS31FL3743A_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3743A_CONFIGURATION
+#    define IS31FL3743A_CONFIGURATION 0x01
+#endif
+
+#ifndef IS31FL3743A_SW_PULLDOWN
+#    define IS31FL3743A_SW_PULLDOWN IS31FL3743A_PDR_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3743A_CS_PULLUP
+#    define IS31FL3743A_CS_PULLUP IS31FL3743A_PUR_2K_OHM_CS_OFF
+#endif
+
+#ifndef IS31FL3743A_GLOBAL_CURRENT
+#    define IS31FL3743A_GLOBAL_CURRENT 0xFF
+#endif
+
+#ifndef IS31FL3743A_SYNC_1
+#    define IS31FL3743A_SYNC_1 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_2
+#    define IS31FL3743A_SYNC_2 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_3
+#    define IS31FL3743A_SYNC_3 IS31FL3743A_SYNC_NONE
+#endif
+#ifndef IS31FL3743A_SYNC_4
+#    define IS31FL3743A_SYNC_4 IS31FL3743A_SYNC_NONE
+#endif
+
+uint8_t i2c_transfer_buffer[20] = {0xFF};
+
+uint8_t g_pwm_buffer[IS31FL3743A_DRIVER_COUNT][IS31FL3743A_PWM_REGISTER_COUNT];
+bool    g_pwm_buffer_update_required[IS31FL3743A_DRIVER_COUNT]        = {false};
+bool    g_scaling_registers_update_required[IS31FL3743A_DRIVER_COUNT] = {false};
+
+uint8_t g_scaling_registers[IS31FL3743A_DRIVER_COUNT][IS31FL3743A_SCALING_REGISTER_COUNT];
+
+void is31fl3743a_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+    i2c_transfer_buffer[0] = reg;
+    i2c_transfer_buffer[1] = data;
+
+#if IS31FL3743A_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3743A_I2C_PERSISTENCE; i++) {
+        if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3743A_I2C_TIMEOUT) == 0) break;
+    }
+#else
+    i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3743A_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3743a_select_page(uint8_t addr, uint8_t page) {
+    is31fl3743a_write_register(addr, IS31FL3743A_REG_COMMAND_WRITE_LOCK, IS31FL3743A_COMMAND_WRITE_LOCK_MAGIC);
+    is31fl3743a_write_register(addr, IS31FL3743A_REG_COMMAND, page);
+}
+
+void is31fl3743a_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+    // Assumes page 0 is already selected.
+    // If any of the transactions fails function returns false.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
+    // i2c_transfer_buffer[] is 20 bytes
+
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (int i = 0; i < IS31FL3743A_PWM_REGISTER_COUNT; i += 16) {
+        i2c_transfer_buffer[0] = i + 1;
+        // Copy the data from i to i+15.
+        // Device will auto-increment register for data after the first byte
+        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
+        memcpy(i2c_transfer_buffer + 1, pwm_buffer + i, 16);
+
+#if IS31FL3743A_I2C_PERSISTENCE > 0
+        for (uint8_t i = 0; i < IS31FL3743A_I2C_PERSISTENCE; i++) {
+            if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3743A_I2C_TIMEOUT) != 0) break;
+        }
+#else
+        i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3743A_I2C_TIMEOUT);
+#endif
+    }
+}
+
+void is31fl3743a_init_drivers(void) {
+    i2c_init();
+
+    is31fl3743a_init(IS31FL3743A_I2C_ADDRESS_1, IS31FL3743A_SYNC_1);
+#if defined(IS31FL3743A_I2C_ADDRESS_2)
+    is31fl3743a_init(IS31FL3743A_I2C_ADDRESS_2, IS31FL3743A_SYNC_2);
+#    if defined(IS31FL3743A_I2C_ADDRESS_3)
+    is31fl3743a_init(IS31FL3743A_I2C_ADDRESS_3, IS31FL3743A_SYNC_3);
+#        if defined(IS31FL3743A_I2C_ADDRESS_4)
+    is31fl3743a_init(IS31FL3743A_I2C_ADDRESS_4, IS31FL3743A_SYNC_4);
+#        endif
+#    endif
+#endif
+
+    for (int i = 0; i < IS31FL3743A_LED_COUNT; i++) {
+        is31fl3743a_set_scaling_register(i, 0xFF, 0xFF, 0xFF);
+    }
+
+    is31fl3743a_update_scaling_registers(IS31FL3743A_I2C_ADDRESS_1, 0);
+#if defined(IS31FL3743A_I2C_ADDRESS_2)
+    is31fl3743a_update_scaling_registers(IS31FL3743A_I2C_ADDRESS_2, 1);
+#    if defined(IS31FL3743A_I2C_ADDRESS_3)
+    is31fl3743a_update_scaling_registers(IS31FL3743A_I2C_ADDRESS_3, 2);
+#        if defined(IS31FL3743A_I2C_ADDRESS_4)
+    is31fl3743a_update_scaling_registers(IS31FL3743A_I2C_ADDRESS_4, 3);
+#        endif
+#    endif
+#endif
+}
+
+void is31fl3743a_init(uint8_t addr, uint8_t sync) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+
+    is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_SCALING);
+
+    // Turn off all LEDs.
+    for (int i = 0; i < IS31FL3743A_SCALING_REGISTER_COUNT; i++) {
+        is31fl3743a_write_register(addr, i + 1, 0x00);
+    }
+
+    is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_PWM);
+
+    for (int i = 0; i < IS31FL3743A_PWM_REGISTER_COUNT; i++) {
+        is31fl3743a_write_register(addr, i + 1, 0x00);
+    }
+
+    is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_FUNCTION);
+
+    is31fl3743a_write_register(addr, IS31FL3743A_FUNCTION_REG_PULLDOWNUP, (IS31FL3743A_SW_PULLDOWN << 4) | IS31FL3743A_CS_PULLUP);
+    is31fl3743a_write_register(addr, IS31FL3743A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3743A_GLOBAL_CURRENT);
+    is31fl3743a_write_register(addr, IS31FL3743A_FUNCTION_REG_SPREAD_SPECTRUM, (sync & 0b11) << 6);
+    is31fl3743a_write_register(addr, IS31FL3743A_FUNCTION_REG_CONFIGURATION, IS31FL3743A_CONFIGURATION);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void is31fl3743a_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3743a_led_t led;
+    if (index >= 0 && index < IS31FL3743A_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3743a_leds[index]), sizeof(led));
+
+        if (g_pwm_buffer[led.driver][led.r] == red && g_pwm_buffer[led.driver][led.g] == green && g_pwm_buffer[led.driver][led.b] == blue) {
+            return;
+        }
+        g_pwm_buffer_update_required[led.driver] = true;
+        g_pwm_buffer[led.driver][led.r]          = red;
+        g_pwm_buffer[led.driver][led.g]          = green;
+        g_pwm_buffer[led.driver][led.b]          = blue;
+    }
+}
+
+void is31fl3743a_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (int i = 0; i < IS31FL3743A_LED_COUNT; i++) {
+        is31fl3743a_set_color(i, red, green, blue);
+    }
+}
+
+void is31fl3743a_set_scaling_register(uint8_t index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3743a_led_t led;
+    memcpy_P(&led, (&g_is31fl3743a_leds[index]), sizeof(led));
+
+    g_scaling_registers[led.driver][led.r] = red;
+    g_scaling_registers[led.driver][led.g] = green;
+    g_scaling_registers[led.driver][led.b] = blue;
+
+    g_scaling_registers_update_required[led.driver] = true;
+}
+
+void is31fl3743a_update_pwm_buffers(uint8_t addr, uint8_t index) {
+    if (g_pwm_buffer_update_required[index]) {
+        is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_PWM);
+
+        is31fl3743a_write_pwm_buffer(addr, g_pwm_buffer[index]);
+    }
+
+    g_pwm_buffer_update_required[index] = false;
+}
+
+void is31fl3743a_update_scaling_registers(uint8_t addr, uint8_t index) {
+    if (g_scaling_registers_update_required[index]) {
+        is31fl3743a_select_page(addr, IS31FL3743A_COMMAND_SCALING);
+
+        for (int i = 0; i < IS31FL3743A_SCALING_REGISTER_COUNT; i++) {
+            is31fl3743a_write_register(addr, i + 1, g_scaling_registers[index][i]);
+        }
+        g_scaling_registers_update_required[index] = false;
+    }
+}
+
+void is31fl3743a_flush(void) {
+    is31fl3743a_update_pwm_buffers(IS31FL3743A_I2C_ADDRESS_1, 0);
+#if defined(IS31FL3743A_I2C_ADDRESS_2)
+    is31fl3743a_update_pwm_buffers(IS31FL3743A_I2C_ADDRESS_2, 1);
+#    if defined(IS31FL3743A_I2C_ADDRESS_3)
+    is31fl3743a_update_pwm_buffers(IS31FL3743A_I2C_ADDRESS_3, 2);
+#        if defined(IS31FL3743A_I2C_ADDRESS_4)
+    is31fl3743a_update_pwm_buffers(IS31FL3743A_I2C_ADDRESS_4, 3);
+#        endif
+#    endif
+#endif
+}

drivers/led/issi/is31flcommon.h

@@ -26,9 +26,7 @@
 #include "util.h"
 
 // Which variant header file to use
-#if defined(LED_MATRIX_IS31FL3743A) || defined(RGB_MATRIX_IS31FL3743A)
-#    include "is31fl3743.h"
-#elif defined(LED_MATRIX_IS31FL3745) || defined(RGB_MATRIX_IS31FL3745)
+#if defined(LED_MATRIX_IS31FL3745) || defined(RGB_MATRIX_IS31FL3745)
 #    include "is31fl3745.h"
 #elif defined(LED_MATRIX_IS31FL3746A) || defined(RGB_MATRIX_IS31FL3746A)
 #    include "is31fl3746.h"

keyboards/skyloong/gk61/pro/config.h

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#define IS31FL3743A_I2C_ADDRESS_1 IS31FL3743A_I2C_ADDRESS_GND_GND
+
 #define RGB_MATRIX_LED_COUNT 64
 #define CAPS_LOCK_INDEX 28
 #define WIN_MOD_INDEX 16

keyboards/skyloong/gk61/pro/pro.c

@@ -6,7 +6,7 @@ int FN_MAC = 0;
 int L_WIN = 0;
 int L_MAC = 0;
 
-const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location

keyboards/skyloong/gk61/pro_48/config.h

@@ -3,6 +3,8 @@
 
 #pragma once
 
+#define IS31FL3743A_I2C_ADDRESS_1 IS31FL3743A_I2C_ADDRESS_GND_GND
+
 #define RGB_MATRIX_LED_COUNT 64
 #define CAPS_LOCK_INDEX 28
 #define WIN_MOD_INDEX 16

keyboards/skyloong/gk61/pro_48/pro_48.c

@@ -7,7 +7,7 @@ _Bool L_WIN = 0;
 _Bool L_MAC = 0;
 
 #if defined(RGB_MATRIX_ENABLE)  /*&& defined(CAPS_LOCK_INDEX)*/
-const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location

quantum/led_matrix/led_matrix_drivers.c

@@ -81,6 +81,14 @@ const led_matrix_driver_t led_matrix_driver = {
     .set_value_all = is31fl3742a_set_value_all,
 };
 
+#elif defined(LED_MATRIX_IS31FL3743A)
+const led_matrix_driver_t led_matrix_driver = {
+    .init          = is31fl3743a_init_drivers,
+    .flush         = is31fl3743a_flush,
+    .set_value     = is31fl3743a_set_value,
+    .set_value_all = is31fl3743a_set_value_all,
+};
+
 #elif defined(IS31FLCOMMON)
 const led_matrix_driver_t led_matrix_driver = {
     .init          = IS31FL_simple_init_drivers,

quantum/led_matrix/led_matrix_drivers.h

@@ -19,6 +19,8 @@
 #    include "is31fl3741-simple.h"
 #elif defined(LED_MATRIX_IS31FL3742A)
 #    include "is31fl3742a-simple.h"
+#elif defined(LED_MATRIX_IS31FL3743A)
+#    include "is31fl3743a-simple.h"
 #elif defined(IS31FLCOMMON)
 #    include "is31flcommon.h"
 #elif defined(LED_MATRIX_SNLED27351)

quantum/rgb_matrix/rgb_matrix_drivers.c

@@ -84,6 +84,14 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
     .set_color_all = is31fl3742a_set_color_all,
 };
 
+#elif defined(RGB_MATRIX_IS31FL3743A)
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init          = is31fl3743a_init_drivers,
+    .flush         = is31fl3743a_flush,
+    .set_color     = is31fl3743a_set_color,
+    .set_color_all = is31fl3743a_set_color_all,
+};
+
 #elif defined(IS31FLCOMMON)
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init          = IS31FL_RGB_init_drivers,

quantum/rgb_matrix/rgb_matrix_drivers.h

@@ -21,6 +21,8 @@
 #    include "is31fl3741.h"
 #elif defined(RGB_MATRIX_IS31FL3742A)
 #    include "is31fl3742a.h"
+#elif defined(RGB_MATRIX_IS31FL3743A)
+#    include "is31fl3743a.h"
 #elif defined(IS31FLCOMMON)
 #    include "is31flcommon.h"
 #elif defined(RGB_MATRIX_SNLED27351)