summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/action.c4
-rw-r--r--tmk_core/common/report.c30
-rw-r--r--tmk_core/common/report.h2
3 files changed, 18 insertions, 18 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 2deafd465f..555a71ebc6 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 f4cdca7281..1bcb6f2adb 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 645e016121..b7d104a459 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);