diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2016-07-07 12:46:10 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2016-07-07 12:46:10 +0300 |
| commit | 07d0d5cbe48d7afaf0bc8c9916d40179ec51cb42 (patch) | |
| tree | 0cf84f2066fc5d285a04f4213f74daa534eb4d17 /quantum/visualizer | |
| parent | 9772e697a04472f3c710376bfb2919ec2c3672a3 (diff) | |
| download | qmk_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.c | 4 | ||||
| -rw-r--r-- | quantum/visualizer/visualizer.mk | 8 |
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]; | |||
| 89 | static uint8_t crossfade_end_frame[NUM_ROWS][NUM_COLS]; | 89 | static uint8_t crossfade_end_frame[NUM_ROWS][NUM_COLS]; |
| 90 | 90 | ||
| 91 | static uint8_t compute_gradient_color(float t, float index, float num) { | 91 | static 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) | |||
| 25 | GFXLIB = $(LIB_PATH)/ugfx | 25 | GFXLIB = $(LIB_PATH)/ugfx |
| 26 | VPATH += $(VISUALIZER_PATH) | 26 | VPATH += $(VISUALIZER_PATH) |
| 27 | 27 | ||
| 28 | OPT_DEFS += -DVISUALIZER_ENABLE | ||
| 29 | |||
| 28 | ifdef LCD_ENABLE | 30 | ifdef LCD_ENABLE |
| 29 | OPT_DEFS += -DLCD_ENABLE | 31 | OPT_DEFS += -DLCD_ENABLE |
| 30 | ULIBS += -lm | 32 | ULIBS += -lm |
| @@ -44,12 +46,8 @@ UDEFS += -DLED_ENABLE | |||
| 44 | endif | 46 | endif |
| 45 | 47 | ||
| 46 | include $(GFXLIB)/gfx.mk | 48 | include $(GFXLIB)/gfx.mk |
| 47 | #SERIAL_SRC = $(wildcard $(SERIAL_PATH)/protocol/*.c) | 49 | SRC += $(patsubst $(TOP_DIR)/%,%,$(GFXSRC)) |
| 48 | #SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c) | ||
| 49 | #SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC)) | ||
| 50 | #SRC += $(GFXSRC) | ||
| 51 | OPT_DEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS))) | 50 | OPT_DEFS += $(patsubst %,-D%,$(patsubst -D%,%,$(GFXDEFS))) |
| 52 | #ULIBS += $(patsubst %,-l%,$(patsubst -l%,%,$(GFXLIBS))) | ||
| 53 | 51 | ||
| 54 | ifndef VISUALIZER_USER | 52 | ifndef VISUALIZER_USER |
| 55 | VISUALIZER_USER = visualizer_user.c | 53 | VISUALIZER_USER = visualizer_user.c |
