Merge branch 'master' into minidox

4 files changed, 10 insertions, 4 deletions

diff --git a/tests/basic/keymap.c b/tests/basic/keymap.c
index 3274f213f..3f97c0a0e 100644
--- a/tests/basic/keymap.c
+++ b/tests/basic/keymap.c
@@ -40,4 +40,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
         }
     }
     return MACRO_NONE;
-};
\ No newline at end of file
+};
+
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
+}
\ No newline at end of file
diff --git a/tests/test_common/matrix.c b/tests/test_common/matrix.c
index 0d9fa68b0..4b501039b 100644
--- a/tests/test_common/matrix.c
+++ b/tests/test_common/matrix.c
@@ -58,3 +58,6 @@ void release_key(uint8_t col, uint8_t row) {
 void clear_all_keys(void) {
     memset(matrix, 0, sizeof(matrix));
 }
+
+void led_set(uint8_t usb_led) {
+}
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index df57338df..4084ee9c6 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -44,8 +44,8 @@ void TestFixture::run_one_scan_loop() {
     advance_time(1);
 }
 
-void TestFixture::idle_for(uint time) {
-    for (uint i=0; i<time; i++) {
+void TestFixture::idle_for(unsigned time) {
+    for (unsigned i=0; i<time; i++) {
         run_one_scan_loop();
     }
 }
\ No newline at end of file
diff --git a/tests/test_common/test_fixture.hpp b/tests/test_common/test_fixture.hpp
index 4146b682b..fb37e440f 100644
--- a/tests/test_common/test_fixture.hpp
+++ b/tests/test_common/test_fixture.hpp
@@ -26,5 +26,5 @@ public:
     static void TearDownTestCase();
 
     void run_one_scan_loop();
-    void idle_for(uint ms);
+    void idle_for(unsigned ms);
 };
\ No newline at end of file