From b624f32f944acdc59dcb130674c09090c5c404cb Mon Sep 17 00:00:00 2001 From: skullY Date: Fri, 30 Aug 2019 11:19:03 -0700 Subject: clang-format changes --- quantum/rgb_matrix_drivers.c | 110 ++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 60 deletions(-) (limited to 'quantum/rgb_matrix_drivers.c') diff --git a/quantum/rgb_matrix_drivers.c b/quantum/rgb_matrix_drivers.c index 4d8f05892c..5b54bd5956 100644 --- a/quantum/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix_drivers.c @@ -25,60 +25,57 @@ #if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FL3737) -#include "i2c_master.h" +# include "i2c_master.h" -static void init( void ) -{ +static void init(void) { i2c_init(); -#ifdef IS31FL3731 - IS31FL3731_init( DRIVER_ADDR_1 ); - IS31FL3731_init( DRIVER_ADDR_2 ); -#elif defined(IS31FL3733) - IS31FL3733_init( DRIVER_ADDR_1, 0 ); -#else - IS31FL3737_init( DRIVER_ADDR_1 ); -#endif - for ( int index = 0; index < DRIVER_LED_TOTAL; index++ ) { +# ifdef IS31FL3731 + IS31FL3731_init(DRIVER_ADDR_1); + IS31FL3731_init(DRIVER_ADDR_2); +# elif defined(IS31FL3733) + IS31FL3733_init(DRIVER_ADDR_1, 0); +# else + IS31FL3737_init(DRIVER_ADDR_1); +# endif + for (int index = 0; index < DRIVER_LED_TOTAL; index++) { bool enabled = true; // This only caches it for later -#ifdef IS31FL3731 - IS31FL3731_set_led_control_register( index, enabled, enabled, enabled ); -#elif defined(IS31FL3733) - IS31FL3733_set_led_control_register( index, enabled, enabled, enabled ); -#else - IS31FL3737_set_led_control_register( index, enabled, enabled, enabled ); -#endif +# ifdef IS31FL3731 + IS31FL3731_set_led_control_register(index, enabled, enabled, enabled); +# elif defined(IS31FL3733) + IS31FL3733_set_led_control_register(index, enabled, enabled, enabled); +# else + IS31FL3737_set_led_control_register(index, enabled, enabled, enabled); +# endif } // This actually updates the LED drivers -#ifdef IS31FL3731 - IS31FL3731_update_led_control_registers( DRIVER_ADDR_1, 0 ); - IS31FL3731_update_led_control_registers( DRIVER_ADDR_2, 1 ); -#elif defined(IS31FL3733) - IS31FL3733_update_led_control_registers( DRIVER_ADDR_1, 0 ); - IS31FL3733_update_led_control_registers( DRIVER_ADDR_2, 1 ); -#else - IS31FL3737_update_led_control_registers( DRIVER_ADDR_1, DRIVER_ADDR_2 ); -#endif +# ifdef IS31FL3731 + IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0); + IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1); +# elif defined(IS31FL3733) + IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0); + IS31FL3733_update_led_control_registers(DRIVER_ADDR_2, 1); +# else + IS31FL3737_update_led_control_registers(DRIVER_ADDR_1, DRIVER_ADDR_2); +# endif } -#ifdef IS31FL3731 -static void flush( void ) -{ - IS31FL3731_update_pwm_buffers( DRIVER_ADDR_1, 0 ); - IS31FL3731_update_pwm_buffers( DRIVER_ADDR_2, 1 ); +# ifdef IS31FL3731 +static void flush(void) { + IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0); + IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1); } const rgb_matrix_driver_t rgb_matrix_driver = { - .init = init, - .flush = flush, - .set_color = IS31FL3731_set_color, + .init = init, + .flush = flush, + .set_color = IS31FL3731_set_color, .set_color_all = IS31FL3731_set_color_all, }; -#elif defined(IS31FL3733) -static void flush( void ) -{ - IS31FL3733_update_pwm_buffers( DRIVER_ADDR_1, 0); - IS31FL3733_update_pwm_buffers( DRIVER_ADDR_2, 1); +# elif defined(IS31FL3733) +static void flush(void) { + IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0); + IS31FL3733_update_pwm_buffers(DRIVER_ADDR_2, 1); } const rgb_matrix_driver_t rgb_matrix_driver = { @@ -87,11 +84,8 @@ const rgb_matrix_driver_t rgb_matrix_driver = { .set_color = IS31FL3733_set_color, .set_color_all = IS31FL3733_set_color_all, }; -#else -static void flush( void ) -{ - IS31FL3737_update_pwm_buffers( DRIVER_ADDR_1, DRIVER_ADDR_2 ); -} +# else +static void flush(void) { IS31FL3737_update_pwm_buffers(DRIVER_ADDR_1, DRIVER_ADDR_2); } const rgb_matrix_driver_t rgb_matrix_driver = { .init = init, @@ -99,27 +93,23 @@ const rgb_matrix_driver_t rgb_matrix_driver = { .set_color = IS31FL3737_set_color, .set_color_all = IS31FL3737_set_color_all, }; -#endif +# endif #elif defined(WS2812) extern LED_TYPE led[DRIVER_LED_TOTAL]; - static void flush( void ) - { +static void flush(void) { // Assumes use of RGB_DI_PIN ws2812_setleds(led, DRIVER_LED_TOTAL); - } - - static void init( void ) - { +} - } +static void init(void) {} - const rgb_matrix_driver_t rgb_matrix_driver = { - .init = init, - .flush = flush, - .set_color = ws2812_setled, - .set_color_all = ws2812_setled_all, - }; +const rgb_matrix_driver_t rgb_matrix_driver = { + .init = init, + .flush = flush, + .set_color = ws2812_setled, + .set_color_all = ws2812_setled_all, +}; #endif -- cgit v1.2.3