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 | firmware-b62e160a8950f451b08f1fee0109e60a58c5ddaa.tar.gz firmware-b62e160a8950f451b08f1fee0109e60a58c5ddaa.tar.bz2 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() { if (!has_oneshot_mods_timed_out()) { mods |= get_oneshot_mods(); } -#endif +#endif return mods; } @@ -447,7 +447,7 @@ void visualizer_set_user_data(void* u) { } #endif -void visualizer_update(uint32_t default_state, uint32_t state, uint8_t mods, uint32_t leds) { +void visualizer_update(layer_state_t default_state, layer_state_t state, uint8_t mods, uint32_t leds) { // Note that there's a small race condition here, the thread could read // a state where one of these are set but not the other. But this should // 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. #include "config.h" #include "gfx.h" +#include "action_layer.h" #ifdef LCD_BACKLIGHT_ENABLE #include "lcd_backlight.h" @@ -45,7 +46,7 @@ uint8_t visualizer_get_mods(void); // This need to be called once at the start void visualizer_init(void); // This should be called at every matrix scan -void visualizer_update(uint32_t default_state, uint32_t state, uint8_t mods, uint32_t leds); +void visualizer_update(layer_state_t default_state, layer_state_t state, uint8_t mods, uint32_t leds); // This should be called when the keyboard goes to suspend state void visualizer_suspend(void); @@ -68,8 +69,8 @@ void draw_emulator(void); struct keyframe_animation_t; typedef struct { - uint32_t layer; - uint32_t default_layer; + layer_state_t layer; + layer_state_t default_layer; uint32_t leds; // See led.h for available statuses uint8_t mods; bool suspended; |