diff options
| -rw-r--r-- | quantum/keymap_common.c | 1 | ||||
| -rw-r--r-- | tests/basic/keymap.c | 5 | ||||
| -rw-r--r-- | tests/test_common/matrix.c | 3 | ||||
| -rw-r--r-- | tests/test_common/test_fixture.cpp | 4 | ||||
| -rw-r--r-- | tests/test_common/test_fixture.hpp | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index b1460c53c..1c522e8b8 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c | |||
| @@ -169,7 +169,6 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | // translates key to keycode | 171 | // translates key to keycode |
| 172 | __attribute__ ((weak)) | ||
| 173 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | 172 | uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) |
| 174 | { | 173 | { |
| 175 | // Read entire word (16bits) | 174 | // Read entire word (16bits) |
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) { | |||
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | return MACRO_NONE; | 42 | return MACRO_NONE; |
| 43 | }; \ No newline at end of file | 43 | }; |
| 44 | |||
| 45 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { | ||
| 46 | } \ 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) { | |||
| 58 | void clear_all_keys(void) { | 58 | void clear_all_keys(void) { |
| 59 | memset(matrix, 0, sizeof(matrix)); | 59 | memset(matrix, 0, sizeof(matrix)); |
| 60 | } | 60 | } |
| 61 | |||
| 62 | void led_set(uint8_t usb_led) { | ||
| 63 | } | ||
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() { | |||
| 44 | advance_time(1); | 44 | advance_time(1); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | void TestFixture::idle_for(uint time) { | 47 | void TestFixture::idle_for(unsigned time) { |
| 48 | for (uint i=0; i<time; i++) { | 48 | for (unsigned i=0; i<time; i++) { |
| 49 | run_one_scan_loop(); | 49 | run_one_scan_loop(); |
| 50 | } | 50 | } |
| 51 | } \ No newline at end of file | 51 | } \ 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: | |||
| 26 | static void TearDownTestCase(); | 26 | static void TearDownTestCase(); |
| 27 | 27 | ||
| 28 | void run_one_scan_loop(); | 28 | void run_one_scan_loop(); |
| 29 | void idle_for(uint ms); | 29 | void idle_for(unsigned ms); |
| 30 | }; \ No newline at end of file | 30 | }; \ No newline at end of file |
