diff options
| author | skullY <skullydazed@gmail.com> | 2019-01-26 14:33:55 -0800 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-02-10 15:37:12 -0800 |
| commit | bf2670601d29551896bab6811b9bb64de2d0ee0e (patch) | |
| tree | 459467a986f6ce0fa3ef2accbfd0d43a3afffad8 /quantum/quantum.c | |
| parent | 159191a8747891920aea7de2324507daa8a661fb (diff) | |
| download | qmk_firmware-bf2670601d29551896bab6811b9bb64de2d0ee0e.tar.gz qmk_firmware-bf2670601d29551896bab6811b9bb64de2d0ee0e.zip | |
compiles, but long delay on startup and problems
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index bd3715c80a..0e605d4cb4 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -1031,7 +1031,11 @@ void matrix_init_quantum() { eeconfig_init(); } #ifdef BACKLIGHT_ENABLE - backlight_init_ports(); + #ifdef LED_MATRIX_ENABLE + led_matrix_init(); + #else + backlight_init_ports(); + #endif #endif #ifdef AUDIO_ENABLE audio_init(); @@ -1067,8 +1071,12 @@ void matrix_scan_quantum() { matrix_scan_combo(); #endif - #if defined(BACKLIGHT_ENABLE) && defined(BACKLIGHT_PIN) - backlight_task(); + #if defined(BACKLIGHT_ENABLE) + #if defined(LED_MATRIX_ENABLE) + led_matrix_task(); + #elif defined(BACKLIGHT_PIN) + backlight_task(); + #endif #endif #ifdef RGB_MATRIX_ENABLE @@ -1198,7 +1206,7 @@ static inline void set_pwm(uint16_t val) { OCRxx = val; } -#ifndef BACKLIGHT_CUSTOM_DRIVER +#ifndef BACKLIGHT_CUSTOM_DRIVER || LED_MATRIX_ENABLE __attribute__ ((weak)) void backlight_set(uint8_t level) { if (level > BACKLIGHT_LEVELS) |