diff options
author | Olivier <[email protected]> | 2016-11-27 23:23:21 +0100 |
---|---|---|
committer | Olivier <[email protected]> | 2016-11-27 23:23:21 +0100 |
commit | d6d0b7eadaa568853b21d74057db306a33b7a847 (patch) | |
tree | e935179ed0db152f94d31ef187c01a40f0fb42d6 /keyboards/ergodox/infinity/infinity.c | |
parent | 73d2a470eed73a1ba28520343bd1cfc81498d183 (diff) | |
parent | 1585fc4b616cb28b8d4a418cd31c8ce0dd64f731 (diff) | |
download | qmk_firmware-d6d0b7eadaa568853b21d74057db306a33b7a847.tar.gz qmk_firmware-d6d0b7eadaa568853b21d74057db306a33b7a847.zip |
Merge https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/ergodox/infinity/infinity.c')
-rw-r--r-- | keyboards/ergodox/infinity/infinity.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/keyboards/ergodox/infinity/infinity.c b/keyboards/ergodox/infinity/infinity.c index c5793385fe..02db67eaf2 100644 --- a/keyboards/ergodox/infinity/infinity.c +++ b/keyboards/ergodox/infinity/infinity.c @@ -38,7 +38,6 @@ void init_serial_link_hal(void) { // Using a higher pre-scalar without flicker is possible but FTM0_MOD will need to be reduced // Which will reduce the brightness range #define PRESCALAR_DEFINE 0 -#ifdef VISUALIZER_ENABLE void lcd_backlight_hal_init(void) { // Setup Backlight SIM->SCGC6 |= SIM_SCGC6_FTM0; @@ -76,7 +75,6 @@ void lcd_backlight_hal_color(uint16_t r, uint16_t g, uint16_t b) { CHANNEL_GREEN.CnV = g; CHANNEL_BLUE.CnV = b; } -#endif __attribute__ ((weak)) void matrix_init_user(void) { @@ -92,6 +90,10 @@ void matrix_init_kb(void) { // runs once when the firmware starts up matrix_init_user(); + // The backlight always has to be initialized, otherwise it will stay lit +#ifndef VISUALIZER_ENABLE + lcd_backlight_hal_init(); +#endif } void matrix_scan_kb(void) { |