sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve layer mask handling (#13065)

Browse Source
This commit is contained in:
Drashna Jaelre
2021-07-03 00:19:52 -07:00
committed by GitHub
parent 03807c2c6e
commit 8da8aabbe5
4 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/command.c
View File

@@ -781,6 +781,6 @@ uint8_t numkey2num(uint8_t code) {
static void switch_default_layer(uint8_t layer) {
xprintf("L%d\n", layer);
default_layer_set(1UL << layer);
default_layer_set((layer_state_t)1 << layer);
clear_keyboard();
}

8
quantum/quantum.c
View File

@@ -340,13 +340,13 @@ void set_single_persistent_default_layer(uint8_t default_layer) {
#if defined(AUDIO_ENABLE) && defined(DEFAULT_LAYER_SONGS)
PLAY_SONG(default_layer_songs[default_layer]);
#endif
eeconfig_update_default_layer(1U << default_layer);
default_layer_set(1U << default_layer);
eeconfig_update_default_layer((layer_state_t)1 << default_layer);
default_layer_set((layer_state_t)1 << default_layer);
}
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;
layer_state_t mask12 = ((layer_state_t)1 << layer1) | ((layer_state_t)1 << layer2);
layer_state_t mask3 = (layer_state_t)1 << layer3;
return (state & mask12) == mask12 ? (state | mask3) : (state & ~mask3);
}