5 files changed, 122 insertions(+), 123 deletions(-)

M tests/basic/keymap.c
M tests/basic/test_keypress.cpp
M tmk_core/common/action.c
M tmk_core/common/report.c
M tmk_core/common/report.h

@@ 43,4 43,3 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
     }
     return MACRO_NONE;
 };
-

@@ 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);
 }

@@ 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();

@@ 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

@@ 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);