mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-04-28 18:11:29 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
60924fda3b
@ -658,7 +658,6 @@ void process_action(keyrecord_t *record, action_t action) {
|
|||||||
layer_off(action.layer_tap.val);
|
layer_off(action.layer_tap.val);
|
||||||
break;
|
break;
|
||||||
} else if (tap_count < ONESHOT_TAP_TOGGLE) {
|
} else if (tap_count < ONESHOT_TAP_TOGGLE) {
|
||||||
layer_on(action.layer_tap.val);
|
|
||||||
set_oneshot_layer(action.layer_tap.val, ONESHOT_START);
|
set_oneshot_layer(action.layer_tap.val, ONESHOT_START);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -671,7 +670,6 @@ void process_action(keyrecord_t *record, action_t action) {
|
|||||||
}
|
}
|
||||||
# else
|
# else
|
||||||
if (event.pressed) {
|
if (event.pressed) {
|
||||||
layer_on(action.layer_tap.val);
|
|
||||||
set_oneshot_layer(action.layer_tap.val, ONESHOT_START);
|
set_oneshot_layer(action.layer_tap.val, ONESHOT_START);
|
||||||
} else {
|
} else {
|
||||||
clear_oneshot_layer_state(ONESHOT_PRESSED);
|
clear_oneshot_layer_state(ONESHOT_PRESSED);
|
||||||
|
Loading…
Reference in New Issue
Block a user