summaryrefslogtreecommitdiff
path: root/tmk_core/common/report.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 /tmk_core/common/report.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 'tmk_core/common/report.c')
-rw-r--r--tmk_core/common/report.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/tmk_core/common/report.c b/tmk_core/common/report.c
index f4758b48ec..f4cdca7281 100644
--- a/tmk_core/common/report.c
+++ b/tmk_core/common/report.c
@@ -68,6 +68,32 @@ uint8_t get_first_key(report_keyboard_t* keyboard_report) {
#endif
}
+/** \brief Checks if a key is pressed in the report
+ *
+ * Returns true if the keyboard_report reports that the key is pressed, otherwise false
+ * Note: The function doesn't support modifers currently, and it returns false for KC_NO
+ */
+bool is_key_pressed(report_keyboard_t* keyboard_report, uint8_t key) {
+ if (key == KC_NO) {
+ return false;
+ }
+#ifdef NKRO_ENABLE
+ if (keyboard_protocol && keymap_config.nkro) {
+ if ((key>>3) < KEYBOARD_REPORT_BITS) {
+ return keyboard_report->nkro.bits[key>>3] & 1<<(key&7);
+ } else {
+ return false;
+ }
+ }
+#endif
+ for (int i=0; i < KEYBOARD_REPORT_KEYS; i++) {
+ if (keyboard_report->keys[i] == key) {
+ return true;
+ }
+ }
+ return false;
+}
+
/** \brief add key byte
*
* FIXME: Needs doc