From 4df874a1d933c944770275fd17ac6b1ca99e7dba Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 30 May 2019 17:24:36 -0700 Subject: Change additional layer structure code --- quantum/visualizer/visualizer.c | 4 ++-- quantum/visualizer/visualizer.h | 6 +++--- tmk_core/common/eeconfig.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/quantum/visualizer/visualizer.c b/quantum/visualizer/visualizer.c index 5b4d8d603e..516cf2a847 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 90ecdcbaea..d1607babb4 100644 --- a/quantum/visualizer/visualizer.h +++ b/quantum/visualizer/visualizer.h @@ -45,7 +45,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 +68,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; diff --git a/tmk_core/common/eeconfig.c b/tmk_core/common/eeconfig.c index 4f440abc9c..39628475f6 100644 --- a/tmk_core/common/eeconfig.c +++ b/tmk_core/common/eeconfig.c @@ -8,7 +8,7 @@ #include "eeprom_stm32.h" #endif -extern uint32_t default_layer_state; +extern uint32_t default_layer_state; /** \brief eeconfig enable * * FIXME: needs doc -- cgit v1.2.3