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>
This commit is contained in:
parent
d534c72a54
commit
b62e160a89
9 changed files with 25 additions and 21 deletions
|
@ -931,9 +931,9 @@ void set_single_persistent_default_layer(uint8_t default_layer) {
|
|||
default_layer_set(1U<<default_layer);
|
||||
}
|
||||
|
||||
uint32_t update_tri_layer_state(uint32_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3) {
|
||||
uint32_t mask12 = (1UL << layer1) | (1UL << layer2);
|
||||
uint32_t mask3 = 1UL << layer3;
|
||||
layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3) {
|
||||
layer_state_t mask12 = (1UL << layer1) | (1UL << layer2);
|
||||
layer_state_t mask3 = 1UL << layer3;
|
||||
return (state & mask12) == mask12 ? (state | mask3) : (state & ~mask3);
|
||||
}
|
||||
|
||||
|
|
|
@ -213,7 +213,7 @@ void send_char(char ascii_code);
|
|||
|
||||
// For tri-layer
|
||||
void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3);
|
||||
uint32_t update_tri_layer_state(uint32_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3);
|
||||
layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_t layer2, uint8_t layer3);
|
||||
|
||||
void set_single_persistent_default_layer(uint8_t default_layer);
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue