From 5e269df820192ce963d4c672b652d11cf46f51b5 Mon Sep 17 00:00:00 2001 From: zvecr Date: Mon, 26 Jul 2021 01:13:07 +0100 Subject: [PATCH 1/6] Align AW20216 driver --- drivers/awinic/aw20216.c | 121 +++++++----------------- drivers/awinic/aw20216.h | 5 +- quantum/rgb_matrix/rgb_matrix_drivers.c | 12 ++- 3 files changed, 48 insertions(+), 90 deletions(-) diff --git a/drivers/awinic/aw20216.c b/drivers/awinic/aw20216.c index 776653fa6c10..f1140741a037 100644 --- a/drivers/awinic/aw20216.c +++ b/drivers/awinic/aw20216.c @@ -45,8 +45,6 @@ #define AW_PWM_REGISTER_COUNT 216 -#define AW_SPI_START(PIN) spi_start(PIN, false, 0, AW_SPI_DIVISOR) - #ifndef AW_SCALING_MAX # define AW_SCALING_MAX 150 #endif @@ -55,128 +53,79 @@ # define AW_GLOBAL_CURRENT_MAX 150 #endif -#ifndef DRIVER_1_CS -# define DRIVER_1_CS B13 -#endif - -#ifndef DRIVER_1_EN -# define DRIVER_1_EN C13 -#endif - #ifndef AW_SPI_DIVISOR # define AW_SPI_DIVISOR 4 #endif -uint8_t g_spi_transfer_buffer[3] = {0}; uint8_t g_pwm_buffer[DRIVER_COUNT][AW_PWM_REGISTER_COUNT]; bool g_pwm_buffer_update_required[DRIVER_COUNT] = {false}; -bool AW20216_write_register(pin_t slave_pin, uint8_t page, uint8_t reg, uint8_t data) { +bool AW20216_write(pin_t cs_pin, uint8_t page, uint8_t reg, uint8_t* data, uint8_t len) { + static uint8_t s_spi_transfer_buffer[2] = {0}; + // Do we need to call spi_stop() if this fails? - if (!AW_SPI_START(slave_pin)) { + if (!spi_start(cs_pin, false, 0, AW_SPI_DIVISOR)) { return false; } - g_spi_transfer_buffer[0] = (AWINIC_ID | page | AW_WRITE); - g_spi_transfer_buffer[1] = reg; - g_spi_transfer_buffer[2] = data; + s_spi_transfer_buffer[0] = (AWINIC_ID | page | AW_WRITE); + s_spi_transfer_buffer[1] = reg; - if (spi_transmit(g_spi_transfer_buffer, 3) != SPI_STATUS_SUCCESS) { + if (spi_transmit(s_spi_transfer_buffer, 2) != SPI_STATUS_SUCCESS) { spi_stop(); return false; } - spi_stop(); - return true; -} -bool AW20216_init_scaling(void) { - // Set constant current to the max, control brightness with PWM - aw_led led; - for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { - led = g_aw_leds[i]; - if (led.driver == 0) { - AW20216_write_register(DRIVER_1_CS, AW_PAGE_SCALING, led.r, AW_SCALING_MAX); - AW20216_write_register(DRIVER_1_CS, AW_PAGE_SCALING, led.g, AW_SCALING_MAX); - AW20216_write_register(DRIVER_1_CS, AW_PAGE_SCALING, led.b, AW_SCALING_MAX); - } -#ifdef DRIVER_2_CS - else if (led.driver == 1) { - AW20216_write_register(DRIVER_2_CS, AW_PAGE_SCALING, led.r, AW_SCALING_MAX); - AW20216_write_register(DRIVER_2_CS, AW_PAGE_SCALING, led.g, AW_SCALING_MAX); - AW20216_write_register(DRIVER_2_CS, AW_PAGE_SCALING, led.b, AW_SCALING_MAX); - } -#endif + if (spi_transmit(data, len) != SPI_STATUS_SUCCESS) { + spi_stop(); + return false; } + + spi_stop(); return true; } -bool AW20216_soft_enable(void) { - AW20216_write_register(DRIVER_1_CS, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN); -#ifdef DRIVER_2_CS - AW20216_write_register(DRIVER_2_CS, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN); -#endif - return true; +static inline bool AW20216_write_register(pin_t cs_pin, uint8_t page, uint8_t reg, uint8_t value) { + // Little wrapper so callers need not care about sending a buffer + return AW20216_write(cs_pin, page, reg, &value, 1); } -void AW20216_update_pwm(int index, uint8_t red, uint8_t green, uint8_t blue) { - aw_led led = g_aw_leds[index]; - if (led.driver == 0) { - AW20216_write_register(DRIVER_1_CS, AW_PAGE_PWM, led.r, red); - AW20216_write_register(DRIVER_1_CS, AW_PAGE_PWM, led.g, green); - AW20216_write_register(DRIVER_1_CS, AW_PAGE_PWM, led.b, blue); - } -#ifdef DRIVER_2_CS - else if (led.driver == 1) { - AW20216_write_register(DRIVER_2_CS, AW_PAGE_PWM, led.r, red); - AW20216_write_register(DRIVER_2_CS, AW_PAGE_PWM, led.g, green); - AW20216_write_register(DRIVER_2_CS, AW_PAGE_PWM, led.b, blue); +static void AW20216_init_scaling(pin_t cs_pin) { + // Set constant current to the max, control brightness with PWM + for (uint8_t i = 0; i < AW_PWM_REGISTER_COUNT; i++) { + AW20216_write_register(cs_pin, AW_PAGE_SCALING, i, AW_SCALING_MAX); } -#endif - return; } -void AW20216_init(void) { +void AW20216_init(pin_t cs_pin, pin_t en_pin) { // All LEDs should start with all scaling and PWM registers as off - setPinOutput(DRIVER_1_EN); - writePinHigh(DRIVER_1_EN); - AW20216_write_register(DRIVER_1_CS, AW_PAGE_FUNCTION, AW_REG_GLOBALCURRENT, AW_GLOBAL_CURRENT_MAX); -#ifdef DRIVER_2_EN - setPinOutput(DRIVER_2_EN); - writePinHigh(DRIVER_2_EN); - AW20216_write_register(DRIVER_2_CS, AW_PAGE_FUNCTION, AW_REG_GLOBALCURRENT, AW_GLOBAL_CURRENT_MAX); -#endif - AW20216_init_scaling(); - AW20216_soft_enable(); - return; + setPinOutput(en_pin); + writePinHigh(en_pin); + + AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_GLOBALCURRENT, AW_GLOBAL_CURRENT_MAX); + AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN); + + AW20216_init_scaling(cs_pin); } void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { - aw_led led = g_aw_leds[index]; + aw_led led = g_aw_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[led.driver] = true; - return; } + void AW20216_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) { AW20216_set_color(i, red, green, blue); } - return; -} - -void AW20216_write_pwm_buffer(pin_t slave_pin, uint8_t buffer_idx) { - AW_SPI_START(slave_pin); - spi_write((AWINIC_ID | AW_PAGE_PWM | AW_WRITE)); - spi_write(0); - spi_transmit(g_pwm_buffer[buffer_idx], AW_PWM_REGISTER_COUNT); - spi_stop(); } -void AW20216_update_pwm_buffers(void) { - AW20216_write_pwm_buffer(DRIVER_1_CS, 0); -#ifdef DRIVER_2_CS - AW20216_write_pwm_buffer(DRIVER_2_CS, 1); -#endif - return; +void AW20216_update_pwm_buffers(pin_t cs_pin, uint8_t index) { + if (g_pwm_buffer_update_required[index]) { + AW20216_write(cs_pin, AW_PAGE_PWM, 0, g_pwm_buffer[index], AW_PWM_REGISTER_COUNT); + } + g_pwm_buffer_update_required[index] = false; } diff --git a/drivers/awinic/aw20216.h b/drivers/awinic/aw20216.h index 9c6865cc8248..a4d13a66d908 100644 --- a/drivers/awinic/aw20216.h +++ b/drivers/awinic/aw20216.h @@ -18,6 +18,7 @@ #include #include +#include typedef struct aw_led { uint8_t driver : 2; @@ -28,10 +29,10 @@ typedef struct aw_led { extern const aw_led g_aw_leds[DRIVER_LED_TOTAL]; -void AW20216_init(void); +void AW20216_init(pin_t cs_pin, pin_t en_pin); void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue); void AW20216_set_color_all(uint8_t red, uint8_t green, uint8_t blue); -void AW20216_update_pwm_buffers(void); +void AW20216_update_pwm_buffers(pin_t cs_pin, uint8_t index); #define CS1_SW1 0x00 #define CS2_SW1 0x01 diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c index dfdf452190a2..bfaedaa4a07d 100644 --- a/quantum/rgb_matrix/rgb_matrix_drivers.c +++ b/quantum/rgb_matrix/rgb_matrix_drivers.c @@ -186,10 +186,18 @@ const rgb_matrix_driver_t rgb_matrix_driver = { # include "spi_master.h" static void init(void) { spi_init(); - AW20216_init(); + AW20216_init(DRIVER_1_CS, DRIVER_1_EN); +# ifdef DRIVER_2_CS + AW20216_init(DRIVER_2_CS, DRIVER_2_EN); +# endif } -static void flush(void) { AW20216_update_pwm_buffers(); } +static void flush(void) { + AW20216_update_pwm_buffers(DRIVER_1_CS, 0); +# ifdef DRIVER_2_CS + AW20216_update_pwm_buffers(DRIVER_2_CS, 1); +# endif +} const rgb_matrix_driver_t rgb_matrix_driver = { .init = init, From 65ff901435e4d1c77eee168adaf02afb55ce80c7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 26 Jul 2021 01:25:22 +0100 Subject: [PATCH 2/6] Update drivers/awinic/aw20216.h Co-authored-by: Ryan --- drivers/awinic/aw20216.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/awinic/aw20216.h b/drivers/awinic/aw20216.h index a4d13a66d908..c55d9605fcb7 100644 --- a/drivers/awinic/aw20216.h +++ b/drivers/awinic/aw20216.h @@ -18,7 +18,7 @@ #include #include -#include +#include "gpio.h" typedef struct aw_led { uint8_t driver : 2; From 724aa97cac118b8994631af938498957c90f3433 Mon Sep 17 00:00:00 2001 From: zvecr Date: Tue, 27 Jul 2021 00:07:12 +0100 Subject: [PATCH 3/6] Review comments --- drivers/awinic/aw20216.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/awinic/aw20216.c b/drivers/awinic/aw20216.c index f1140741a037..3ad49f1ae479 100644 --- a/drivers/awinic/aw20216.c +++ b/drivers/awinic/aw20216.c @@ -97,15 +97,24 @@ static void AW20216_init_scaling(pin_t cs_pin) { } } +static inline void AW20216_init_current_limits(pin_t cs_pin) { + AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_GLOBALCURRENT, AW_GLOBAL_CURRENT_MAX); +} + +static inline void AW20216_soft_enable(pin_t cs_pin) { + AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN); +} + void AW20216_init(pin_t cs_pin, pin_t en_pin) { - // All LEDs should start with all scaling and PWM registers as off + // All drivers should start with all scaling and PWM registers as off setPinOutput(en_pin); writePinHigh(en_pin); - AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_GLOBALCURRENT, AW_GLOBAL_CURRENT_MAX); - AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN); - + AW20216_init_current_limits(cs_pin); AW20216_init_scaling(cs_pin); + + AW20216_soft_enable(cs_pin); + } void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { From 8d1f58c39814b179280fd2f57a9b895ed1d0e6f5 Mon Sep 17 00:00:00 2001 From: zvecr Date: Tue, 27 Jul 2021 00:15:47 +0100 Subject: [PATCH 4/6] formatting fixes --- drivers/awinic/aw20216.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/awinic/aw20216.c b/drivers/awinic/aw20216.c index 3ad49f1ae479..711a5748951e 100644 --- a/drivers/awinic/aw20216.c +++ b/drivers/awinic/aw20216.c @@ -98,23 +98,24 @@ static void AW20216_init_scaling(pin_t cs_pin) { } static inline void AW20216_init_current_limits(pin_t cs_pin) { + // Push config AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_GLOBALCURRENT, AW_GLOBAL_CURRENT_MAX); } static inline void AW20216_soft_enable(pin_t cs_pin) { + // Push config AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_CONFIGURATION, AW_CONFIG_DEFAULT | AW_CHIPEN); } void AW20216_init(pin_t cs_pin, pin_t en_pin) { - // All drivers should start with all scaling and PWM registers as off setPinOutput(en_pin); writePinHigh(en_pin); + // Drivers should start with all scaling and PWM registers as off AW20216_init_current_limits(cs_pin); AW20216_init_scaling(cs_pin); AW20216_soft_enable(cs_pin); - } void AW20216_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { From 440ea39e3528bea548c869c4fd20e72e0c96641a Mon Sep 17 00:00:00 2001 From: zvecr Date: Tue, 27 Jul 2021 00:16:22 +0100 Subject: [PATCH 5/6] stop if start failed? --- drivers/awinic/aw20216.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/awinic/aw20216.c b/drivers/awinic/aw20216.c index 711a5748951e..13bc90a25ead 100644 --- a/drivers/awinic/aw20216.c +++ b/drivers/awinic/aw20216.c @@ -63,8 +63,8 @@ bool g_pwm_buffer_update_required[DRIVER_COUNT] = {false}; bool AW20216_write(pin_t cs_pin, uint8_t page, uint8_t reg, uint8_t* data, uint8_t len) { static uint8_t s_spi_transfer_buffer[2] = {0}; - // Do we need to call spi_stop() if this fails? if (!spi_start(cs_pin, false, 0, AW_SPI_DIVISOR)) { + spi_stop(); return false; } From 73444b4c00f89f55ba3f1216f0a02b678c4d21e8 Mon Sep 17 00:00:00 2001 From: zvecr Date: Tue, 27 Jul 2021 23:54:51 +0100 Subject: [PATCH 6/6] review comments --- drivers/awinic/aw20216.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/awinic/aw20216.c b/drivers/awinic/aw20216.c index 13bc90a25ead..c608c0ab446b 100644 --- a/drivers/awinic/aw20216.c +++ b/drivers/awinic/aw20216.c @@ -97,7 +97,7 @@ static void AW20216_init_scaling(pin_t cs_pin) { } } -static inline void AW20216_init_current_limits(pin_t cs_pin) { +static inline void AW20216_init_current_limit(pin_t cs_pin) { // Push config AW20216_write_register(cs_pin, AW_PAGE_FUNCTION, AW_REG_GLOBALCURRENT, AW_GLOBAL_CURRENT_MAX); } @@ -112,7 +112,7 @@ void AW20216_init(pin_t cs_pin, pin_t en_pin) { writePinHigh(en_pin); // Drivers should start with all scaling and PWM registers as off - AW20216_init_current_limits(cs_pin); + AW20216_init_current_limit(cs_pin); AW20216_init_scaling(cs_pin); AW20216_soft_enable(cs_pin);