gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-26 21:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2022-11-12 02:12:34 +00:00
commit c291196f77
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
quantum/action_layer.c
View File

@ -45,9 +45,9 @@ static void default_layer_state_set(layer_state_t state) {
default_layer_state = state; default_layer_state = state;
default_layer_debug(); default_layer_debug();
debug("\n"); debug("\n");
#ifdef STRICT_LAYER_RELEASE #if defined(STRICT_LAYER_RELEASE)
clear_keyboard_but_mods(); // To avoid stuck keys clear_keyboard_but_mods(); // To avoid stuck keys
#else #elif defined(SEMI_STRICT_LAYER_RELEASE)
clear_keyboard_but_mods_and_keys(); // Don't reset held keys clear_keyboard_but_mods_and_keys(); // Don't reset held keys
#endif #endif
} }
@ -125,9 +125,9 @@ void layer_state_set(layer_state_t state) {
layer_state = state; layer_state = state;
layer_debug(); layer_debug();
dprintln(); dprintln();
# ifdef STRICT_LAYER_RELEASE # if defined(STRICT_LAYER_RELEASE)
clear_keyboard_but_mods(); // To avoid stuck keys clear_keyboard_but_mods(); // To avoid stuck keys
# else # elif defined(SEMI_STRICT_LAYER_RELEASE)
clear_keyboard_but_mods_and_keys(); // Don't reset held keys clear_keyboard_but_mods_and_keys(); // Don't reset held keys
# endif # endif
} }

1
tests/basic/test_action_layer.cpp
View File

@ -360,7 +360,6 @@ TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) {
} }
TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) { TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) {
GTEST_SKIP() << "TODO: Modifiers are erroneously discarded on layer changes, although a key that introduced the modifier is still held.";
TestDriver driver; TestDriver driver;
InSequence s; InSequence s;