]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Fix visualizer crash at startup
authorFred Sundvik <fsundvik@gmail.com>
Thu, 7 Jul 2016 11:01:20 +0000 (14:01 +0300)
committerFred Sundvik <fsundvik@gmail.com>
Thu, 7 Jul 2016 11:01:20 +0000 (14:01 +0300)
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
quantum/visualizer/visualizer.mk
tmk_core/protocol/chibios/main.c

index abca22d85f893021f33c27ccd4c2f69abd56eabf..dfa2ff4eea5aa9e715990fd2c1ba05060aaf841f 100644 (file)
@@ -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();
index 149968de72dc4559668905c13f259f5ae8975b51..379496fb6642bb6777067332305d2682c23f6e8b 100644 (file)
@@ -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
index 6bf9c16681f460ed725c32df1bfd2fb77fff57a8..36fd45d458b4e5bc639f834f4f0c619587d4105f 100644 (file)
@@ -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;