diff options
author | Jack Humbert <jack.humb@gmail.com> | 2016-11-21 20:17:45 -0500 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2016-11-21 20:17:45 -0500 |
commit | 450a8fb5b61de8166fe21eb4f57e1c00514afe32 (patch) | |
tree | c7d363a244115eb3736401cc6670f1967ddf9a5d /keyboards/ergodox/infinity/infinity.c | |
parent | 06a2677b7eedbf58532fa1a673ba1277e756174d (diff) | |
parent | af119baf710c0b19cfe3351e3f3e89ddeeaacdf6 (diff) |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
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) { |