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

wip(fix tests)

Browse Source
This commit is contained in:
Jari Meevis 2025-04-23 22:12:15 +02:00
parent b8be8cf9a9
commit 26a1fdafa6
No known key found for this signature in database
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/action.c
View File

@ -463,7 +463,7 @@ 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_mods(mods);

33
tests/basic/test_one_shot_keys.cpp
View File

@ -16,9 +16,7 @@
#include "action_util.h" #include "action_util.h"
#include "config.h" #include "config.h"
#include "keyboard_report_util.hpp"
#include "test_common.hpp" #include "test_common.hpp"
#include <gtest/gtest.h>
#include <stdint.h> #include <stdint.h>
using testing::_; using testing::_;
@ -275,7 +273,7 @@ TEST_F(OneShot, OSMHoldNotLockingOSMs) {
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
} }
TEST_F(OneShot, OSMTapThenHoldNotLockingOSMs) { TEST_F(OneShot, OSMTapThenHoldShouldSendEmptyReport) {
TestDriver driver; TestDriver driver;
InSequence s; InSequence s;
KeymapKey osm_key = KeymapKey{0, 0, 0, OSM(MOD_LSFT), KC_LSFT}; KeymapKey osm_key = KeymapKey{0, 0, 0, OSM(MOD_LSFT), KC_LSFT};
@ -283,36 +281,45 @@ TEST_F(OneShot, OSMTapThenHoldNotLockingOSMs) {
set_keymap({osm_key, regular_key}); set_keymap({osm_key, regular_key});
/*
* for some reason, none of the OSM keys are registered
* */
/* Press and release OSM */ /* Press and release OSM */
EXPECT_NO_REPORT(driver); EXPECT_NO_REPORT(driver);
tap_key(osm_key); tap_key(osm_key);
EXPECT_EQ(get_oneshot_mods(), 0x02); // verify oneshots are turned on
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
/* Press and hold OSM */ /* Press OSM */
EXPECT_REPORT(driver, (osm_key.report_code)).Times(1); EXPECT_NO_REPORT(driver);
osm_key.press(); osm_key.press();
run_one_scan_loop(); run_one_scan_loop(); // not yet registered
idle_for(TAPPING_TERM);
// EXPECT_EQ(get_oneshot_mods(), b02); // one shot mods should be disabled
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
/* Release OSM1 */ /* Hold OSM */
EXPECT_EMPTY_REPORT(driver); 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(); osm_key.release();
run_one_scan_loop(); run_one_scan_loop();
// EXPECT_EQ(get_oneshot_mods(), 0); // one shot mods should be disabled EXPECT_EQ(get_oneshot_mods(), 0x00); // one shot mods should still be disabled
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
/* Press regular key */ /* Press regular key */
EXPECT_REPORT(driver, (regular_key.report_code)).Times(1); // no mod
regular_key.press(); regular_key.press();
run_one_scan_loop(); run_one_scan_loop();
EXPECT_REPORT(driver, (regular_key.report_code)).Times(1); // should not be modded
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
/* Release regular key */ /* Release regular key */
EXPECT_EMPTY_REPORT(driver);
regular_key.release(); regular_key.release();
run_one_scan_loop(); run_one_scan_loop();
EXPECT_EMPTY_REPORT(driver);
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
} }