summaryrefslogtreecommitdiff
path: root/keyboards/ergodox/infinity/infinity.c
diff options
context:
space:
mode:
authorxyverz <xyverz@gmail.com>2016-12-06 17:36:19 -0800
committerxyverz <xyverz@gmail.com>2016-12-06 17:36:19 -0800
commit9216bc73778ef0fe5830b91511f37dd90fb0f0a1 (patch)
tree6c9f343c2485150c1912b7b68ade364a232015bd /keyboards/ergodox/infinity/infinity.c
parentf9cf4f75aec8cb24f054f243b985d9e5c18a2a80 (diff)
parent985a091a739c99736d5b17de5161831488dbc219 (diff)
Merge remote-tracking branch 'upstream/master'
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) {