summary refs log tree commit diff
path: root/tests/basic/keymap.c
diff options
context:
space:
mode:
authorfredizzimo <fsundvik@gmail.com>2020-03-13 20:09:38 +0200
committerGitHub <noreply@github.com>2020-03-13 14:09:38 -0400
commit9e8767917d628afd3dc43759d1d50151c61944a1 (patch)
tree0060b8968d5e9df38c37b375e4eb2d6a0d65ac0c /tests/basic/keymap.c
parentf89439ae09c06d0e85f59af2bc5e020d141f23d6 (diff)
Fix pressing two keys with the same keycode but different modifiers (#2710)
* Fix extra keyboard report during test_fixture teardown

* Add tests for pressing two keys with only different modifers

* Fix #1708

When two keys that use the same keycode, but different modifiers were
pressed at the same time, the second keypress wasn't registered. This is
fixed by forcing a key release when we detect a new press for the same
keycode.

* Fix the NKRO version of is_key_pressed

* Fix uninitalized loop variable

Co-authored-by: Jack Humbert <jack.humb@gmail.com>
Diffstat (limited to 'tests/basic/keymap.c')
-rw-r--r--tests/basic/keymap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/basic/keymap.c b/tests/basic/keymap.c
index 02b3cc961a..951ce8e0cc 100644
--- a/tests/basic/keymap.c
+++ b/tests/basic/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM
                 {
                     // 0    1      2      3        4        5        6       7            8      9
                     {KC_A, KC_B, KC_NO, KC_LSFT, KC_RSFT, KC_LCTL, COMBO1, SFT_T(KC_P), M(0), KC_NO},
-                    {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
+                    {KC_EQL, KC_PLUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
                     {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
                     {KC_C, KC_D, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
                 },
@@ -43,3 +43,4 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
     }
     return MACRO_NONE;
 };
+