aboutsummaryrefslogtreecommitdiff
path: root/quantum/visualizer
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-07-07 12:46:10 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-07-07 12:46:10 +0300
commit07d0d5cbe48d7afaf0bc8c9916d40179ec51cb42 (patch)
tree0cf84f2066fc5d285a04f4213f74daa534eb4d17 /quantum/visualizer
parent9772e697a04472f3c710376bfb2919ec2c3672a3 (diff)
downloadqmk_firmware-07d0d5cbe48d7afaf0bc8c9916d40179ec51cb42.tar.gz
qmk_firmware-07d0d5cbe48d7afaf0bc8c9916d40179ec51cb42.zip
Makefile fixes and update of Visualizer
Diffstat (limited to 'quantum/visualizer')
-rw-r--r--quantum/visualizer/led_test.c4
-rw-r--r--quantum/visualizer/visualizer.mk8
2 files changed, 5 insertions, 7 deletions
diff --git a/quantum/visualizer/led_test.c b/quantum/visualizer/led_test.c
index c2ea30b55..a9abace8d 100644
--- a/quantum/visualizer/led_test.c
+++ b/quantum/visualizer/led_test.c
@@ -89,8 +89,8 @@ static uint8_t crossfade_start_frame[NUM_ROWS][NUM_COLS];
89static uint8_t crossfade_end_frame[NUM_ROWS][NUM_COLS]; 89static uint8_t crossfade_end_frame[NUM_ROWS][NUM_COLS];
90 90
91static uint8_t compute_gradient_color(float t, float index, float num) { 91static uint8_t compute_gradient_color(float t, float index, float num) {
92 const float two_pi = 2.0f * PI; 92 const float two_pi = M_2_PI;
93 float normalized_index = (1.0f - index / (num - 1)) * two_pi; 93 float normalized_index = (1.0f - index / (num - 1.0f)) * two_pi;
94 float x = t * two_pi + normalized_index; 94 float x = t * two_pi + normalized_index;
95 float v = 0.5 * (cosf(x) + 1.0f); 95 float v = 0.5 * (cosf(x) + 1.0f);
96 return (uint8_t)(255.0f * v); 96 return (uint8_t)(255.0f * v);
diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk
index b5dfad8e1..149968de7 100644
--- a/quantum/visualizer/visualizer.mk
+++ b/quantum/visualizer/visualizer.mk
@@ -25,6 +25,8 @@ EXTRAINCDIRS += $(GFXINC) $(VISUALIZER_DIR)
25GFXLIB = $(LIB_PATH)/ugfx 25GFXLIB = $(LIB_PATH)/ugfx
26VPATH += $(VISUALIZER_PATH) 26VPATH += $(VISUALIZER_PATH)
27 27
28OPT_DEFS += -DVISUALIZER_ENABLE
29
28ifdef LCD_ENABLE 30ifdef LCD_ENABLE
29OPT_DEFS += -DLCD_ENABLE 31OPT_DEFS += -DLCD_ENABLE
30ULIBS += -lm 32ULIBS += -lm
@@ -44,12 +46,8 @@ UDEFS += -DLED_ENABLE
44endif 46endif
45 47
46include $(GFXLIB)/gfx.mk 48include $(GFXLIB)/gfx.mk
47#SERIAL_SRC = $(wildcard $(SERIAL_PATH)/protocol/*.c) 49SRC += $(patsubst $(TOP_DIR)/%,%,$(GFXSRC))
48#SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c)
49#SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC))
50#SRC += $(GFXSRC)
51OPT_DEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS))) 50OPT_DEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS)))
52#ULIBS += $(patsubst %,-l%,$(patsubst -l%,%,$(GFXLIBS)))
53 51
54ifndef VISUALIZER_USER 52ifndef VISUALIZER_USER
55VISUALIZER_USER = visualizer_user.c 53VISUALIZER_USER = visualizer_user.c