From 7229751ba9d402b2a6c9dc1b7b29385b5162fe41 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Thu, 7 Jul 2016 14:01:20 +0300
Subject: [PATCH] Fix visualizer crash at startup

Visualizer and serial link initialized in the wrong order.
The LED_ENABLED define wasn't set properly
uGfx is always initialized
---
 quantum/visualizer/visualizer.c  | 2 --
 quantum/visualizer/visualizer.mk | 2 +-
 tmk_core/protocol/chibios/main.c | 7 ++++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c
index abca22d85f8..dfa2ff4eea5 100644
--- a/quantum/visualizer/visualizer.c
+++ b/quantum/visualizer/visualizer.c
@@ -456,9 +456,7 @@ static DECLARE_THREAD_FUNCTION(visualizerThread, arg) {
 }
 
 void visualizer_init(void) {
-#ifdef LCD_ENABLE
     gfxInit();
-#endif
 
 #ifdef LCD_BACKLIGHT_ENABLE
     lcd_backlight_init();
diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk
index 149968de72d..379496fb664 100644
--- a/quantum/visualizer/visualizer.mk
+++ b/quantum/visualizer/visualizer.mk
@@ -42,7 +42,7 @@ endif
 
 ifdef LED_ENABLE
 SRC += $(VISUALIZER_DIR)/led_test.c
-UDEFS += -DLED_ENABLE
+OPT_DEFS += -DLED_ENABLE
 endif
 
 include $(GFXLIB)/gfx.mk
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index 6bf9c16681f..36fd45d458b 100644
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -104,13 +104,14 @@ int main(void) {
   /* init printf */
   init_printf(NULL,sendchar_pf);
 
+#ifdef SERIAL_LINK_ENABLE
+  init_serial_link();
+#endif
+
 #ifdef VISUALIZER_ENABLE
   visualizer_init();
 #endif
 
-#ifdef SERIAL_LINK_ENABLE
-  init_serial_link();
-#endif
 
   host_driver_t* driver = NULL;