From a5ea619139cb08f49cbfa440984ee2604f7104ba Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 9 Feb 2024 22:37:18 +1100 Subject: LED drivers: place I2C addresses into an array (#22975) --- drivers/led/issi/is31fl3742a-mono.c | 102 +++++++++++++++++------------------- 1 file changed, 47 insertions(+), 55 deletions(-) (limited to 'drivers/led/issi/is31fl3742a-mono.c') diff --git a/drivers/led/issi/is31fl3742a-mono.c b/drivers/led/issi/is31fl3742a-mono.c index 3a607f02d1..3bef22aabc 100644 --- a/drivers/led/issi/is31fl3742a-mono.c +++ b/drivers/led/issi/is31fl3742a-mono.c @@ -53,28 +53,41 @@ # define IS31FL3742A_GLOBAL_CURRENT 0xFF #endif +const uint8_t i2c_addresses[IS31FL3742A_DRIVER_COUNT] = { + IS31FL3742A_I2C_ADDRESS_1, +#ifdef IS31FL3742A_I2C_ADDRESS_2 + IS31FL3742A_I2C_ADDRESS_2, +# ifdef IS31FL3742A_I2C_ADDRESS_3 + IS31FL3742A_I2C_ADDRESS_3, +# ifdef IS31FL3742A_I2C_ADDRESS_4 + IS31FL3742A_I2C_ADDRESS_4, +# endif +# endif +#endif +}; + uint8_t g_pwm_buffer[IS31FL3742A_DRIVER_COUNT][IS31FL3742A_PWM_REGISTER_COUNT]; bool g_pwm_buffer_update_required[IS31FL3742A_DRIVER_COUNT] = {false}; bool g_scaling_registers_update_required[IS31FL3742A_DRIVER_COUNT] = {false}; uint8_t g_scaling_registers[IS31FL3742A_DRIVER_COUNT][IS31FL3742A_SCALING_REGISTER_COUNT]; -void is31fl3742a_write_register(uint8_t addr, uint8_t reg, uint8_t data) { +void is31fl3742a_write_register(uint8_t index, uint8_t reg, uint8_t data) { #if IS31FL3742A_I2C_PERSISTENCE > 0 for (uint8_t i = 0; i < IS31FL3742A_I2C_PERSISTENCE; i++) { - if (i2c_write_register(addr << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else - i2c_write_register(addr << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT); + i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT); #endif } -void is31fl3742a_select_page(uint8_t addr, uint8_t page) { - is31fl3742a_write_register(addr, IS31FL3742A_REG_COMMAND_WRITE_LOCK, IS31FL3742A_COMMAND_WRITE_LOCK_MAGIC); - is31fl3742a_write_register(addr, IS31FL3742A_REG_COMMAND, page); +void is31fl3742a_select_page(uint8_t index, uint8_t page) { + is31fl3742a_write_register(index, IS31FL3742A_REG_COMMAND_WRITE_LOCK, IS31FL3742A_COMMAND_WRITE_LOCK_MAGIC); + is31fl3742a_write_register(index, IS31FL3742A_REG_COMMAND, page); } -void is31fl3742a_write_pwm_buffer(uint8_t addr, uint8_t index) { +void is31fl3742a_write_pwm_buffer(uint8_t index) { // Assumes page 0 is already selected. // Transmit PWM registers in 6 transfers of 30 bytes. @@ -82,10 +95,10 @@ void is31fl3742a_write_pwm_buffer(uint8_t addr, uint8_t index) { for (uint8_t i = 0; i < IS31FL3742A_PWM_REGISTER_COUNT; i += 30) { #if IS31FL3742A_I2C_PERSISTENCE > 0 for (uint8_t j = 0; j < IS31FL3742A_I2C_PERSISTENCE; j++) { - if (i2c_write_register(addr << 1, i, g_pwm_buffer[index] + i, 30, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + if (i2c_write_register(i2c_addresses[index] << 1, i, g_pwm_buffer[index] + i, 30, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else - i2c_write_register(addr << 1, i, g_pwm_buffer[index] + i, 30, IS31FL3742A_I2C_TIMEOUT); + i2c_write_register(i2c_addresses[index] << 1, i, g_pwm_buffer[index] + i, 30, IS31FL3742A_I2C_TIMEOUT); #endif } } @@ -93,58 +106,44 @@ void is31fl3742a_write_pwm_buffer(uint8_t addr, uint8_t index) { void is31fl3742a_init_drivers(void) { i2c_init(); - is31fl3742a_init(IS31FL3742A_I2C_ADDRESS_1); -#if defined(IS31FL3742A_I2C_ADDRESS_2) - is31fl3742a_init(IS31FL3742A_I2C_ADDRESS_2); -# if defined(IS31FL3742A_I2C_ADDRESS_3) - is31fl3742a_init(IS31FL3742A_I2C_ADDRESS_3); -# if defined(IS31FL3742A_I2C_ADDRESS_4) - is31fl3742a_init(IS31FL3742A_I2C_ADDRESS_4); -# endif -# endif -#endif + for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) { + is31fl3742a_init(i); + } for (int i = 0; i < IS31FL3742A_LED_COUNT; i++) { is31fl3742a_set_scaling_register(i, 0xFF); } - is31fl3742a_update_scaling_registers(IS31FL3742A_I2C_ADDRESS_1, 0); -#if defined(IS31FL3742A_I2C_ADDRESS_2) - is31fl3742a_update_scaling_registers(IS31FL3742A_I2C_ADDRESS_2, 1); -# if defined(IS31FL3742A_I2C_ADDRESS_3) - is31fl3742a_update_scaling_registers(IS31FL3742A_I2C_ADDRESS_3, 2); -# if defined(IS31FL3742A_I2C_ADDRESS_4) - is31fl3742a_update_scaling_registers(IS31FL3742A_I2C_ADDRESS_4, 3); -# endif -# endif -#endif + for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) { + is31fl3742a_update_scaling_registers(i); + } } -void is31fl3742a_init(uint8_t addr) { +void is31fl3742a_init(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. - is31fl3742a_select_page(addr, IS31FL3742A_COMMAND_SCALING); + is31fl3742a_select_page(index, IS31FL3742A_COMMAND_SCALING); // Turn off all LEDs. for (uint8_t i = 0; i < IS31FL3742A_SCALING_REGISTER_COUNT; i++) { - is31fl3742a_write_register(addr, i, 0x00); + is31fl3742a_write_register(index, i, 0x00); } - is31fl3742a_select_page(addr, IS31FL3742A_COMMAND_PWM); + is31fl3742a_select_page(index, IS31FL3742A_COMMAND_PWM); for (uint8_t i = 0; i < IS31FL3742A_PWM_REGISTER_COUNT; i++) { - is31fl3742a_write_register(addr, i, 0x00); + is31fl3742a_write_register(index, i, 0x00); } - is31fl3742a_select_page(addr, IS31FL3742A_COMMAND_FUNCTION); + is31fl3742a_select_page(index, IS31FL3742A_COMMAND_FUNCTION); - is31fl3742a_write_register(addr, IS31FL3742A_FUNCTION_REG_PULLDOWNUP, (IS31FL3742A_SW_PULLDOWN << 4) | IS31FL3742A_CS_PULLUP); - is31fl3742a_write_register(addr, IS31FL3742A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3742A_GLOBAL_CURRENT); - is31fl3742a_write_register(addr, IS31FL3742A_FUNCTION_REG_PWM_FREQUENCY, (IS31FL3742A_PWM_FREQUENCY & 0b0111)); - is31fl3742a_write_register(addr, IS31FL3742A_FUNCTION_REG_CONFIGURATION, IS31FL3742A_CONFIGURATION); + is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_PULLDOWNUP, (IS31FL3742A_SW_PULLDOWN << 4) | IS31FL3742A_CS_PULLUP); + is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_GLOBAL_CURRENT, IS31FL3742A_GLOBAL_CURRENT); + is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_PWM_FREQUENCY, (IS31FL3742A_PWM_FREQUENCY & 0b0111)); + is31fl3742a_write_register(index, IS31FL3742A_FUNCTION_REG_CONFIGURATION, IS31FL3742A_CONFIGURATION); // Wait 10ms to ensure the device has woken up. wait_ms(10); @@ -179,22 +178,22 @@ void is31fl3742a_set_scaling_register(uint8_t index, uint8_t value) { g_scaling_registers_update_required[led.driver] = true; } -void is31fl3742a_update_pwm_buffers(uint8_t addr, uint8_t index) { +void is31fl3742a_update_pwm_buffers(uint8_t index) { if (g_pwm_buffer_update_required[index]) { - is31fl3742a_select_page(addr, IS31FL3742A_COMMAND_PWM); + is31fl3742a_select_page(index, IS31FL3742A_COMMAND_PWM); - is31fl3742a_write_pwm_buffer(addr, index); + is31fl3742a_write_pwm_buffer(index); g_pwm_buffer_update_required[index] = false; } } -void is31fl3742a_update_scaling_registers(uint8_t addr, uint8_t index) { +void is31fl3742a_update_scaling_registers(uint8_t index) { if (g_scaling_registers_update_required[index]) { - is31fl3742a_select_page(addr, IS31FL3742A_COMMAND_SCALING); + is31fl3742a_select_page(index, IS31FL3742A_COMMAND_SCALING); for (uint8_t i = 0; i < IS31FL3742A_SCALING_REGISTER_COUNT; i++) { - is31fl3742a_write_register(addr, i, g_scaling_registers[index][i]); + is31fl3742a_write_register(index, i, g_scaling_registers[index][i]); } g_scaling_registers_update_required[index] = false; @@ -202,14 +201,7 @@ void is31fl3742a_update_scaling_registers(uint8_t addr, uint8_t index) { } void is31fl3742a_flush(void) { - is31fl3742a_update_pwm_buffers(IS31FL3742A_I2C_ADDRESS_1, 0); -#if defined(IS31FL3742A_I2C_ADDRESS_2) - is31fl3742a_update_pwm_buffers(IS31FL3742A_I2C_ADDRESS_2, 1); -# if defined(IS31FL3742A_I2C_ADDRESS_3) - is31fl3742a_update_pwm_buffers(IS31FL3742A_I2C_ADDRESS_3, 2); -# if defined(IS31FL3742A_I2C_ADDRESS_4) - is31fl3742a_update_pwm_buffers(IS31FL3742A_I2C_ADDRESS_4, 3); -# endif -# endif -#endif + for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) { + is31fl3742a_update_pwm_buffers(i); + } } -- cgit v1.2.3