From 25d1901d7a275e05b29630b877f0fa41224a91db Mon Sep 17 00:00:00 2001 From: zvecr Date: Tue, 29 Oct 2019 23:57:21 +0000 Subject: [PATCH 1/3] Update software backlight to precalculated duty patterns --- quantum/backlight/backlight_soft.c | 37 ++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/quantum/backlight/backlight_soft.c b/quantum/backlight/backlight_soft.c index a6aba7782..f481dbae8 100644 --- a/quantum/backlight/backlight_soft.c +++ b/quantum/backlight/backlight_soft.c @@ -20,6 +20,7 @@ { BACKLIGHT_PIN } #endif +static uint16_t s_duty_pattern = 0; static const pin_t backlight_pins[] = BACKLIGHT_PIN_INIT; #define BACKLIGHT_LED_COUNT (sizeof(backlight_pins) / sizeof(pin_t)) @@ -46,21 +47,43 @@ void backlight_off(pin_t backlight_pin) { } void backlight_init_ports(void) { - // Setup backlight pin as output and output to on state. - FOR_EACH_LED(setPinOutput(backlight_pin); backlight_on(backlight_pin);) + // Setup backlight pin as output and output to off state. + FOR_EACH_LED(setPinOutput(backlight_pin); backlight_off(backlight_pin);) } +// clang-format off + +/** \brief PWM duty patterns + * + * We scale the current backlight level to an index within this array. This allows + * backlight_task to focus on just switching LEDs on/off, and we can predict the duty pattern + */ +static uint16_t backlight_duty_table[] = { + 0b0000000000000000, + 0b1000000000000000, + 0b1000000010000000, + 0b1000001000010000, + 0b1000100010001000, + 0b1001001001001000, + 0b1010101010101010, + 0b1110111011101110, + 0b1111111111111111, +}; +#define backlight_duty_table_size (sizeof(backlight_duty_table) / sizeof(backlight_duty_table[0])) + +// clang-format on + +static uint8_t scale_backlight(uint8_t v) { return v * (backlight_duty_table_size - 1) / BACKLIGHT_LEVELS; } + +void backlight_set(uint8_t level) { s_duty_pattern = backlight_duty_table[scale_backlight(level)]; } + void backlight_task(void) { static uint8_t backlight_tick = 0; - if ((0xFFFF >> (get_backlight_level() * ((BACKLIGHT_LEVELS + 1) / 2))) & (1 << backlight_tick)) { + if (s_duty_pattern & ((uint16_t)1 << backlight_tick)) { FOR_EACH_LED(backlight_on(backlight_pin);) } else { FOR_EACH_LED(backlight_off(backlight_pin);) } backlight_tick = (backlight_tick + 1) % 16; } - -void backlight_set(uint8_t level) { - // noop as backlight_task uses get_backlight_level() -} From f6b9604f4a9e7a97ce2ce06a151c46f577b4133c Mon Sep 17 00:00:00 2001 From: zvecr Date: Sat, 14 Dec 2019 17:24:17 +0000 Subject: [PATCH 2/3] Update default backlight state to match avr pwm --- quantum/backlight/backlight_soft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantum/backlight/backlight_soft.c b/quantum/backlight/backlight_soft.c index f481dbae8..2bcecef94 100644 --- a/quantum/backlight/backlight_soft.c +++ b/quantum/backlight/backlight_soft.c @@ -10,7 +10,7 @@ #endif #ifndef BACKLIGHT_ON_STATE -# define BACKLIGHT_ON_STATE 0 +# define BACKLIGHT_ON_STATE 1 #endif #ifdef BACKLIGHT_PINS From 94e2a39d7257357f432a323674d4ed405856c3ae Mon Sep 17 00:00:00 2001 From: zvecr Date: Sat, 14 Dec 2019 17:25:32 +0000 Subject: [PATCH 3/3] Move function to make diff look nicer --- quantum/backlight/backlight_soft.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quantum/backlight/backlight_soft.c b/quantum/backlight/backlight_soft.c index 2bcecef94..096b41d91 100644 --- a/quantum/backlight/backlight_soft.c +++ b/quantum/backlight/backlight_soft.c @@ -75,8 +75,6 @@ static uint16_t backlight_duty_table[] = { static uint8_t scale_backlight(uint8_t v) { return v * (backlight_duty_table_size - 1) / BACKLIGHT_LEVELS; } -void backlight_set(uint8_t level) { s_duty_pattern = backlight_duty_table[scale_backlight(level)]; } - void backlight_task(void) { static uint8_t backlight_tick = 0; @@ -87,3 +85,5 @@ void backlight_task(void) { } backlight_tick = (backlight_tick + 1) % 16; } + +void backlight_set(uint8_t level) { s_duty_pattern = backlight_duty_table[scale_backlight(level)]; }