diff options
author | Ryan <fauxpark@gmail.com> | 2024-02-09 22:37:18 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-09 22:37:18 +1100 |
commit | a5ea619139cb08f49cbfa440984ee2604f7104ba (patch) | |
tree | 3c74866000ad48901829c4bd60ef4b704a130f26 /keyboards/input_club | |
parent | 137938b67afbf35fd34f2e5cbe3c5c6367a1d0cc (diff) |
LED drivers: place I2C addresses into an array (#22975)
Diffstat (limited to 'keyboards/input_club')
-rw-r--r-- | keyboards/input_club/k_type/is31fl3733-dual.c | 79 | ||||
-rw-r--r-- | keyboards/input_club/k_type/is31fl3733-dual.h | 6 |
2 files changed, 50 insertions, 35 deletions
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c index dce371d444..60b251cc5a 100644 --- a/keyboards/input_club/k_type/is31fl3733-dual.c +++ b/keyboards/input_club/k_type/is31fl3733-dual.c @@ -60,6 +60,20 @@ # define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE #endif +const uint8_t i2c_addresses[IS31FL3733_DRIVER_COUNT] = { + IS31FL3733_I2C_ADDRESS_1, +#ifdef IS31FL3733_I2C_ADDRESS_2 + IS31FL3733_I2C_ADDRESS_2, +#endif +}; + +const uint8_t driver_sync[IS31FL3733_DRIVER_COUNT] = { + IS31FL3733_SYNC_1, +#ifdef IS31FL3733_I2C_ADDRESS_2 + IS31FL3733_SYNC_2, +#endif +}; + // These buffers match the IS31FL3733 PWM registers. // The control buffers match the page 0 LED On/Off registers. // Storing them like this is optimal for I2C transfers to the registers. @@ -72,22 +86,22 @@ bool g_pwm_buffer_update_required[IS31FL3733_DRIVER_COUNT] = {false}; uint8_t g_led_control_registers[IS31FL3733_DRIVER_COUNT][IS31FL3733_LED_CONTROL_REGISTER_COUNT] = {0}; bool g_led_control_registers_update_required[IS31FL3733_DRIVER_COUNT] = {false}; -void is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data) { +void is31fl3733_write_register(uint8_t bus, uint8_t index, uint8_t reg, uint8_t data) { #if IS31FL3733_I2C_PERSISTENCE > 0 for (uint8_t i = 0; i < IS31FL3733_I2C_PERSISTENCE; i++) { - if (i2c_write_register(index, addr << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + if (i2c_write_register(bus, i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else - i2c_write_register(index, addr << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT); + i2c_write_register(bus, i2c_addresses[index] << 1, reg, &data, 1, IS31FL3733_I2C_TIMEOUT); #endif } -void is31fl3733_select_page(uint8_t index, uint8_t addr, uint8_t page) { - is31fl3733_write_register(index, addr, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC); - is31fl3733_write_register(index, addr, IS31FL3733_REG_COMMAND, page); +void is31fl3733_select_page(uint8_t bus, uint8_t index, uint8_t page) { + is31fl3733_write_register(bus, index, IS31FL3733_REG_COMMAND_WRITE_LOCK, IS31FL3733_COMMAND_WRITE_LOCK_MAGIC); + is31fl3733_write_register(bus, index, IS31FL3733_REG_COMMAND, page); } -void is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t index) { +void is31fl3733_write_pwm_buffer(uint8_t bus, uint8_t index) { // Assumes page 1 is already selected. // Transmit PWM registers in 12 transfers of 16 bytes. @@ -95,10 +109,10 @@ void is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t index) { for (uint8_t i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) { #if IS31FL3733_I2C_PERSISTENCE > 0 for (uint8_t j = 0; j < IS31FL3733_I2C_PERSISTENCE; j++) { - if (i2c_write_register(index, addr << 1, i, g_pwm_buffer[index] + i, 16, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + if (i2c_write_register(bus, i2c_addresses[index] << 1, i, g_pwm_buffer[index] + i, 16, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else - i2c_write_register(index, addr << 1, i, g_pwm_buffer[index] + i, 16, IS31FL3733_I2C_TIMEOUT); + i2c_write_register(bus, i2c_addresses[index] << 1, i, g_pwm_buffer[index] + i, 16, IS31FL3733_I2C_TIMEOUT); #endif } } @@ -106,54 +120,55 @@ void is31fl3733_write_pwm_buffer(uint8_t addr, uint8_t index) { void is31fl3733_init_drivers(void) { i2c_init(&I2CD1, I2C1_SCL_PIN, I2C1_SDA_PIN); - is31fl3733_init(0, IS31FL3733_I2C_ADDRESS_1, IS31FL3733_SYNC_1); + is31fl3733_init(0, 0); # ifdef USE_I2C2 i2c_init(&I2CD2, I2C2_SCL_PIN, I2C2_SDA_PIN); - is31fl3733_init(1, IS31FL3733_I2C_ADDRESS_2, IS31FL3733_SYNC_2); + is31fl3733_init(1, 1); # endif for (int i = 0; i < IS31FL3733_LED_COUNT; i++) { is31fl3733_set_led_control_register(i, true, true, true); } - is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_1, 0); + is31fl3733_update_led_control_registers(0, 0); # ifdef USE_I2C2 - is31fl3733_update_led_control_registers(IS31FL3733_I2C_ADDRESS_2, 1); + is31fl3733_update_led_control_registers(1, 1); # endif } -void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync) { +void is31fl3733_init(uint8_t bus, uint8_t index) { // 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. - // Sync is passed so set it according to the datasheet. - is31fl3733_select_page(bus, addr, IS31FL3733_COMMAND_LED_CONTROL); + is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_LED_CONTROL); // Turn off all LEDs. for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) { - is31fl3733_write_register(bus, addr, i, 0x00); + is31fl3733_write_register(bus, index, i, 0x00); } - is31fl3733_select_page(bus, addr, IS31FL3733_COMMAND_PWM); + is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_PWM); // Set PWM on all LEDs to 0 // No need to setup Breath registers to PWM as that is the default. for (int i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i++) { - is31fl3733_write_register(bus, addr, i, 0x00); + is31fl3733_write_register(bus, index, i, 0x00); } - is31fl3733_select_page(bus, addr, IS31FL3733_COMMAND_FUNCTION); + is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_FUNCTION); + + uint8_t sync = driver_sync[index]; // Set de-ghost pull-up resistors (SWx) - is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP); + is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_SW_PULLUP, IS31FL3733_SW_PULLUP); // Set de-ghost pull-down resistors (CSx) - is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN); + is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_CS_PULLDOWN, IS31FL3733_CS_PULLDOWN); // Set global current to maximum. - is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT); + is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3733_GLOBAL_CURRENT); // Disable software shutdown. - is31fl3733_write_register(bus, addr, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01); + is31fl3733_write_register(bus, index, IS31FL3733_FUNCTION_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((IS31FL3733_PWM_FREQUENCY & 0b111) << 3) | 0x01); // Wait 10ms to ensure the device has woken up. wait_ms(10); @@ -212,22 +227,22 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo g_led_control_registers_update_required[led.driver] = true; } -void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index) { +void is31fl3733_update_pwm_buffers(uint8_t bus, uint8_t index) { if (g_pwm_buffer_update_required[index]) { - is31fl3733_select_page(index, addr, IS31FL3733_COMMAND_PWM); + is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_PWM); - is31fl3733_write_pwm_buffer(addr, index); + is31fl3733_write_pwm_buffer(bus, index); g_pwm_buffer_update_required[index] = false; } } -void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) { +void is31fl3733_update_led_control_registers(uint8_t bus, uint8_t index) { if (g_led_control_registers_update_required[index]) { - is31fl3733_select_page(index, addr, IS31FL3733_COMMAND_LED_CONTROL); + is31fl3733_select_page(bus, index, IS31FL3733_COMMAND_LED_CONTROL); for (int i = 0; i < IS31FL3733_LED_CONTROL_REGISTER_COUNT; i++) { - is31fl3733_write_register(index, addr, i, g_led_control_registers[index][i]); + is31fl3733_write_register(bus, index, i, g_led_control_registers[index][i]); } g_led_control_registers_update_required[index] = false; @@ -235,8 +250,8 @@ void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index) { } void is31fl3733_flush(void) { - is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_1, 0); + is31fl3733_update_pwm_buffers(0, 0); # ifdef USE_I2C2 - is31fl3733_update_pwm_buffers(IS31FL3733_I2C_ADDRESS_2, 1); + is31fl3733_update_pwm_buffers(1, 1); # endif } diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h index 1237fc77d1..b7e3eb54e7 100644 --- a/keyboards/input_club/k_type/is31fl3733-dual.h +++ b/keyboards/input_club/k_type/is31fl3733-dual.h @@ -83,7 +83,7 @@ typedef struct is31fl3733_led_t { extern const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT]; void is31fl3733_init_drivers(void); -void is31fl3733_init(uint8_t bus, uint8_t addr, uint8_t sync); +void is31fl3733_init(uint8_t bus, uint8_t index); void is31fl3733_write_register(uint8_t index, uint8_t addr, uint8_t reg, uint8_t data); void is31fl3733_select_page(uint8_t index, uint8_t addr, uint8_t page); @@ -96,8 +96,8 @@ void is31fl3733_set_led_control_register(uint8_t index, bool red, bool green, bo // (eg. from a timer interrupt). // Call this while idle (in between matrix scans). // If the buffer is dirty, it will update the driver with the buffer. -void is31fl3733_update_pwm_buffers(uint8_t addr, uint8_t index); // index is the driver index -void is31fl3733_update_led_control_registers(uint8_t addr, uint8_t index); +void is31fl3733_update_pwm_buffers(uint8_t bus, uint8_t index); +void is31fl3733_update_led_control_registers(uint8_t bus, uint8_t index); void is31fl3733_flush(void); |