aboutsummaryrefslogtreecommitdiff
path: root/quantum/backlight
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-12-16 16:35:08 +0000
committerGitHub <noreply@github.com>2019-12-16 16:35:08 +0000
commitbc2157eea8aa99970a3785439efe5823fc76b0b4 (patch)
tree534ec40d5583deba9bd599b495499c7536c60ddd /quantum/backlight
parentf3bf301825db5fd8bfa369d26584a64f5d640ecb (diff)
parent94e2a39d7257357f432a323674d4ed405856c3ae (diff)
downloadqmk_firmware-bc2157eea8aa99970a3785439efe5823fc76b0b4.tar.gz
qmk_firmware-bc2157eea8aa99970a3785439efe5823fc76b0b4.zip
Software backlight improvements (#7255)
* Update software backlight to precalculated duty patterns * Update default backlight state to match avr pwm * Move function to make diff look nicer
Diffstat (limited to 'quantum/backlight')
-rw-r--r--quantum/backlight/backlight_soft.c37
1 files changed, 30 insertions, 7 deletions
diff --git a/quantum/backlight/backlight_soft.c b/quantum/backlight/backlight_soft.c
index a6aba7782..096b41d91 100644
--- a/quantum/backlight/backlight_soft.c
+++ b/quantum/backlight/backlight_soft.c
@@ -10,7 +10,7 @@
10#endif 10#endif
11 11
12#ifndef BACKLIGHT_ON_STATE 12#ifndef BACKLIGHT_ON_STATE
13# define BACKLIGHT_ON_STATE 0 13# define BACKLIGHT_ON_STATE 1
14#endif 14#endif
15 15
16#ifdef BACKLIGHT_PINS 16#ifdef BACKLIGHT_PINS
@@ -20,6 +20,7 @@
20 { BACKLIGHT_PIN } 20 { BACKLIGHT_PIN }
21#endif 21#endif
22 22
23static uint16_t s_duty_pattern = 0;
23static const pin_t backlight_pins[] = BACKLIGHT_PIN_INIT; 24static const pin_t backlight_pins[] = BACKLIGHT_PIN_INIT;
24#define BACKLIGHT_LED_COUNT (sizeof(backlight_pins) / sizeof(pin_t)) 25#define BACKLIGHT_LED_COUNT (sizeof(backlight_pins) / sizeof(pin_t))
25 26
@@ -46,14 +47,38 @@ void backlight_off(pin_t backlight_pin) {
46} 47}
47 48
48void backlight_init_ports(void) { 49void backlight_init_ports(void) {
49 // Setup backlight pin as output and output to on state. 50 // Setup backlight pin as output and output to off state.
50 FOR_EACH_LED(setPinOutput(backlight_pin); backlight_on(backlight_pin);) 51 FOR_EACH_LED(setPinOutput(backlight_pin); backlight_off(backlight_pin);)
51} 52}
52 53
54// clang-format off
55
56/** \brief PWM duty patterns
57 *
58 * We scale the current backlight level to an index within this array. This allows
59 * backlight_task to focus on just switching LEDs on/off, and we can predict the duty pattern
60 */
61static uint16_t backlight_duty_table[] = {
62 0b0000000000000000,
63 0b1000000000000000,
64 0b1000000010000000,
65 0b1000001000010000,
66 0b1000100010001000,
67 0b1001001001001000,
68 0b1010101010101010,
69 0b1110111011101110,
70 0b1111111111111111,
71};
72#define backlight_duty_table_size (sizeof(backlight_duty_table) / sizeof(backlight_duty_table[0]))
73
74// clang-format on
75
76static uint8_t scale_backlight(uint8_t v) { return v * (backlight_duty_table_size - 1) / BACKLIGHT_LEVELS; }
77
53void backlight_task(void) { 78void backlight_task(void) {
54 static uint8_t backlight_tick = 0; 79 static uint8_t backlight_tick = 0;
55 80
56 if ((0xFFFF >> (get_backlight_level() * ((BACKLIGHT_LEVELS + 1) / 2))) & (1 << backlight_tick)) { 81 if (s_duty_pattern & ((uint16_t)1 << backlight_tick)) {
57 FOR_EACH_LED(backlight_on(backlight_pin);) 82 FOR_EACH_LED(backlight_on(backlight_pin);)
58 } else { 83 } else {
59 FOR_EACH_LED(backlight_off(backlight_pin);) 84 FOR_EACH_LED(backlight_off(backlight_pin);)
@@ -61,6 +86,4 @@ void backlight_task(void) {
61 backlight_tick = (backlight_tick + 1) % 16; 86 backlight_tick = (backlight_tick + 1) % 16;
62} 87}
63 88
64void backlight_set(uint8_t level) { 89void backlight_set(uint8_t level) { s_duty_pattern = backlight_duty_table[scale_backlight(level)]; }
65 // noop as backlight_task uses get_backlight_level()
66}