Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-02-03 01:31:03 +00:00
commit 00b9ec088d

View file

@ -123,7 +123,7 @@ void matrix_scan_perf_task(void) {
uint32_t timer_now = timer_read32(); uint32_t timer_now = timer_read32();
if (TIMER_DIFF_32(timer_now, matrix_timer) > 1000) { if (TIMER_DIFF_32(timer_now, matrix_timer) > 1000) {
# if defined(CONSOLE_ENABLE) # if defined(CONSOLE_ENABLE)
dprintf("matrix scan frequency: %d\n", matrix_scan_count); dprintf("matrix scan frequency: %lu\n", matrix_scan_count);
# endif # endif
last_matrix_scan_count = matrix_scan_count; last_matrix_scan_count = matrix_scan_count;
matrix_timer = timer_now; matrix_timer = timer_now;