From b624f32f944acdc59dcb130674c09090c5c404cb Mon Sep 17 00:00:00 2001 From: skullY Date: Fri, 30 Aug 2019 11:19:03 -0700 Subject: clang-format changes --- drivers/issi/is31fl3737.c | 177 +++++++++++++++++++++------------------------- 1 file changed, 80 insertions(+), 97 deletions(-) (limited to 'drivers/issi/is31fl3737.c') diff --git a/drivers/issi/is31fl3737.c b/drivers/issi/is31fl3737.c index 6491049274..4cc46272e2 100644 --- a/drivers/issi/is31fl3737.c +++ b/drivers/issi/is31fl3737.c @@ -17,11 +17,11 @@ */ #ifdef __AVR__ -#include -#include -#include +# include +# include +# include #else -#include "wait.h" +# include "wait.h" #endif #include @@ -46,23 +46,23 @@ #define ISSI_INTERRUPTMASKREGISTER 0xF0 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1 -#define ISSI_PAGE_LEDCONTROL 0x00 //PG0 -#define ISSI_PAGE_PWM 0x01 //PG1 -#define ISSI_PAGE_AUTOBREATH 0x02 //PG2 -#define ISSI_PAGE_FUNCTION 0x03 //PG3 +#define ISSI_PAGE_LEDCONTROL 0x00 // PG0 +#define ISSI_PAGE_PWM 0x01 // PG1 +#define ISSI_PAGE_AUTOBREATH 0x02 // PG2 +#define ISSI_PAGE_FUNCTION 0x03 // PG3 -#define ISSI_REG_CONFIGURATION 0x00 //PG3 -#define ISSI_REG_GLOBALCURRENT 0x01 //PG3 -#define ISSI_REG_RESET 0x11// PG3 -#define ISSI_REG_SWPULLUP 0x0F //PG3 -#define ISSI_REG_CSPULLUP 0x10 //PG3 +#define ISSI_REG_CONFIGURATION 0x00 // PG3 +#define ISSI_REG_GLOBALCURRENT 0x01 // PG3 +#define ISSI_REG_RESET 0x11 // PG3 +#define ISSI_REG_SWPULLUP 0x0F // PG3 +#define ISSI_REG_CSPULLUP 0x10 // PG3 #ifndef ISSI_TIMEOUT - #define ISSI_TIMEOUT 100 +# define ISSI_TIMEOUT 100 #endif #ifndef ISSI_PERSISTENCE - #define ISSI_PERSISTENCE 0 +# define ISSI_PERSISTENCE 0 #endif // Transfer buffer for TWITransmitData() @@ -75,178 +75,161 @@ uint8_t g_twi_transfer_buffer[20]; // buffers and the transfers in IS31FL3737_write_pwm_buffer() but it's // probably not worth the extra complexity. uint8_t g_pwm_buffer[DRIVER_COUNT][192]; -bool g_pwm_buffer_update_required = false; +bool g_pwm_buffer_update_required = false; -uint8_t g_led_control_registers[DRIVER_COUNT][24] = { { 0 } }; -bool g_led_control_registers_update_required = false; +uint8_t g_led_control_registers[DRIVER_COUNT][24] = {{0}}; +bool g_led_control_registers_update_required = false; -void IS31FL3737_write_register( uint8_t addr, uint8_t reg, uint8_t data ) -{ +void IS31FL3737_write_register(uint8_t addr, uint8_t reg, uint8_t data) { g_twi_transfer_buffer[0] = reg; g_twi_transfer_buffer[1] = data; - #if ISSI_PERSISTENCE > 0 +#if ISSI_PERSISTENCE > 0 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) break; } - #else +#else i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT); - #endif +#endif } -void IS31FL3737_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer ) -{ +void IS31FL3737_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) { // assumes PG1 is already selected // transmit PWM registers in 12 transfers of 16 bytes // g_twi_transfer_buffer[] is 20 bytes // iterate over the pwm_buffer contents at 16 byte intervals - for ( int i = 0; i < 192; i += 16 ) { + for (int i = 0; i < 192; i += 16) { g_twi_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 - for ( int j = 0; j < 16; j++ ) { + for (int j = 0; j < 16; j++) { g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j]; } - #if ISSI_PERSISTENCE > 0 - for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) { - if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) == 0) - break; - } - #else - i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT); - #endif +#if ISSI_PERSISTENCE > 0 + for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) { + if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) == 0) break; + } +#else + i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT); +#endif } } -void IS31FL3737_init( uint8_t addr ) -{ +void IS31FL3737_init(uint8_t addr) { // In order to avoid the LEDs being driven with garbage data // in the LED driver's PWM registers, shutdown is enabled last. // Set up the mode and other settings, clear the PWM registers, // then disable software shutdown. // Unlock the command register. - IS31FL3737_write_register( addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5 ); + IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); // Select PG0 - IS31FL3737_write_register( addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL ); + IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); // Turn off all LEDs. - for ( int i = 0x00; i <= 0x17; i++ ) - { - IS31FL3737_write_register( addr, i, 0x00 ); + for (int i = 0x00; i <= 0x17; i++) { + IS31FL3737_write_register(addr, i, 0x00); } // Unlock the command register. - IS31FL3737_write_register( addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5 ); + IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); // Select PG1 - IS31FL3737_write_register( addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM ); + IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); // Set PWM on all LEDs to 0 // No need to setup Breath registers to PWM as that is the default. - for ( int i = 0x00; i <= 0xBF; i++ ) - { - IS31FL3737_write_register( addr, i, 0x00 ); + for (int i = 0x00; i <= 0xBF; i++) { + IS31FL3737_write_register(addr, i, 0x00); } // Unlock the command register. - IS31FL3737_write_register( addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5 ); + IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); // Select PG3 - IS31FL3737_write_register( addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION ); + IS31FL3737_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION); // Set global current to maximum. - IS31FL3737_write_register( addr, ISSI_REG_GLOBALCURRENT, 0xFF ); + IS31FL3737_write_register(addr, ISSI_REG_GLOBALCURRENT, 0xFF); // Disable software shutdown. - IS31FL3737_write_register( addr, ISSI_REG_CONFIGURATION, 0x01 ); + IS31FL3737_write_register(addr, ISSI_REG_CONFIGURATION, 0x01); - // Wait 10ms to ensure the device has woken up. - #ifdef __AVR__ - _delay_ms( 10 ); - #else +// Wait 10ms to ensure the device has woken up. +#ifdef __AVR__ + _delay_ms(10); +#else wait_ms(10); - #endif +#endif } -void IS31FL3737_set_color( int index, uint8_t red, uint8_t green, uint8_t blue ) -{ - if ( index >= 0 && index < DRIVER_LED_TOTAL ) { +void IS31FL3737_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { + if (index >= 0 && index < DRIVER_LED_TOTAL) { is31_led led = g_is31_leds[index]; g_pwm_buffer[led.driver][led.r] = red; g_pwm_buffer[led.driver][led.g] = green; g_pwm_buffer[led.driver][led.b] = blue; - g_pwm_buffer_update_required = true; + g_pwm_buffer_update_required = true; } } -void IS31FL3737_set_color_all( uint8_t red, uint8_t green, uint8_t blue ) -{ - for ( int i = 0; i < DRIVER_LED_TOTAL; i++ ) - { - IS31FL3737_set_color( i, red, green, blue ); +void IS31FL3737_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { + for (int i = 0; i < DRIVER_LED_TOTAL; i++) { + IS31FL3737_set_color(i, red, green, blue); } } -void IS31FL3737_set_led_control_register( uint8_t index, bool red, bool green, bool blue ) -{ +void IS31FL3737_set_led_control_register(uint8_t index, bool red, bool green, bool blue) { is31_led led = g_is31_leds[index]; - uint8_t control_register_r = led.r / 8; - uint8_t control_register_g = led.g / 8; - uint8_t control_register_b = led.b / 8; - uint8_t bit_r = led.r % 8; - uint8_t bit_g = led.g % 8; - uint8_t bit_b = led.b % 8; + uint8_t control_register_r = led.r / 8; + uint8_t control_register_g = led.g / 8; + uint8_t control_register_b = led.b / 8; + uint8_t bit_r = led.r % 8; + uint8_t bit_g = led.g % 8; + uint8_t bit_b = led.b % 8; - if ( red ) { + if (red) { g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r); } else { g_led_control_registers[led.driver][control_register_r] &= ~(1 << bit_r); } - if ( green ) { + if (green) { g_led_control_registers[led.driver][control_register_g] |= (1 << bit_g); } else { g_led_control_registers[led.driver][control_register_g] &= ~(1 << bit_g); } - if ( blue ) { + if (blue) { g_led_control_registers[led.driver][control_register_b] |= (1 << bit_b); } else { g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b); } g_led_control_registers_update_required = true; - } -void IS31FL3737_update_pwm_buffers( uint8_t addr1, uint8_t addr2 ) -{ - if ( g_pwm_buffer_update_required ) - { +void IS31FL3737_update_pwm_buffers(uint8_t addr1, uint8_t addr2) { + if (g_pwm_buffer_update_required) { // Firstly we need to unlock the command register and select PG1 - IS31FL3737_write_register( addr1, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5 ); - IS31FL3737_write_register( addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM ); + IS31FL3737_write_register(addr1, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); + IS31FL3737_write_register(addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM); - IS31FL3737_write_pwm_buffer( addr1, g_pwm_buffer[0] ); - //IS31FL3737_write_pwm_buffer( addr2, g_pwm_buffer[1] ); + IS31FL3737_write_pwm_buffer(addr1, g_pwm_buffer[0]); + // IS31FL3737_write_pwm_buffer( addr2, g_pwm_buffer[1] ); } g_pwm_buffer_update_required = false; } -void IS31FL3737_update_led_control_registers( uint8_t addr1, uint8_t addr2 ) -{ - if ( g_led_control_registers_update_required ) - { +void IS31FL3737_update_led_control_registers(uint8_t addr1, uint8_t addr2) { + if (g_led_control_registers_update_required) { // Firstly we need to unlock the command register and select PG0 - IS31FL3737_write_register( addr1, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5 ); - IS31FL3737_write_register( addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL ); - for ( int i=0; i<24; i++ ) - { - IS31FL3737_write_register(addr1, i, g_led_control_registers[0][i] ); - //IS31FL3737_write_register(addr2, i, g_led_control_registers[1][i] ); + IS31FL3737_write_register(addr1, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5); + IS31FL3737_write_register(addr1, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL); + for (int i = 0; i < 24; i++) { + IS31FL3737_write_register(addr1, i, g_led_control_registers[0][i]); + // IS31FL3737_write_register(addr2, i, g_led_control_registers[1][i] ); } } } -- cgit v1.2.3