diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-08-21 17:07:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-21 17:07:49 -0700 |
| commit | b62e160a8950f451b08f1fee0109e60a58c5ddaa (patch) | |
| tree | 897619679d73edd3a5c62bc528f1bfaaf974b96b /quantum/visualizer | |
| parent | d534c72a544454132b3c6c05af85c821f6a93d65 (diff) | |
| download | qmk_firmware-b62e160a8950f451b08f1fee0109e60a58c5ddaa.tar.gz qmk_firmware-b62e160a8950f451b08f1fee0109e60a58c5ddaa.zip | |
Additional changes for Layer State typedef compatibility (#5906)
* Additional changes for Layer State typedef compatibility
* Replace biton32 with get_highest_layer in docs
* Change additional layer structure code
* Fix uGFX reference issue
* Remove dynamic_keymap check
* Where did all these extra spaces come from
Co-Authored-By: fauxpark <fauxpark@gmail.com>
Diffstat (limited to 'quantum/visualizer')
| -rw-r--r-- | quantum/visualizer/visualizer.c | 4 | ||||
| -rw-r--r-- | quantum/visualizer/visualizer.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 5b4d8d603..516cf2a84 100644 --- a/quantum/visualizer/visualizer.c +++ b/quantum/visualizer/visualizer.c | |||
| @@ -437,7 +437,7 @@ uint8_t visualizer_get_mods() { | |||
| 437 | if (!has_oneshot_mods_timed_out()) { | 437 | if (!has_oneshot_mods_timed_out()) { |
| 438 | mods |= get_oneshot_mods(); | 438 | mods |= get_oneshot_mods(); |
| 439 | } | 439 | } |
| 440 | #endif | 440 | #endif |
| 441 | return mods; | 441 | return mods; |
| 442 | } | 442 | } |
| 443 | 443 | ||
| @@ -447,7 +447,7 @@ void visualizer_set_user_data(void* u) { | |||
| 447 | } | 447 | } |
| 448 | #endif | 448 | #endif |
| 449 | 449 | ||
| 450 | void visualizer_update(uint32_t default_state, uint32_t state, uint8_t mods, uint32_t leds) { | 450 | void visualizer_update(layer_state_t default_state, layer_state_t state, uint8_t mods, uint32_t leds) { |
| 451 | // Note that there's a small race condition here, the thread could read | 451 | // Note that there's a small race condition here, the thread could read |
| 452 | // a state where one of these are set but not the other. But this should | 452 | // a state where one of these are set but not the other. But this should |
| 453 | // not really matter as it will be fixed during the next loop step. | 453 | // not really matter as it will be fixed during the next loop step. |
diff --git a/quantum/visualizer/visualizer.h b/quantum/visualizer/visualizer.h index 90ecdcbae..56ea1fd98 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h | |||
| @@ -30,6 +30,7 @@ SOFTWARE. | |||
| 30 | 30 | ||
| 31 | #include "config.h" | 31 | #include "config.h" |
| 32 | #include "gfx.h" | 32 | #include "gfx.h" |
| 33 | #include "action_layer.h" | ||
| 33 | 34 | ||
| 34 | #ifdef LCD_BACKLIGHT_ENABLE | 35 | #ifdef LCD_BACKLIGHT_ENABLE |
| 35 | #include "lcd_backlight.h" | 36 | #include "lcd_backlight.h" |
| @@ -45,7 +46,7 @@ uint8_t visualizer_get_mods(void); | |||
| 45 | // This need to be called once at the start | 46 | // This need to be called once at the start |
| 46 | void visualizer_init(void); | 47 | void visualizer_init(void); |
| 47 | // This should be called at every matrix scan | 48 | // This should be called at every matrix scan |
| 48 | void visualizer_update(uint32_t default_state, uint32_t state, uint8_t mods, uint32_t leds); | 49 | void visualizer_update(layer_state_t default_state, layer_state_t state, uint8_t mods, uint32_t leds); |
| 49 | 50 | ||
| 50 | // This should be called when the keyboard goes to suspend state | 51 | // This should be called when the keyboard goes to suspend state |
| 51 | void visualizer_suspend(void); | 52 | void visualizer_suspend(void); |
| @@ -68,8 +69,8 @@ void draw_emulator(void); | |||
| 68 | struct keyframe_animation_t; | 69 | struct keyframe_animation_t; |
| 69 | 70 | ||
| 70 | typedef struct { | 71 | typedef struct { |
| 71 | uint32_t layer; | 72 | layer_state_t layer; |
| 72 | uint32_t default_layer; | 73 | layer_state_t default_layer; |
| 73 | uint32_t leds; // See led.h for available statuses | 74 | uint32_t leds; // See led.h for available statuses |
| 74 | uint8_t mods; | 75 | uint8_t mods; |
| 75 | bool suspended; | 76 | bool suspended; |
