diff options
Diffstat (limited to 'quantum/visualizer')
-rw-r--r-- | quantum/visualizer/lcd_keyframes.c | 160 | ||||
-rw-r--r-- | quantum/visualizer/lcd_keyframes.h | 33 | ||||
-rw-r--r-- | quantum/visualizer/visualizer.c | 150 | ||||
-rw-r--r-- | quantum/visualizer/visualizer.h | 9 | ||||
-rw-r--r-- | quantum/visualizer/visualizer.mk | 1 |
5 files changed, 196 insertions, 157 deletions
diff --git a/quantum/visualizer/lcd_keyframes.c b/quantum/visualizer/lcd_keyframes.c new file mode 100644 index 000000000..00d9734e6 --- /dev/null +++ b/quantum/visualizer/lcd_keyframes.c | |||
@@ -0,0 +1,160 @@ | |||
1 | /* Copyright 2017 Fred Sundvik | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #include "lcd_keyframes.h" | ||
18 | #include <string.h> | ||
19 | #include "action_util.h" | ||
20 | #include "led.h" | ||
21 | |||
22 | bool lcd_keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state) { | ||
23 | (void)animation; | ||
24 | gdispClear(White); | ||
25 | gdispDrawString(0, 10, state->layer_text, state->font_dejavusansbold12, Black); | ||
26 | gdispFlush(); | ||
27 | return false; | ||
28 | } | ||
29 | |||
30 | static void format_layer_bitmap_string(uint16_t default_layer, uint16_t layer, char* buffer) { | ||
31 | for (int i=0; i<16;i++) | ||
32 | { | ||
33 | uint32_t mask = (1u << i); | ||
34 | if (default_layer & mask) { | ||
35 | if (layer & mask) { | ||
36 | *buffer = 'B'; | ||
37 | } else { | ||
38 | *buffer = 'D'; | ||
39 | } | ||
40 | } else if (layer & mask) { | ||
41 | *buffer = '1'; | ||
42 | } else { | ||
43 | *buffer = '0'; | ||
44 | } | ||
45 | ++buffer; | ||
46 | |||
47 | if (i==3 || i==7 || i==11) { | ||
48 | *buffer = ' '; | ||
49 | ++buffer; | ||
50 | } | ||
51 | } | ||
52 | *buffer = 0; | ||
53 | } | ||
54 | |||
55 | bool lcd_keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state) { | ||
56 | (void)animation; | ||
57 | const char* layer_help = "1=On D=Default B=Both"; | ||
58 | char layer_buffer[16 + 4]; // 3 spaces and one null terminator | ||
59 | gdispClear(White); | ||
60 | gdispDrawString(0, 0, layer_help, state->font_fixed5x8, Black); | ||
61 | format_layer_bitmap_string(state->status.default_layer, state->status.layer, layer_buffer); | ||
62 | gdispDrawString(0, 10, layer_buffer, state->font_fixed5x8, Black); | ||
63 | format_layer_bitmap_string(state->status.default_layer >> 16, state->status.layer >> 16, layer_buffer); | ||
64 | gdispDrawString(0, 20, layer_buffer, state->font_fixed5x8, Black); | ||
65 | gdispFlush(); | ||
66 | return false; | ||
67 | } | ||
68 | |||
69 | static void format_mods_bitmap_string(uint8_t mods, char* buffer) { | ||
70 | *buffer = ' '; | ||
71 | ++buffer; | ||
72 | |||
73 | for (int i = 0; i<8; i++) | ||
74 | { | ||
75 | uint32_t mask = (1u << i); | ||
76 | if (mods & mask) { | ||
77 | *buffer = '1'; | ||
78 | } else { | ||
79 | *buffer = '0'; | ||
80 | } | ||
81 | ++buffer; | ||
82 | |||
83 | if (i==3) { | ||
84 | *buffer = ' '; | ||
85 | ++buffer; | ||
86 | } | ||
87 | } | ||
88 | *buffer = 0; | ||
89 | } | ||
90 | |||
91 | bool lcd_keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state) { | ||
92 | (void)animation; | ||
93 | |||
94 | const char* title = "Modifier states"; | ||
95 | const char* mods_header = " CSAG CSAG "; | ||
96 | char status_buffer[12]; | ||
97 | |||
98 | gdispClear(White); | ||
99 | gdispDrawString(0, 0, title, state->font_fixed5x8, Black); | ||
100 | gdispDrawString(0, 10, mods_header, state->font_fixed5x8, Black); | ||
101 | format_mods_bitmap_string(state->status.mods, status_buffer); | ||
102 | gdispDrawString(0, 20, status_buffer, state->font_fixed5x8, Black); | ||
103 | |||
104 | gdispFlush(); | ||
105 | return false; | ||
106 | } | ||
107 | |||
108 | #define LED_STATE_STRING_SIZE sizeof("NUM CAPS SCRL COMP KANA") | ||
109 | |||
110 | static void get_led_state_string(char* output, visualizer_state_t* state) { | ||
111 | uint8_t pos = 0; | ||
112 | |||
113 | if (state->status.leds & (1u << USB_LED_NUM_LOCK)) { | ||
114 | memcpy(output + pos, "NUM ", 4); | ||
115 | pos += 4; | ||
116 | } | ||
117 | if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { | ||
118 | memcpy(output + pos, "CAPS ", 5); | ||
119 | pos += 5; | ||
120 | } | ||
121 | if (state->status.leds & (1u << USB_LED_SCROLL_LOCK)) { | ||
122 | memcpy(output + pos, "SCRL ", 5); | ||
123 | pos += 5; | ||
124 | } | ||
125 | if (state->status.leds & (1u << USB_LED_COMPOSE)) { | ||
126 | memcpy(output + pos, "COMP ", 5); | ||
127 | pos += 5; | ||
128 | } | ||
129 | if (state->status.leds & (1u << USB_LED_KANA)) { | ||
130 | memcpy(output + pos, "KANA ", 5); | ||
131 | pos += 5; | ||
132 | } | ||
133 | output[pos] = 0; | ||
134 | } | ||
135 | |||
136 | bool lcd_keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state) | ||
137 | { | ||
138 | (void)animation; | ||
139 | char output[LED_STATE_STRING_SIZE]; | ||
140 | get_led_state_string(output, state); | ||
141 | gdispClear(White); | ||
142 | gdispDrawString(0, 10, output, state->font_dejavusansbold12, Black); | ||
143 | gdispFlush(); | ||
144 | return false; | ||
145 | } | ||
146 | |||
147 | bool lcd_keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state) { | ||
148 | (void)animation; | ||
149 | gdispClear(White); | ||
150 | uint8_t y = 10; | ||
151 | if (state->status.leds) { | ||
152 | char output[LED_STATE_STRING_SIZE]; | ||
153 | get_led_state_string(output, state); | ||
154 | gdispDrawString(0, 1, output, state->font_dejavusansbold12, Black); | ||
155 | y = 17; | ||
156 | } | ||
157 | gdispDrawString(0, y, state->layer_text, state->font_dejavusansbold12, Black); | ||
158 | gdispFlush(); | ||
159 | return false; | ||
160 | } | ||
diff --git a/quantum/visualizer/lcd_keyframes.h b/quantum/visualizer/lcd_keyframes.h new file mode 100644 index 000000000..0c9f39ab8 --- /dev/null +++ b/quantum/visualizer/lcd_keyframes.h | |||
@@ -0,0 +1,33 @@ | |||
1 | /* Copyright 2017 Fred Sundvik | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #ifndef QUANTUM_VISUALIZER_LCD_KEYFRAMES_H_ | ||
18 | #define QUANTUM_VISUALIZER_LCD_KEYFRAMES_H_ | ||
19 | |||
20 | #include "visualizer.h" | ||
21 | |||
22 | // Displays the layer text centered vertically on the screen | ||
23 | bool lcd_keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state); | ||
24 | // Displays a bitmap (0/1) of all the currently active layers | ||
25 | bool lcd_keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); | ||
26 | // Displays a bitmap (0/1) of all the currently active mods | ||
27 | bool lcd_keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); | ||
28 | // Displays the keyboard led states (CAPS (Caps lock), NUM (Num lock), SCRL (Scroll lock), COMP (Compose), KANA) | ||
29 | bool lcd_keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state); | ||
30 | // Displays both the layer text and the led states | ||
31 | bool lcd_keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state); | ||
32 | |||
33 | #endif /* QUANTUM_VISUALIZER_LCD_KEYFRAMES_H_ */ | ||
diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 2533eb709..514d7c44e 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c | |||
@@ -48,16 +48,13 @@ SOFTWARE. | |||
48 | #include "serial_link/system/serial_link.h" | 48 | #include "serial_link/system/serial_link.h" |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #include "action_util.h" | ||
52 | |||
51 | // Define this in config.h | 53 | // Define this in config.h |
52 | #ifndef VISUALIZER_THREAD_PRIORITY | 54 | #ifndef VISUALIZER_THREAD_PRIORITY |
53 | #define "Visualizer thread priority not defined" | 55 | #define "Visualizer thread priority not defined" |
54 | #endif | 56 | #endif |
55 | 57 | ||
56 | // mods status | ||
57 | #include "action_util.h" | ||
58 | |||
59 | #include "led.h" | ||
60 | |||
61 | static visualizer_keyboard_status_t current_status = { | 58 | static visualizer_keyboard_status_t current_status = { |
62 | .layer = 0xFFFFFFFF, | 59 | .layer = 0xFFFFFFFF, |
63 | .default_layer = 0xFFFFFFFF, | 60 | .default_layer = 0xFFFFFFFF, |
@@ -277,149 +274,6 @@ bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_st | |||
277 | } | 274 | } |
278 | #endif // LCD_BACKLIGHT_ENABLE | 275 | #endif // LCD_BACKLIGHT_ENABLE |
279 | 276 | ||
280 | #ifdef LCD_ENABLE | ||
281 | bool keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state) { | ||
282 | (void)animation; | ||
283 | gdispClear(White); | ||
284 | gdispDrawString(0, 10, state->layer_text, state->font_dejavusansbold12, Black); | ||
285 | gdispFlush(); | ||
286 | return false; | ||
287 | } | ||
288 | |||
289 | static void format_layer_bitmap_string(uint16_t default_layer, uint16_t layer, char* buffer) { | ||
290 | for (int i=0; i<16;i++) | ||
291 | { | ||
292 | uint32_t mask = (1u << i); | ||
293 | if (default_layer & mask) { | ||
294 | if (layer & mask) { | ||
295 | *buffer = 'B'; | ||
296 | } else { | ||
297 | *buffer = 'D'; | ||
298 | } | ||
299 | } else if (layer & mask) { | ||
300 | *buffer = '1'; | ||
301 | } else { | ||
302 | *buffer = '0'; | ||
303 | } | ||
304 | ++buffer; | ||
305 | |||
306 | if (i==3 || i==7 || i==11) { | ||
307 | *buffer = ' '; | ||
308 | ++buffer; | ||
309 | } | ||
310 | } | ||
311 | *buffer = 0; | ||
312 | } | ||
313 | |||
314 | bool keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state) { | ||
315 | (void)animation; | ||
316 | const char* layer_help = "1=On D=Default B=Both"; | ||
317 | char layer_buffer[16 + 4]; // 3 spaces and one null terminator | ||
318 | gdispClear(White); | ||
319 | gdispDrawString(0, 0, layer_help, state->font_fixed5x8, Black); | ||
320 | format_layer_bitmap_string(state->status.default_layer, state->status.layer, layer_buffer); | ||
321 | gdispDrawString(0, 10, layer_buffer, state->font_fixed5x8, Black); | ||
322 | format_layer_bitmap_string(state->status.default_layer >> 16, state->status.layer >> 16, layer_buffer); | ||
323 | gdispDrawString(0, 20, layer_buffer, state->font_fixed5x8, Black); | ||
324 | gdispFlush(); | ||
325 | return false; | ||
326 | } | ||
327 | |||
328 | static void format_mods_bitmap_string(uint8_t mods, char* buffer) { | ||
329 | *buffer = ' '; | ||
330 | ++buffer; | ||
331 | |||
332 | for (int i = 0; i<8; i++) | ||
333 | { | ||
334 | uint32_t mask = (1u << i); | ||
335 | if (mods & mask) { | ||
336 | *buffer = '1'; | ||
337 | } else { | ||
338 | *buffer = '0'; | ||
339 | } | ||
340 | ++buffer; | ||
341 | |||
342 | if (i==3) { | ||
343 | *buffer = ' '; | ||
344 | ++buffer; | ||
345 | } | ||
346 | } | ||
347 | *buffer = 0; | ||
348 | } | ||
349 | |||
350 | bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state) { | ||
351 | (void)animation; | ||
352 | |||
353 | const char* title = "Modifier states"; | ||
354 | const char* mods_header = " CSAG CSAG "; | ||
355 | char status_buffer[12]; | ||
356 | |||
357 | gdispClear(White); | ||
358 | gdispDrawString(0, 0, title, state->font_fixed5x8, Black); | ||
359 | gdispDrawString(0, 10, mods_header, state->font_fixed5x8, Black); | ||
360 | format_mods_bitmap_string(state->status.mods, status_buffer); | ||
361 | gdispDrawString(0, 20, status_buffer, state->font_fixed5x8, Black); | ||
362 | |||
363 | gdispFlush(); | ||
364 | return false; | ||
365 | } | ||
366 | |||
367 | #define LED_STATE_STRING_SIZE sizeof("NUM CAPS SCRL COMP KANA") | ||
368 | |||
369 | static void get_led_state_string(char* output, visualizer_state_t* state) { | ||
370 | uint8_t pos = 0; | ||
371 | |||
372 | if (state->status.leds & (1u << USB_LED_NUM_LOCK)) { | ||
373 | memcpy(output + pos, "NUM ", 4); | ||
374 | pos += 4; | ||
375 | } | ||
376 | if (state->status.leds & (1u << USB_LED_CAPS_LOCK)) { | ||
377 | memcpy(output + pos, "CAPS ", 5); | ||
378 | pos += 5; | ||
379 | } | ||
380 | if (state->status.leds & (1u << USB_LED_SCROLL_LOCK)) { | ||
381 | memcpy(output + pos, "SCRL ", 5); | ||
382 | pos += 5; | ||
383 | } | ||
384 | if (state->status.leds & (1u << USB_LED_COMPOSE)) { | ||
385 | memcpy(output + pos, "COMP ", 5); | ||
386 | pos += 5; | ||
387 | } | ||
388 | if (state->status.leds & (1u << USB_LED_KANA)) { | ||
389 | memcpy(output + pos, "KANA ", 5); | ||
390 | pos += 5; | ||
391 | } | ||
392 | output[pos] = 0; | ||
393 | } | ||
394 | |||
395 | bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state) | ||
396 | { | ||
397 | (void)animation; | ||
398 | char output[LED_STATE_STRING_SIZE]; | ||
399 | get_led_state_string(output, state); | ||
400 | gdispClear(White); | ||
401 | gdispDrawString(0, 10, output, state->font_dejavusansbold12, Black); | ||
402 | gdispFlush(); | ||
403 | return false; | ||
404 | } | ||
405 | |||
406 | bool keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state) { | ||
407 | (void)animation; | ||
408 | gdispClear(White); | ||
409 | uint8_t y = 10; | ||
410 | if (state->status.leds) { | ||
411 | char output[LED_STATE_STRING_SIZE]; | ||
412 | get_led_state_string(output, state); | ||
413 | gdispDrawString(0, 1, output, state->font_dejavusansbold12, Black); | ||
414 | y = 17; | ||
415 | } | ||
416 | gdispDrawString(0, y, state->layer_text, state->font_dejavusansbold12, Black); | ||
417 | gdispFlush(); | ||
418 | return false; | ||
419 | } | ||
420 | |||
421 | #endif // LCD_ENABLE | ||
422 | |||
423 | bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { | 277 | bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state) { |
424 | (void)animation; | 278 | (void)animation; |
425 | (void)state; | 279 | (void)state; |
diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 3b05c305e..440044fd3 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h | |||
@@ -133,15 +133,6 @@ bool keyframe_no_operation(keyframe_animation_t* animation, visualizer_state_t* | |||
133 | bool keyframe_animate_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state); | 133 | bool keyframe_animate_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state); |
134 | // Sets the backlight color to the target color | 134 | // Sets the backlight color to the target color |
135 | bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state); | 135 | bool keyframe_set_backlight_color(keyframe_animation_t* animation, visualizer_state_t* state); |
136 | // Displays the layer text centered vertically on the screen | ||
137 | bool keyframe_display_layer_text(keyframe_animation_t* animation, visualizer_state_t* state); | ||
138 | // Displays a bitmap (0/1) of all the currently active layers | ||
139 | bool keyframe_display_layer_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); | ||
140 | // Displays a bitmap (0/1) of all the currently active mods | ||
141 | bool keyframe_display_mods_bitmap(keyframe_animation_t* animation, visualizer_state_t* state); | ||
142 | // Displays the keyboard led states (CAPS (Caps lock), NUM (Num lock), SCRL (Scroll lock), COMP (Compose), KANA) | ||
143 | bool keyframe_display_led_states(keyframe_animation_t* animation, visualizer_state_t* state); | ||
144 | bool keyframe_display_layer_and_led_states(keyframe_animation_t* animation, visualizer_state_t* state); | ||
145 | 136 | ||
146 | bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); | 137 | bool keyframe_disable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); |
147 | bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); | 138 | bool keyframe_enable_lcd_and_backlight(keyframe_animation_t* animation, visualizer_state_t* state); |
diff --git a/quantum/visualizer/visualizer.mk b/quantum/visualizer/visualizer.mk index 3861cb1f0..325cefd6f 100644 --- a/quantum/visualizer/visualizer.mk +++ b/quantum/visualizer/visualizer.mk | |||
@@ -34,6 +34,7 @@ endif | |||
34 | 34 | ||
35 | ifeq ($(strip $(LCD_ENABLE)), yes) | 35 | ifeq ($(strip $(LCD_ENABLE)), yes) |
36 | SRC += $(VISUALIZER_DIR)/lcd_backlight.c | 36 | SRC += $(VISUALIZER_DIR)/lcd_backlight.c |
37 | SRC += $(VISUALIZER_DIR)/lcd_keyframes.c | ||
37 | OPT_DEFS += -DLCD_BACKLIGHT_ENABLE | 38 | OPT_DEFS += -DLCD_BACKLIGHT_ENABLE |
38 | endif | 39 | endif |
39 | 40 | ||