diff options
author | QMK Bot <hello@qmk.fm> | 2021-02-03 01:31:03 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-02-03 01:31:03 +0000 |
commit | 00b9ec088da312c7e5dde52d1f39636e42765013 (patch) | |
tree | 15e03f5539550d446c927e02b37a80073b3f3f87 | |
parent | 24b6c537f401b659781fc3a1586bcd36fd43f973 (diff) | |
parent | c0de49e393cf481f60f2bbd6c18ecb13d37c6254 (diff) | |
download | qmk_firmware-00b9ec088da312c7e5dde52d1f39636e42765013.tar.gz qmk_firmware-00b9ec088da312c7e5dde52d1f39636e42765013.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | tmk_core/common/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 1250c45ae..61b6674f9 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c | |||
@@ -123,7 +123,7 @@ void matrix_scan_perf_task(void) { | |||
123 | uint32_t timer_now = timer_read32(); | 123 | uint32_t timer_now = timer_read32(); |
124 | if (TIMER_DIFF_32(timer_now, matrix_timer) > 1000) { | 124 | if (TIMER_DIFF_32(timer_now, matrix_timer) > 1000) { |
125 | # if defined(CONSOLE_ENABLE) | 125 | # if defined(CONSOLE_ENABLE) |
126 | dprintf("matrix scan frequency: %d\n", matrix_scan_count); | 126 | dprintf("matrix scan frequency: %lu\n", matrix_scan_count); |
127 | # endif | 127 | # endif |
128 | last_matrix_scan_count = matrix_scan_count; | 128 | last_matrix_scan_count = matrix_scan_count; |
129 | matrix_timer = timer_now; | 129 | matrix_timer = timer_now; |