summaryrefslogtreecommitdiffstats
path: root/drivers/avr/is31fl3731.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2018-06-12 23:37:06 -0400
committerJack Humbert <jack.humb@gmail.com>2018-06-12 23:37:06 -0400
commitbad56a4f2b91fc8591f6d33a1710ea0050abcfbf (patch)
treece6400e681028237464ac2f869249a17b00ab1e4 /drivers/avr/is31fl3731.c
parentb8564f5dd08f49ee0fc6d28957a376132bd7038d (diff)
adds timeout to avr i2c
Diffstat (limited to 'drivers/avr/is31fl3731.c')
-rw-r--r--drivers/avr/is31fl3731.c56
1 files changed, 32 insertions, 24 deletions
diff --git a/drivers/avr/is31fl3731.c b/drivers/avr/is31fl3731.c
index 13dfe6eaf6..158b77b7b1 100644
--- a/drivers/avr/is31fl3731.c
+++ b/drivers/avr/is31fl3731.c
@@ -78,18 +78,19 @@ bool g_led_control_registers_update_required = false;
// 0x10 - R16,R15,R14,R13,R12,R11,R10,R09
-void IS31FL3731_write_register( uint8_t addr, uint8_t reg, uint8_t data )
+uint8_t IS31FL3731_write_register( uint8_t addr, uint8_t reg, uint8_t data )
{
g_twi_transfer_buffer[0] = reg;
g_twi_transfer_buffer[1] = data;
//Transmit data until succesful
//while(i2c_transmit(addr << 1, g_twi_transfer_buffer,2) != 0);
- i2c_transmit(addr << 1, g_twi_transfer_buffer,2);
+ return i2c_transmit(addr << 1, g_twi_transfer_buffer,2);
}
-void IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer )
+uint8_t IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer )
{
+ uint8_t ret = 0;
// assumes bank is already selected
// transmit PWM registers in 9 transfers of 16 bytes
@@ -110,64 +111,67 @@ void IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer )
//Transmit buffer until succesful
//while(i2c_transmit(addr << 1, g_twi_transfer_buffer,17) != 0);
- i2c_transmit(addr << 1, g_twi_transfer_buffer,17);
-
+ ret |= i2c_transmit(addr << 1, g_twi_transfer_buffer, 17);
}
+ return ret;
}
-void IS31FL3731_init( uint8_t addr )
+uint8_t IS31FL3731_init( uint8_t addr )
{
+ uint8_t ret = 0;
// In order to avoid the LEDs being driven with garbage data
// in the LED driver's PWM registers, first enable software shutdown,
// then set up the mode and other settings, clear the PWM registers,
// then disable software shutdown.
// select "function register" bank
- IS31FL3731_write_register( addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG );
+ ret |= IS31FL3731_write_register( addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG );
// enable software shutdown
- IS31FL3731_write_register( addr, ISSI_REG_SHUTDOWN, 0x00 );
+ ret |= IS31FL3731_write_register( addr, ISSI_REG_SHUTDOWN, 0x00 );
// this delay was copied from other drivers, might not be needed
_delay_ms( 10 );
// picture mode
- IS31FL3731_write_register( addr, ISSI_REG_CONFIG, ISSI_REG_CONFIG_PICTUREMODE );
+ ret |= IS31FL3731_write_register( addr, ISSI_REG_CONFIG, ISSI_REG_CONFIG_PICTUREMODE );
// display frame 0
- IS31FL3731_write_register( addr, ISSI_REG_PICTUREFRAME, 0x00 );
+ ret |= IS31FL3731_write_register( addr, ISSI_REG_PICTUREFRAME, 0x00 );
// audio sync off
- IS31FL3731_write_register( addr, ISSI_REG_AUDIOSYNC, 0x00 );
+ ret |= IS31FL3731_write_register( addr, ISSI_REG_AUDIOSYNC, 0x00 );
// select bank 0
- IS31FL3731_write_register( addr, ISSI_COMMANDREGISTER, 0 );
+ ret |= IS31FL3731_write_register( addr, ISSI_COMMANDREGISTER, 0 );
// turn off all LEDs in the LED control register
for ( int i = 0x00; i <= 0x11; i++ )
{
- IS31FL3731_write_register( addr, i, 0x00 );
+ ret |= IS31FL3731_write_register( addr, i, 0x00 );
}
// turn off all LEDs in the blink control register (not really needed)
for ( int i = 0x12; i <= 0x23; i++ )
{
- IS31FL3731_write_register( addr, i, 0x00 );
+ ret |= IS31FL3731_write_register( addr, i, 0x00 );
}
// set PWM on all LEDs to 0
for ( int i = 0x24; i <= 0xB3; i++ )
{
- IS31FL3731_write_register( addr, i, 0x00 );
+ ret |= IS31FL3731_write_register( addr, i, 0x00 );
}
// select "function register" bank
- IS31FL3731_write_register( addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG );
+ ret |= IS31FL3731_write_register( addr, ISSI_COMMANDREGISTER, ISSI_BANK_FUNCTIONREG );
// disable software shutdown
- IS31FL3731_write_register( addr, ISSI_REG_SHUTDOWN, 0x01 );
+ ret |= IS31FL3731_write_register( addr, ISSI_REG_SHUTDOWN, 0x01 );
// select bank 0 and leave it selected.
// most usage after initialization is just writing PWM buffers in bank 0
// as there's not much point in double-buffering
- IS31FL3731_write_register( addr, ISSI_COMMANDREGISTER, 0 );
+ ret |= IS31FL3731_write_register( addr, ISSI_COMMANDREGISTER, 0 );
+
+ return ret;
}
void IS31FL3731_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
@@ -223,25 +227,29 @@ void IS31FL3731_set_led_control_register( uint8_t index, bool red, bool green, b
}
-void IS31FL3731_update_pwm_buffers( uint8_t addr1, uint8_t addr2 )
+uint8_t IS31FL3731_update_pwm_buffers( uint8_t addr1, uint8_t addr2 )
{
+ uint8_t ret = 0;
if ( g_pwm_buffer_update_required )
{
- IS31FL3731_write_pwm_buffer( addr1, g_pwm_buffer[0] );
- IS31FL3731_write_pwm_buffer( addr2, g_pwm_buffer[1] );
+ ret |= IS31FL3731_write_pwm_buffer( addr1, g_pwm_buffer[0] );
+ ret |= IS31FL3731_write_pwm_buffer( addr2, g_pwm_buffer[1] );
}
g_pwm_buffer_update_required = false;
+ return ret;
}
-void IS31FL3731_update_led_control_registers( uint8_t addr1, uint8_t addr2 )
+uint8_t IS31FL3731_update_led_control_registers( uint8_t addr1, uint8_t addr2 )
{
+ uint8_t ret = 0;
if ( g_led_control_registers_update_required )
{
for ( int i=0; i<18; i++ )
{
- IS31FL3731_write_register(addr1, i, g_led_control_registers[0][i] );
- IS31FL3731_write_register(addr2, i, g_led_control_registers[1][i] );
+ ret |= IS31FL3731_write_register(addr1, i, g_led_control_registers[0][i] );
+ ret |= IS31FL3731_write_register(addr2, i, g_led_control_registers[1][i] );
}
}
+ return ret;
}