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

Merge 04914fec8b into 36b5559b99

Browse Source
This commit is contained in:
KoFish 2024-11-21 17:32:05 +11:00 committed by GitHub
commit 42e71f565f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quantum/action.c
View File

@ -664,6 +664,8 @@ void process_action(keyrecord_t *record, action_t action) {
if (tap_count >= ONESHOT_TAP_TOGGLE) { if (tap_count >= ONESHOT_TAP_TOGGLE) {
reset_oneshot_layer(); reset_oneshot_layer();
set_oneshot_layer(action.layer_tap.val, ONESHOT_TOGGLED); set_oneshot_layer(action.layer_tap.val, ONESHOT_TOGGLED);
} else if (get_oneshot_layer() != action.layer_tap.val) {
layer_off(action.layer_tap.val);
} else { } else {
clear_oneshot_layer_state(ONESHOT_PRESSED); clear_oneshot_layer_state(ONESHOT_PRESSED);
} }
@ -671,6 +673,8 @@ void process_action(keyrecord_t *record, action_t action) {
# else # else
if (event.pressed) { if (event.pressed) {
set_oneshot_layer(action.layer_tap.val, ONESHOT_START); set_oneshot_layer(action.layer_tap.val, ONESHOT_START);
} else if (get_oneshot_layer() != action.layer_tap.val) {
layer_off(action.layer_tap.val);
} else { } else {
clear_oneshot_layer_state(ONESHOT_PRESSED); clear_oneshot_layer_state(ONESHOT_PRESSED);
if (tap_count > 1) { if (tap_count > 1) {

74
tests/basic/test_one_shot_keys.cpp
View File

@ -353,3 +353,77 @@ TEST_F(OneShot, OSLWithOsmAndAdditionalKeypress) {
run_one_scan_loop(); run_one_scan_loop();
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
} }
TEST_F(OneShot, OSLWithNestedOSL) {
TestDriver driver;
KeymapKey layer0_osl_key = KeymapKey{0, 0, 0, OSL(1)};
KeymapKey layer1_osl_key = KeymapKey{1, 1, 0, OSL(2)};
KeymapKey layer2_regular_key = KeymapKey{2, 1, 1, KC_A};
set_keymap({layer0_osl_key, layer1_osl_key, layer2_regular_key});
EXPECT_NO_REPORT(driver);
/* Activate OSL for layer 1 */
tap_key(layer0_osl_key);
EXPECT_TRUE(layer_state_is(1));
VERIFY_AND_CLEAR(driver);
/* Activate OSL for layer 2 from layer 1 */
EXPECT_NO_REPORT(driver);
tap_key(layer1_osl_key);
EXPECT_TRUE(layer_state_is(2));
VERIFY_AND_CLEAR(driver);
/* Tap key on layer 2 */
EXPECT_REPORT(driver, (layer2_regular_key.report_code)).Times(1);
EXPECT_EMPTY_REPORT(driver);
tap_key(layer2_regular_key);
VERIFY_AND_CLEAR(driver);
/* Ensure both layers are deactivated. */
EXPECT_FALSE(layer_state_is(1));
EXPECT_FALSE(layer_state_is(2));
VERIFY_AND_CLEAR(driver);
}
TEST_F(OneShot, HeldOSLWithNestedOSL) {
TestDriver driver;
KeymapKey layer0_osl_key = KeymapKey{0, 0, 0, OSL(1)};
KeymapKey layer1_osl_key = KeymapKey{1, 1, 0, OSL(2)};
KeymapKey layer2_regular_key = KeymapKey{2, 1, 1, KC_A};
set_keymap({layer0_osl_key, layer1_osl_key, layer2_regular_key});
/* Hold OSL for layer 1 key */
EXPECT_NO_REPORT(driver);
layer0_osl_key.press();
idle_for(TAPPING_TERM);
run_one_scan_loop(); // The layer isn't activated until one loop more than
expect_layer_state(1);
VERIFY_AND_CLEAR(driver);
/* Tap OSL for layer 2 */
EXPECT_NO_REPORT(driver);
tap_key(layer1_osl_key);
expect_layer_state(2);
VERIFY_AND_CLEAR(driver);
/* Ensure layer 2 key can be pressed */
EXPECT_REPORT(driver, (layer2_regular_key.report_code)).Times(1);
EXPECT_EMPTY_REPORT(driver);
tap_key(layer2_regular_key);
VERIFY_AND_CLEAR(driver);
EXPECT_FALSE(layer_state_is(2));
VERIFY_AND_CLEAR(driver);
/* Release OSL key for layer 1 */
EXPECT_NO_REPORT(driver);
layer0_osl_key.release();
run_one_scan_loop();
VERIFY_AND_CLEAR(driver);
EXPECT_FALSE(layer_state_is(1));
VERIFY_AND_CLEAR(driver);
}