diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-11-21 19:59:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 19:59:39 -0500 |
| commit | be265decae734b08eb8d6ac537bd2a22495ad2f2 (patch) | |
| tree | 24d73225161b64d08fdf284cc506ab4b5a547538 /keyboards/ergodox/infinity/infinity.c | |
| parent | 377583d9f384b44866712d734dba73f0126cbe13 (diff) | |
| parent | c86bbf474e7709749dfd5e09fa5defd5e6baaaa3 (diff) | |
Merge pull request #892 from fredizzimo/disable_ergodox_lcd
Always initialize the Infinity Ergodox backlight
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) { |