aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/basic/keymap.c1
-rw-r--r--tests/basic/test_keypress.cpp208
-rw-r--r--tmk_core/common/action.c4
-rw-r--r--tmk_core/common/report.c30
-rw-r--r--tmk_core/common/report.h2
5 files changed, 122 insertions, 123 deletions
diff --git a/tests/basic/keymap.c b/tests/basic/keymap.c
index 951ce8e0c..2b5747abb 100644
--- a/tests/basic/keymap.c
+++ b/tests/basic/keymap.c
@@ -43,4 +43,3 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
}
return MACRO_NONE;
};
-
diff --git a/tests/basic/test_keypress.cpp b/tests/basic/test_keypress.cpp
index 551458a0d..ecd6e98e4 100644
--- a/tests/basic/test_keypress.cpp
+++ b/tests/basic/test_keypress.cpp
@@ -17,8 +17,8 @@
#include "test_common.hpp"
using testing::_;
-using testing::Return;
using testing::InSequence;
+using testing::Return;
class KeyPress : public TestFixture {};
@@ -125,116 +125,116 @@ TEST_F(KeyPress, RightShiftLeftControlAndCharWithTheSameKey) {
}
TEST_F(KeyPress, PressPlusEqualReleaseBeforePress) {
- TestDriver driver;
- InSequence s;
-
- press_key(1, 1); // KC_PLUS
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- release_key(1, 1); // KC_PLUS
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- press_key(0, 1); // KC_EQL
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- release_key(0, 1); // KC_EQL
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ TestDriver driver;
+ InSequence s;
+
+ press_key(1, 1); // KC_PLUS
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ release_key(1, 1); // KC_PLUS
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ press_key(0, 1); // KC_EQL
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ release_key(0, 1); // KC_EQL
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
}
TEST_F(KeyPress, PressPlusEqualDontReleaseBeforePress) {
- TestDriver driver;
- InSequence s;
-
- press_key(1, 1); // KC_PLUS
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- press_key(0, 1); // KC_EQL
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- release_key(1, 1); //KC_PLS
- // BUG: Should really still return KC_EQL, but this is fine too
- // It's also called twice for some reason
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(2);
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- release_key(0, 1); // KC_EQL
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ TestDriver driver;
+ InSequence s;
+
+ press_key(1, 1); // KC_PLUS
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ press_key(0, 1); // KC_EQL
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ release_key(1, 1); // KC_PLS
+ // BUG: Should really still return KC_EQL, but this is fine too
+ // It's also called twice for some reason
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(2);
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ release_key(0, 1); // KC_EQL
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
}
TEST_F(KeyPress, PressEqualPlusReleaseBeforePress) {
- TestDriver driver;
- InSequence s;
-
- press_key(0, 1); // KC_EQL
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- release_key(0, 1); // KQ_EQL
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- press_key(1, 1); // KC_PLUS
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- release_key(1, 1); // KC_PLUS
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ TestDriver driver;
+ InSequence s;
+
+ press_key(0, 1); // KC_EQL
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ release_key(0, 1); // KQ_EQL
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ press_key(1, 1); // KC_PLUS
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ release_key(1, 1); // KC_PLUS
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
}
TEST_F(KeyPress, PressEqualPlusDontReleaseBeforePress) {
- TestDriver driver;
- InSequence s;
-
- press_key(0, 1); // KC_EQL
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- press_key(1, 1); // KC_PLUS
- // BUG: The sequence is a bit strange, but it works, the end result is that
- // KC_PLUS is sent
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- release_key(0, 1); //KC_EQL
- // I guess it's fine to still report shift here
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
-
- release_key(1, 1); // KC_PLUS
- // This report is not needed
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
- EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
- run_one_scan_loop();
- testing::Mock::VerifyAndClearExpectations(&driver);
+ TestDriver driver;
+ InSequence s;
+
+ press_key(0, 1); // KC_EQL
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ press_key(1, 1); // KC_PLUS
+ // BUG: The sequence is a bit strange, but it works, the end result is that
+ // KC_PLUS is sent
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ release_key(0, 1); // KC_EQL
+ // I guess it's fine to still report shift here
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
+
+ release_key(1, 1); // KC_PLUS
+ // This report is not needed
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+ EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+ run_one_scan_loop();
+ testing::Mock::VerifyAndClearExpectations(&driver);
}
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 2deafd465..555a71ebc 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -758,8 +758,8 @@ void register_code(uint8_t code) {
// 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();
+ del_key(code);
+ send_keyboard_report();
}
add_key(code);
send_keyboard_report();
diff --git a/tmk_core/common/report.c b/tmk_core/common/report.c
index f4cdca728..1bcb6f2ad 100644
--- a/tmk_core/common/report.c
+++ b/tmk_core/common/report.c
@@ -74,24 +74,24 @@ uint8_t get_first_key(report_keyboard_t* keyboard_report) {
* 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;
- }
+ 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;
+ 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;
+ for (int i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
+ if (keyboard_report->keys[i] == key) {
+ return true;
+ }
+ }
+ return false;
}
/** \brief add key byte
diff --git a/tmk_core/common/report.h b/tmk_core/common/report.h
index 645e01612..b7d104a45 100644
--- a/tmk_core/common/report.h
+++ b/tmk_core/common/report.h
@@ -237,7 +237,7 @@ static inline uint16_t KEYCODE2CONSUMER(uint8_t key) {
uint8_t has_anykey(report_keyboard_t* keyboard_report);
uint8_t get_first_key(report_keyboard_t* keyboard_report);
-bool is_key_pressed(report_keyboard_t* keyboard_report, uint8_t key);
+bool is_key_pressed(report_keyboard_t* keyboard_report, uint8_t key);
void add_key_byte(report_keyboard_t* keyboard_report, uint8_t code);
void del_key_byte(report_keyboard_t* keyboard_report, uint8_t code);
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-29 16:49:09 +0000