diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2016-11-26 13:31:17 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2016-11-26 13:31:17 +0700 |
| commit | b5511b9a8aa3827279fc132ecf3e5dd9c9c07668 (patch) | |
| tree | e902e8f6dfc67272a98bfbbba0f77b7830bb8604 /keyboards/ergodox/infinity/infinity.c | |
| parent | 4b0d16cd7bdcd41cffb17a7b6eed7cb44beaef34 (diff) | |
| parent | bf23ac96f62be1cb36d414e76599523af3caf00f (diff) | |
Merge branch 'master' into promethium
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) { |