From eba10a7f22f9865d45e8e2620faf9941e31381b2 Mon Sep 17 00:00:00 2001 From: Xelus22 <> Date: Sun, 26 Jan 2025 11:55:57 +1100 Subject: [PATCH] update initial batch --- drivers/led/issi/is31fl3729-mono.c | 34 +++++++++++++++++++-------- drivers/led/issi/is31fl3729.c | 2 +- drivers/led/issi/is31fl3731-mono.c | 2 +- drivers/led/issi/is31fl3731.c | 2 +- drivers/led/issi/is31fl3733-mono.c | 37 ++++++++++++++++++++---------- 5 files changed, 52 insertions(+), 25 deletions(-) diff --git a/drivers/led/issi/is31fl3729-mono.c b/drivers/led/issi/is31fl3729-mono.c index 13d5146877f..884862b8a1c 100644 --- a/drivers/led/issi/is31fl3729-mono.c +++ b/drivers/led/issi/is31fl3729-mono.c @@ -64,6 +64,9 @@ # define IS31FL3729_PWM_FREQUENCY IS31FL3729_PWM_FREQUENCY_32K_HZ #endif +#define IS31FL3729_PWM_REGISTERS_PER_CHUNK 13 +#define IS31FL3729_CHUNK_COUNT (IS31FL3729_PWM_REGISTER_COUNT / IS31FL3729_PWM_REGISTERS_PER_CHUNK) + const uint8_t i2c_addresses[IS31FL3729_DRIVER_COUNT] = { IS31FL3729_I2C_ADDRESS_1, #ifdef IS31FL3729_I2C_ADDRESS_2 @@ -81,14 +84,14 @@ const uint8_t i2c_addresses[IS31FL3729_DRIVER_COUNT] = { // Storing them like this is optimal for I2C transfers to the registers. typedef struct is31fl3729_driver_t { uint8_t pwm_buffer[IS31FL3729_PWM_REGISTER_COUNT]; - bool pwm_buffer_dirty; + bool pwm_buffer_dirty[IS31FL3729_CHUNK_COUNT]; uint8_t scaling_buffer[IS31FL3729_SCALING_REGISTER_COUNT]; bool scaling_buffer_dirty; } PACKED is31fl3729_driver_t; is31fl3729_driver_t driver_buffers[IS31FL3729_DRIVER_COUNT] = {{ .pwm_buffer = {0}, - .pwm_buffer_dirty = false, + .pwm_buffer_dirty = {0}, .scaling_buffer = {0}, .scaling_buffer_dirty = false, }}; @@ -107,13 +110,21 @@ void is31fl3729_write_pwm_buffer(uint8_t index) { // Transmit PWM registers in 11 transfers of 13 bytes. // Iterate over the pwm_buffer contents at 13 byte intervals. - for (uint8_t i = 0; i <= IS31FL3729_PWM_REGISTER_COUNT; i += 13) { + for (uint8_t i = 0; i <= IS31FL3729_CHUNK_COUNT; i++) { + if (!driver_buffers[index].pwm_buffer_dirty[i]) { + continue; + } + + driver_buffers[index].pwm_buffer_dirty[i] = false; + + uint8_t offset = i * IS31FL3729_PWM_REGISTERS_PER_CHUNK; + #if IS31FL3729_I2C_PERSISTENCE > 0 for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) { - if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + offset, driver_buffers[index].pwm_buffer + offset, IS31FL3729_PWM_REGISTERS_PER_CHUNK, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else - i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT); + i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + offset, driver_buffers[index].pwm_buffer + offset, IS31FL3729_PWM_REGISTERS_PER_CHUNK, IS31FL3729_I2C_TIMEOUT); #endif } } @@ -165,7 +176,7 @@ void is31fl3729_set_value(int index, uint8_t value) { } driver_buffers[led.driver].pwm_buffer[led.v] = value; - driver_buffers[led.driver].pwm_buffer_dirty = true; + driver_buffers[led.driver].pwm_buffer_dirty[led.v / IS31FL3729_PWM_REGISTERS_PER_CHUNK] = true; } } @@ -189,10 +200,13 @@ void is31fl3729_set_scaling_register(uint8_t index, uint8_t value) { } void is31fl3729_update_pwm_buffers(uint8_t index) { - if (driver_buffers[index].pwm_buffer_dirty) { - is31fl3729_write_pwm_buffer(index); - - driver_buffers[index].pwm_buffer_dirty = false; + for (uint8_t i = 0; i < IS31FL3729_CHUNK_COUNT; i++) { + if (driver_buffers[index].pwm_buffer_dirty[i]) { + // if any of these are true then write PWM buffer + // then exit the loop + is31fl3729_write_pwm_buffer(index); + return; + } } } diff --git a/drivers/led/issi/is31fl3729.c b/drivers/led/issi/is31fl3729.c index 79005686ddc..af9f49958c5 100644 --- a/drivers/led/issi/is31fl3729.c +++ b/drivers/led/issi/is31fl3729.c @@ -121,7 +121,7 @@ void is31fl3729_write_pwm_buffer(uint8_t index) { #if IS31FL3729_I2C_PERSISTENCE > 0 for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) { - if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + offset, driver_buffers[index].pwm_buffer + offset, IS31FL3729_PWM_REGISTERS_PER_CHUNK, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + offset, driver_buffers[index].pwm_buffer + offset, IS31FL3729_PWM_REGISTERS_PER_CHUNK, IS31FL3729_I2C_TIMEOUT); diff --git a/drivers/led/issi/is31fl3731-mono.c b/drivers/led/issi/is31fl3731-mono.c index 077fc16ce87..30d6bd8f960 100644 --- a/drivers/led/issi/is31fl3731-mono.c +++ b/drivers/led/issi/is31fl3731-mono.c @@ -98,7 +98,7 @@ void is31fl3731_write_pwm_buffer(uint8_t index) { #if IS31FL3731_I2C_PERSISTENCE > 0 for (uint8_t j = 0; j < IS31FL3731_I2C_PERSISTENCE; j++) { - if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3731_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + offset, driver_buffers[index].pwm_buffer + offset, IS31FL3731_PWM_REGISTERS_PER_CHUNK, IS31FL3731_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + offset, driver_buffers[index].pwm_buffer + offset, IS31FL3731_PWM_REGISTERS_PER_CHUNK, IS31FL3731_I2C_TIMEOUT); diff --git a/drivers/led/issi/is31fl3731.c b/drivers/led/issi/is31fl3731.c index 6ea50cac74a..af56dd92e41 100644 --- a/drivers/led/issi/is31fl3731.c +++ b/drivers/led/issi/is31fl3731.c @@ -97,7 +97,7 @@ void is31fl3731_write_pwm_buffer(uint8_t index) { #if IS31FL3731_I2C_PERSISTENCE > 0 for (uint8_t j = 0; j < IS31FL3731_I2C_PERSISTENCE; j++) { - if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3731_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + offset, driver_buffers[index].pwm_buffer + offset, IS31FL3731_PWM_REGISTERS_PER_CHUNK, IS31FL3731_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else i2c_write_register(i2c_addresses[index] << 1, IS31FL3731_FRAME_REG_PWM + offset, driver_buffers[index].pwm_buffer + offset, IS31FL3731_PWM_REGISTERS_PER_CHUNK, IS31FL3731_I2C_TIMEOUT); diff --git a/drivers/led/issi/is31fl3733-mono.c b/drivers/led/issi/is31fl3733-mono.c index 740fe060970..bf3e1103783 100644 --- a/drivers/led/issi/is31fl3733-mono.c +++ b/drivers/led/issi/is31fl3733-mono.c @@ -63,6 +63,9 @@ # define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE #endif +#define IS31FL3733_PWM_REGISTERS_PER_CHUNK 16 +#define IS31FL3733_CHUNK_COUNT (IS31FL3733_PWM_REGISTER_COUNT / IS31FL3733_PWM_REGISTERS_PER_CHUNK) + const uint8_t i2c_addresses[IS31FL3733_DRIVER_COUNT] = { IS31FL3733_I2C_ADDRESS_1, #ifdef IS31FL3733_I2C_ADDRESS_2 @@ -97,14 +100,14 @@ const uint8_t driver_sync[IS31FL3733_DRIVER_COUNT] = { // probably not worth the extra complexity. typedef struct is31fl3733_driver_t { uint8_t pwm_buffer[IS31FL3733_PWM_REGISTER_COUNT]; - bool pwm_buffer_dirty; + bool pwm_buffer_dirty[IS31FL3733_CHUNK_COUNT]; uint8_t led_control_buffer[IS31FL3733_LED_CONTROL_REGISTER_COUNT]; bool led_control_buffer_dirty; } PACKED is31fl3733_driver_t; is31fl3733_driver_t driver_buffers[IS31FL3733_DRIVER_COUNT] = {{ .pwm_buffer = {0}, - .pwm_buffer_dirty = false, + .pwm_buffer_dirty = {0}, .led_control_buffer = {0}, .led_control_buffer_dirty = false, }}; @@ -129,13 +132,21 @@ void is31fl3733_write_pwm_buffer(uint8_t index) { // Transmit PWM registers in 12 transfers of 16 bytes. // Iterate over the pwm_buffer contents at 16 byte intervals. - for (uint8_t i = 0; i < IS31FL3733_PWM_REGISTER_COUNT; i += 16) { + for (uint8_t i = 0; i < IS31FL3733_CHUNK_COUNT; i++) { + if (!driver_buffers[index].pwm_buffer_dirty[i]) { + continue; + } + + driver_buffers[index].pwm_buffer_dirty[i] = false; + + uint8_t offset = i * IS31FL3733_PWM_REGISTERS_PER_CHUNK; + #if IS31FL3733_I2C_PERSISTENCE > 0 for (uint8_t j = 0; j < IS31FL3733_I2C_PERSISTENCE; j++) { - if (i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; + if (i2c_write_register(i2c_addresses[index] << 1, offset, driver_buffers[index].pwm_buffer + offset, IS31FL3733_PWM_REGISTERS_PER_CHUNK, IS31FL3733_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break; } #else - i2c_write_register(i2c_addresses[index] << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3733_I2C_TIMEOUT); + i2c_write_register(i2c_addresses[index] << 1, offset, driver_buffers[index].pwm_buffer + offset, IS31FL3733_PWM_REGISTERS_PER_CHUNK, IS31FL3733_I2C_TIMEOUT); #endif } } @@ -210,7 +221,7 @@ void is31fl3733_set_value(int index, uint8_t value) { } driver_buffers[led.driver].pwm_buffer[led.v] = value; - driver_buffers[led.driver].pwm_buffer_dirty = true; + driver_buffers[led.driver].pwm_buffer_dirty[led.v / IS31FL3733_PWM_REGISTERS_PER_CHUNK] = true; } } @@ -237,12 +248,14 @@ void is31fl3733_set_led_control_register(uint8_t index, bool value) { } void is31fl3733_update_pwm_buffers(uint8_t index) { - if (driver_buffers[index].pwm_buffer_dirty) { - is31fl3733_select_page(index, IS31FL3733_COMMAND_PWM); - - is31fl3733_write_pwm_buffer(index); - - driver_buffers[index].pwm_buffer_dirty = false; + for (uint8_t i = 0; i < IS31FL3733_CHUNK_COUNT; i++) { + if (driver_buffers[index].pwm_buffer_dirty[i]) { + // if any of these are true then write PWM buffer + // then exit the loop + is31fl3733_select_page(index, IS31FL3733_COMMAND_PWM); + is31fl3733_write_pwm_buffer(index); + return; + } } }