diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-07-14 21:34:37 -0400 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-07-14 21:34:37 -0400 |
| commit | 5412229603c1b16051776e81bed57697adf339e2 (patch) | |
| tree | 088e5e6d1d0d448f0e5c4032a830c27b33a126ab /tests/test_common | |
| parent | d73d30aa846f4378b8f1fa072a4620520b3c1953 (diff) | |
| parent | 6ed8ce4f598f838b971aa290a499f852827e1b58 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tests/test_common')
| -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 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/test_common/matrix.c b/tests/test_common/matrix.c index 0d9fa68b04..4b501039b6 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 df57338dfc..4084ee9c67 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 4146b682b1..fb37e440fc 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 |