diff options
Diffstat (limited to 'drivers/led/issi/is31fl3742a.c')
| -rw-r--r-- | drivers/led/issi/is31fl3742a.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/drivers/led/issi/is31fl3742a.c b/drivers/led/issi/is31fl3742a.c index 9b9a11ff32..51355517ac 100644 --- a/drivers/led/issi/is31fl3742a.c +++ b/drivers/led/issi/is31fl3742a.c @@ -19,7 +19,6 @@ */ #include "is31fl3742a.h" -#include <string.h> #include "i2c_master.h" #include "wait.h" @@ -54,8 +53,6 @@ # define IS31FL3742A_GLOBAL_CURRENT 0xFF #endif -uint8_t i2c_transfer_buffer[20] = {0xFF}; - 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}; @@ -63,15 +60,12 @@ 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) { - i2c_transfer_buffer[0] = reg; - i2c_transfer_buffer[1] = data; - #if IS31FL3742A_I2C_PERSISTENCE > 0 for (uint8_t i = 0; i < IS31FL3742A_I2C_PERSISTENCE; i++) { - if (i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3742A_I2C_TIMEOUT) == 0) break; + if (i2c_writeReg(addr << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else - i2c_transmit(addr << 1, i2c_transfer_buffer, 2, IS31FL3742A_I2C_TIMEOUT); + i2c_writeReg(addr << 1, reg, &data, 1, IS31FL3742A_I2C_TIMEOUT); #endif } @@ -82,24 +76,16 @@ void is31fl3742a_select_page(uint8_t addr, uint8_t page) { void is31fl3742a_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 < IS31FL3742A_PWM_REGISTER_COUNT; i += 16) { - i2c_transfer_buffer[0] = i; - // 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); + // Transmit PWM registers in 6 transfers of 30 bytes. + // Iterate over the pwm_buffer contents at 30 byte intervals. + for (uint8_t i = 0; i < IS31FL3742A_PWM_REGISTER_COUNT; i += 30) { #if IS31FL3742A_I2C_PERSISTENCE > 0 - for (uint8_t i = 0; i < IS31FL3742A_I2C_PERSISTENCE; i++) { - if (i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3742A_I2C_TIMEOUT) != 0) break; + for (uint8_t j = 0; j < IS31FL3742A_I2C_PERSISTENCE; j++) { + if (i2c_writeReg(addr << 1, i + 1, pwm_buffer + i, 30, IS31FL3742A_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else - i2c_transmit(addr << 1, i2c_transfer_buffer, 17, IS31FL3742A_I2C_TIMEOUT); + i2c_writeReg(addr << 1, i + 1, pwm_buffer + i, 30, IS31FL3742A_I2C_TIMEOUT); #endif } } |