Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

[Bug] Fix tri layer compiler issue if NO_ACTION_LAYER is defined (#19821)

Browse source
This commit is contained in:
Drashna Jaelre 2023-02-11 22:07:01 -08:00 • committed by GitHub
commit b1f4d49c43
Failed to generate hash of commit
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
quantum/action_layer.c
View file

@ -350,6 +350,7 @@ action_t layer_switch_get_action(keypos_t key) {
return action_for_key(layer_switch_get_layer(key), key); return action_for_key(layer_switch_get_layer(key), key);
} }
#ifndef NO_ACTION_LAYER
layer_state_t update_tri_layer_state(layer_state_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) {
layer_state_t mask12 = ((layer_state_t)1 << layer1) | ((layer_state_t)1 << layer2); layer_state_t mask12 = ((layer_state_t)1 << layer1) | ((layer_state_t)1 << layer2);
layer_state_t mask3 = (layer_state_t)1 << layer3; layer_state_t mask3 = (layer_state_t)1 << layer3;
@ -359,3 +360,4 @@ layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_
void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) { void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3)); layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3));
} }
#endif