varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity

Fix some makefile issues, and symbol issues

Browse source
This commit is contained in:
Fred Sundvik 2016-04-24 17:44:11 +03:00
parent 74baa4895c
commit 6313cfd559
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
visualizer.c
View file

@ -77,8 +77,8 @@ static remote_object_t* remote_objects[] = {
#endif #endif
GDisplay* LCDDisplay; GDisplay* LCD_DISPLAY = 0;
GDisplay* LEDDisplay; GDisplay* LED_DISPLAY = 0;
void start_keyframe_animation(keyframe_animation_t* animation) { void start_keyframe_animation(keyframe_animation_t* animation) {
@ -437,8 +437,8 @@ void visualizer_init(void) {
add_remote_objects(remote_objects, sizeof(remote_objects) / sizeof(remote_object_t*) ); add_remote_objects(remote_objects, sizeof(remote_objects) / sizeof(remote_object_t*) );
#endif #endif
// TODO: Make sure these works when either of these are disabled // TODO: Make sure these works when either of these are disabled
LCDDisplay = gdispGetDisplay(0); LCD_DISPLAY = gdispGetDisplay(0);
LEDDisplay = gdispGetDisplay(1); LED_DISPLAY = gdispGetDisplay(1);
// We are using a low priority thread, the idea is to have it run only // We are using a low priority thread, the idea is to have it run only

10
visualizer.mk
View file

@ -21,13 +21,13 @@
# SOFTWARE. # SOFTWARE.
GFXLIB = $(VISUALIZER_DIR)/ugfx GFXLIB = $(VISUALIZER_DIR)/ugfx
SRC += $(GFXSRC) $(VISUALIZER_DIR)/visualizer.c SRC += $(VISUALIZER_DIR)/visualizer.c
UINCDIR += $(GFXINC) $(VISUALIZER_DIR) UINCDIR += $(GFXINC) $(VISUALIZER_DIR)
ifdef LCD_ENABLE ifdef LCD_ENABLE
include $(GFXLIB)/gfx.mk
UDEFS += -DLCD_ENABLE UDEFS += -DLCD_ENABLE
ULIBS += -lm ULIBS += -lm
USE_UGFX = yes
endif endif
ifdef LCD_BACKLIGHT_ENABLE ifdef LCD_BACKLIGHT_ENABLE
@ -39,6 +39,12 @@ endif
ifdef LED_ENABLE ifdef LED_ENABLE
SRC += $(VISUALIZER_DIR)/led_test.c SRC += $(VISUALIZER_DIR)/led_test.c
UDEFS += -DLED_ENABLE UDEFS += -DLED_ENABLE
USE_UGFX = yes
endif
ifdef USE_UGFX
include $(GFXLIB)/gfx.mk
SRC += $(GFXSRC)
endif endif
ifndef VISUALIZER_USER ifndef VISUALIZER_USER