|
@@ -24,10 +24,10 @@
|
|
# include "wait.h"
|
|
# include "wait.h"
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#include "is31fl3733.h"
|
|
|
|
#include <string.h>
|
|
#include <string.h>
|
|
#include "i2c_master.h"
|
|
#include "i2c_master.h"
|
|
#include "progmem.h"
|
|
#include "progmem.h"
|
|
|
|
+#include "is31fl3733.h"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -80,43 +80,54 @@ bool g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
|
|
uint8_t g_led_control_registers[DRIVER_COUNT][24] = {{0}, {0}};
|
|
uint8_t g_led_control_registers[DRIVER_COUNT][24] = {{0}, {0}};
|
|
bool g_led_control_registers_update_required[DRIVER_COUNT] = {false};
|
|
bool g_led_control_registers_update_required[DRIVER_COUNT] = {false};
|
|
|
|
|
|
-void IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
|
|
+bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
|
|
|
|
+
|
|
g_twi_transfer_buffer[0] = reg;
|
|
g_twi_transfer_buffer[0] = reg;
|
|
g_twi_transfer_buffer[1] = data;
|
|
g_twi_transfer_buffer[1] = data;
|
|
|
|
|
|
#if ISSI_PERSISTENCE > 0
|
|
#if ISSI_PERSISTENCE > 0
|
|
for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
|
|
for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
|
|
- if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) == 0) break;
|
|
+ if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
- i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT);
|
|
+ if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
#endif
|
|
#endif
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
|
|
|
|
-void IS31FL3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
|
|
+bool IS31FL3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
|
|
-
|
|
+
|
|
-
|
|
+
|
|
-
|
|
+
|
|
|
|
|
|
|
|
|
|
-
|
|
+
|
|
for (int i = 0; i < 192; i += 16) {
|
|
for (int i = 0; i < 192; i += 16) {
|
|
g_twi_transfer_buffer[0] = i;
|
|
g_twi_transfer_buffer[0] = i;
|
|
-
|
|
+
|
|
-
|
|
+
|
|
-
|
|
+
|
|
for (int j = 0; j < 16; j++) {
|
|
for (int j = 0; j < 16; j++) {
|
|
g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
|
|
g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
|
|
}
|
|
}
|
|
|
|
|
|
#if ISSI_PERSISTENCE > 0
|
|
#if ISSI_PERSISTENCE > 0
|
|
for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
|
|
for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
|
|
- if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) == 0) break;
|
|
+ if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
- i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT);
|
|
+ if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
#endif
|
|
#endif
|
|
}
|
|
}
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
|
|
|
|
void IS31FL3733_init(uint8_t addr, uint8_t sync) {
|
|
void IS31FL3733_init(uint8_t addr, uint8_t sync) {
|
|
@@ -213,11 +224,15 @@ void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bo
|
|
|
|
|
|
void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
|
|
void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
|
|
if (g_pwm_buffer_update_required[index]) {
|
|
if (g_pwm_buffer_update_required[index]) {
|
|
-
|
|
+
|
|
IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
|
|
IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
|
|
IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
|
|
IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
|
|
|
|
|
|
- IS31FL3733_write_pwm_buffer(addr, g_pwm_buffer[index]);
|
|
+
|
|
|
|
+
|
|
|
|
+ if (!IS31FL3733_write_pwm_buffer(addr, g_pwm_buffer[index])){
|
|
|
|
+ g_led_control_registers_update_required[index] = true;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
g_pwm_buffer_update_required[index] = false;
|
|
g_pwm_buffer_update_required[index] = false;
|
|
}
|
|
}
|
|
@@ -231,6 +246,5 @@ void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index) {
|
|
IS31FL3733_write_register(addr, i, g_led_control_registers[index][i]);
|
|
IS31FL3733_write_register(addr, i, g_led_control_registers[index][i]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
+ g_led_control_registers_update_required[index] = false;
|
|
-
|
|
|
|
}
|
|
}
|