diff options
| author |  Damien <Dbroqua@users.noreply.github.com> | 2016-12-09 19:44:03 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-12-09 19:44:03 +0100 |
| commit | 13c4080a1d77cb1dfdf48df8a42e78b9dc483912 (patch) | |
| tree | 66fd988d98a32e1437fbc6cb80bee03c056722a7 /keyboards/ergodox/infinity/infinity.c | |
| parent | a849bdc5811b2bb69df8e3b0948c8e81c0dfa9d4 (diff) | |
| parent | 985a091a739c99736d5b17de5161831488dbc219 (diff) | |
| download | qmk_firmware-13c4080a1d77cb1dfdf48df8a42e78b9dc483912.tar.gz | |
Merge pull request #13 from jackhumbert/master
Merged from qmk
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 c5793385f..02db67eaf 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) { |