diff options
| author | climbalima <climbalima@gmail.com> | 2016-12-10 23:15:47 -0500 |
|---|---|---|
| committer | climbalima <climbalima@gmail.com> | 2016-12-10 23:15:47 -0500 |
| commit | 73d60182969023984ff275117d49a4824c6987d0 (patch) | |
| tree | fdac811b117c49f78de04c407d4bef76e6df5772 /keyboards/ergodox/infinity/infinity.c | |
| parent | 56515ba5034e83c598891686cfdc43c186e5d487 (diff) | |
| parent | 985a091a739c99736d5b17de5161831488dbc219 (diff) | |
Merge branch 'master' of 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) { |