gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-17 21:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 26a1fdafa6 into 507c948ed8

Browse Source
This commit is contained in:
Jari 2025-07-16 10:20:33 -07:00 committed by GitHub
commit 678385eea9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quantum/action.c
View File

@ -466,9 +466,11 @@ void process_action(keyrecord_t *record, action_t action) {
} else { } else {
if (event.pressed) { if (event.pressed) {
if (tap_count == 0) { if (tap_count == 0) {
// Not a tap, but a hold: register the held mod // Not a tap, but a hold: register the mods, replacing the oneshots
ac_dprintf("MODS_TAP: Oneshot: 0\n"); ac_dprintf("MODS_TAP: Oneshot: 0\n");
register_mods(mods); register_mods(mods);
del_oneshot_mods(mods);
del_oneshot_locked_mods(mods);
} else if (tap_count == 1) { } else if (tap_count == 1) {
ac_dprintf("MODS_TAP: Oneshot: start\n"); ac_dprintf("MODS_TAP: Oneshot: start\n");
add_oneshot_mods(mods); add_oneshot_mods(mods);

68
tests/basic/test_one_shot_keys.cpp
View File

@ -15,8 +15,9 @@
*/ */
#include "action_util.h" #include "action_util.h"
#include "keyboard_report_util.hpp" #include "config.h"
#include "test_common.hpp" #include "test_common.hpp"
#include <stdint.h>
using testing::_; using testing::_;
using testing::InSequence; using testing::InSequence;
@ -24,24 +25,19 @@ using testing::InSequence;
class OneShot : public TestFixture {}; class OneShot : public TestFixture {};
class OneShotParametrizedTestFixture : public ::testing::WithParamInterface<std::pair<KeymapKey, KeymapKey>>, public OneShot {}; class OneShotParametrizedTestFixture : public ::testing::WithParamInterface<std::pair<KeymapKey, KeymapKey>>, public OneShot {};
TEST_F(OneShot, OSMWithoutAdditionalKeypressDoesNothing) { TEST_F(OneShot, OSMWithoutAdditionalKeypressSetsOneShotModsButDoesNotSendReport) {
TestDriver driver; TestDriver driver;
auto osm_key = KeymapKey(0, 0, 0, OSM(MOD_LSFT), KC_LSFT); auto osm_key = KeymapKey(0, 0, 0, OSM(MOD_LSFT), KC_LSFT);
auto a_key = KeymapKey(0, 0, 0, KC_A);
set_keymap({osm_key}); set_keymap({osm_key});
/* Press and release OSM key*/ /* Press and release OSM key should set one shot mods*/
EXPECT_NO_REPORT(driver); EXPECT_NO_REPORT(driver);
tap_key(osm_key); tap_key(osm_key);
EXPECT_EQ(get_oneshot_mods(), MOD_LSFT);
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
clear_oneshot_mods(); // reset state
/* OSM are added when an actual report is send */
EXPECT_REPORT(driver, (osm_key.report_code));
send_keyboard_report();
VERIFY_AND_CLEAR(driver);
/* Make unit-test pass */
clear_oneshot_mods();
} }
#if defined(ONESHOT_TIMEOUT) #if defined(ONESHOT_TIMEOUT)
@ -277,6 +273,56 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) {
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
} }
TEST_F(OneShot, OSMTapThenHoldShouldSendEmptyReport) {
TestDriver driver;
InSequence s;
KeymapKey osm_key = KeymapKey{0, 0, 0, OSM(MOD_LSFT), KC_LSFT};
KeymapKey regular_key = KeymapKey{0, 1, 0, KC_A};
set_keymap({osm_key, regular_key});
/*
* for some reason, none of the OSM keys are registered
* */
/* Press and release OSM */
EXPECT_NO_REPORT(driver);
tap_key(osm_key);
EXPECT_EQ(get_oneshot_mods(), 0x02); // verify oneshots are turned on
VERIFY_AND_CLEAR(driver);
/* Press OSM */
EXPECT_NO_REPORT(driver);
osm_key.press();
run_one_scan_loop(); // not yet registered
VERIFY_AND_CLEAR(driver);
/* Hold OSM */
EXPECT_REPORT(driver, (osm_key.report_code)).Times(1); // report should be send now
idle_for(TAPPING_TERM);
EXPECT_EQ(get_oneshot_mods(), 0x00); // key registered as hold, OSM should be disabled
VERIFY_AND_CLEAR(driver);
/* Release OSM */
EXPECT_EMPTY_REPORT(driver); // key released so we expect empty report (i.e. no key pressed)
osm_key.release();
run_one_scan_loop();
EXPECT_EQ(get_oneshot_mods(), 0x00); // one shot mods should still be disabled
VERIFY_AND_CLEAR(driver);
/* Press regular key */
regular_key.press();
run_one_scan_loop();
EXPECT_REPORT(driver, (regular_key.report_code)).Times(1); // should not be modded
VERIFY_AND_CLEAR(driver);
/* Release regular key */
regular_key.release();
run_one_scan_loop();
EXPECT_EMPTY_REPORT(driver);
VERIFY_AND_CLEAR(driver);
}
TEST_F(OneShot, OSLWithAdditionalKeypress) { TEST_F(OneShot, OSLWithAdditionalKeypress) {
TestDriver driver; TestDriver driver;
InSequence s; InSequence s;