update initial batch

This commit is contained in:
Xelus22 2025-01-26 11:55:57 +11:00
parent c93e8e0af2
commit eba10a7f22
5 changed files with 52 additions and 25 deletions

View File

@ -64,6 +64,9 @@
# define IS31FL3729_PWM_FREQUENCY IS31FL3729_PWM_FREQUENCY_32K_HZ # define IS31FL3729_PWM_FREQUENCY IS31FL3729_PWM_FREQUENCY_32K_HZ
#endif #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] = { const uint8_t i2c_addresses[IS31FL3729_DRIVER_COUNT] = {
IS31FL3729_I2C_ADDRESS_1, IS31FL3729_I2C_ADDRESS_1,
#ifdef IS31FL3729_I2C_ADDRESS_2 #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. // Storing them like this is optimal for I2C transfers to the registers.
typedef struct is31fl3729_driver_t { typedef struct is31fl3729_driver_t {
uint8_t pwm_buffer[IS31FL3729_PWM_REGISTER_COUNT]; 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]; uint8_t scaling_buffer[IS31FL3729_SCALING_REGISTER_COUNT];
bool scaling_buffer_dirty; bool scaling_buffer_dirty;
} PACKED is31fl3729_driver_t; } PACKED is31fl3729_driver_t;
is31fl3729_driver_t driver_buffers[IS31FL3729_DRIVER_COUNT] = {{ is31fl3729_driver_t driver_buffers[IS31FL3729_DRIVER_COUNT] = {{
.pwm_buffer = {0}, .pwm_buffer = {0},
.pwm_buffer_dirty = false, .pwm_buffer_dirty = {0},
.scaling_buffer = {0}, .scaling_buffer = {0},
.scaling_buffer_dirty = false, .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. // Transmit PWM registers in 11 transfers of 13 bytes.
// Iterate over the pwm_buffer contents at 13 byte intervals. // 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 #if IS31FL3729_I2C_PERSISTENCE > 0
for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) { 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 #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 #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[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) { void is31fl3729_update_pwm_buffers(uint8_t index) {
if (driver_buffers[index].pwm_buffer_dirty) { for (uint8_t i = 0; i < IS31FL3729_CHUNK_COUNT; i++) {
is31fl3729_write_pwm_buffer(index); if (driver_buffers[index].pwm_buffer_dirty[i]) {
// if any of these are true then write PWM buffer
driver_buffers[index].pwm_buffer_dirty = false; // then exit the loop
is31fl3729_write_pwm_buffer(index);
return;
}
} }
} }

View File

@ -121,7 +121,7 @@ void is31fl3729_write_pwm_buffer(uint8_t index) {
#if IS31FL3729_I2C_PERSISTENCE > 0 #if IS31FL3729_I2C_PERSISTENCE > 0
for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) { 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 #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); 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);

View File

@ -98,7 +98,7 @@ void is31fl3731_write_pwm_buffer(uint8_t index) {
#if IS31FL3731_I2C_PERSISTENCE > 0 #if IS31FL3731_I2C_PERSISTENCE > 0
for (uint8_t j = 0; j < IS31FL3731_I2C_PERSISTENCE; j++) { 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 #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); 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);

View File

@ -97,7 +97,7 @@ void is31fl3731_write_pwm_buffer(uint8_t index) {
#if IS31FL3731_I2C_PERSISTENCE > 0 #if IS31FL3731_I2C_PERSISTENCE > 0
for (uint8_t j = 0; j < IS31FL3731_I2C_PERSISTENCE; j++) { 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 #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); 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);

View File

@ -63,6 +63,9 @@
# define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE # define IS31FL3733_SYNC_4 IS31FL3733_SYNC_NONE
#endif #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] = { const uint8_t i2c_addresses[IS31FL3733_DRIVER_COUNT] = {
IS31FL3733_I2C_ADDRESS_1, IS31FL3733_I2C_ADDRESS_1,
#ifdef IS31FL3733_I2C_ADDRESS_2 #ifdef IS31FL3733_I2C_ADDRESS_2
@ -97,14 +100,14 @@ const uint8_t driver_sync[IS31FL3733_DRIVER_COUNT] = {
// probably not worth the extra complexity. // probably not worth the extra complexity.
typedef struct is31fl3733_driver_t { typedef struct is31fl3733_driver_t {
uint8_t pwm_buffer[IS31FL3733_PWM_REGISTER_COUNT]; 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]; uint8_t led_control_buffer[IS31FL3733_LED_CONTROL_REGISTER_COUNT];
bool led_control_buffer_dirty; bool led_control_buffer_dirty;
} PACKED is31fl3733_driver_t; } PACKED is31fl3733_driver_t;
is31fl3733_driver_t driver_buffers[IS31FL3733_DRIVER_COUNT] = {{ is31fl3733_driver_t driver_buffers[IS31FL3733_DRIVER_COUNT] = {{
.pwm_buffer = {0}, .pwm_buffer = {0},
.pwm_buffer_dirty = false, .pwm_buffer_dirty = {0},
.led_control_buffer = {0}, .led_control_buffer = {0},
.led_control_buffer_dirty = false, .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. // Transmit PWM registers in 12 transfers of 16 bytes.
// Iterate over the pwm_buffer contents at 16 byte intervals. // 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 #if IS31FL3733_I2C_PERSISTENCE > 0
for (uint8_t j = 0; j < IS31FL3733_I2C_PERSISTENCE; j++) { 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 #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 #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[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) { void is31fl3733_update_pwm_buffers(uint8_t index) {
if (driver_buffers[index].pwm_buffer_dirty) { for (uint8_t i = 0; i < IS31FL3733_CHUNK_COUNT; i++) {
is31fl3733_select_page(index, IS31FL3733_COMMAND_PWM); if (driver_buffers[index].pwm_buffer_dirty[i]) {
// if any of these are true then write PWM buffer
is31fl3733_write_pwm_buffer(index); // then exit the loop
is31fl3733_select_page(index, IS31FL3733_COMMAND_PWM);
driver_buffers[index].pwm_buffer_dirty = false; is31fl3733_write_pwm_buffer(index);
return;
}
} }
} }