mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-29 22:45:51 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
6becf6ce35
@ -31,7 +31,7 @@ TEST_F(QuickTap, tap_regular_key_while_mod_tap_key_is_held) {
|
|||||||
TestDriver driver;
|
TestDriver driver;
|
||||||
InSequence s;
|
InSequence s;
|
||||||
auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
|
auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
|
||||||
auto regular_key = KeymapKey(0, 2, 0, KC_A);
|
auto regular_key = KeymapKey(0, 2, 0, KC_A);
|
||||||
|
|
||||||
set_keymap({mod_tap_key, regular_key});
|
set_keymap({mod_tap_key, regular_key});
|
||||||
|
|
||||||
@ -111,8 +111,8 @@ TEST_F(QuickTap, tap_regular_key_while_layer_tap_key_is_held) {
|
|||||||
TestDriver driver;
|
TestDriver driver;
|
||||||
InSequence s;
|
InSequence s;
|
||||||
auto layer_tap_key = KeymapKey(0, 1, 0, LT(1, KC_P));
|
auto layer_tap_key = KeymapKey(0, 1, 0, LT(1, KC_P));
|
||||||
auto regular_key = KeymapKey(0, 2, 0, KC_A);
|
auto regular_key = KeymapKey(0, 2, 0, KC_A);
|
||||||
auto layer_key = KeymapKey(1, 2, 0, KC_B);
|
auto layer_key = KeymapKey(1, 2, 0, KC_B);
|
||||||
|
|
||||||
set_keymap({layer_tap_key, regular_key, layer_key});
|
set_keymap({layer_tap_key, regular_key, layer_key});
|
||||||
|
|
||||||
@ -216,7 +216,6 @@ TEST_F(QuickTap, tap_key_and_hold_again_before_quick_tap_term) {
|
|||||||
testing::Mock::VerifyAndClearExpectations(&driver);
|
testing::Mock::VerifyAndClearExpectations(&driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
TEST_F(QuickTap, tap_key_and_tap_again_after_quick_tap_term) {
|
TEST_F(QuickTap, tap_key_and_tap_again_after_quick_tap_term) {
|
||||||
TestDriver driver;
|
TestDriver driver;
|
||||||
InSequence s;
|
InSequence s;
|
||||||
|
Loading…
Reference in New Issue
Block a user