diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2016-07-07 14:01:20 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2016-07-07 14:01:20 +0300 |
| commit | 7229751ba9d402b2a6c9dc1b7b29385b5162fe41 (patch) | |
| tree | e3bfc81e5853b6bc1729058cdb114d72bf372ce0 | |
| parent | 07d0d5cbe48d7afaf0bc8c9916d40179ec51cb42 (diff) | |
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
| -rw-r--r-- | quantum/visualizer/visualizer.c | 2 | ||||
| -rw-r--r-- | quantum/visualizer/visualizer.mk | 2 | ||||
| -rw-r--r-- | 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 abca22d85f..dfa2ff4eea 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 149968de72..379496fb66 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 6bf9c16681..36fd45d458 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; |