summaryrefslogtreecommitdiff
path: root/keyboards/ergodox/infinity/infinity.c
diff options
context:
space:
mode:
authordbroqua <dbroqua@mousur.org>2016-12-17 22:25:21 +0100
committerdbroqua <dbroqua@mousur.org>2016-12-17 22:25:21 +0100
commitdf50bee5a88cacbd1f5fab98b26c2068646b61c0 (patch)
tree60a59d80c173055788e66b7e9dd79aaad7b27df6 /keyboards/ergodox/infinity/infinity.c
parent46b93f02d570c0bb66410cb8d9af2451d5453635 (diff)
parent13c4080a1d77cb1dfdf48df8a42e78b9dc483912 (diff)
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
Diffstat (limited to 'keyboards/ergodox/infinity/infinity.c')
-rw-r--r--keyboards/ergodox/infinity/infinity.c6
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) {