summaryrefslogtreecommitdiff
path: root/tmk_core/common/action.c
diff options
context:
space:
mode:
authorfredizzimo <fsundvik@gmail.com>2020-03-13 20:09:38 +0200
committerFlorian Didron <fdidron@users.noreply.github.com>2020-06-12 17:00:27 +0900
commit662ff6623ab33f52786f0f81b709c16a37c19e07 (patch)
tree8c1c86316ad1c49c105e0b6423c75dce08a8bc73 /tmk_core/common/action.c
parentc04358777d67bba257cc029bcd45f7e79d1cdaa7 (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 'tmk_core/common/action.c')
-rw-r--r--tmk_core/common/action.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index ab68681ded..1ebe8b691a 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -752,6 +752,13 @@ void register_code(uint8_t code) {
*/
#endif
{
+ // Force a new key press if the key is already pressed
+ // without this, keys with the same keycode, but different
+ // modifiers will be reported incorrectly, see issue #1708
+ if (is_key_pressed(keyboard_report, code)) {
+ del_key(code);
+ send_keyboard_report();
+ }
add_key(code);
send_keyboard_report();
}