diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-05 13:28:01 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-05 13:28:01 +0000 |
| commit | b4e02f8ddfdd945ea33e2dac722c4ad21a147f5f (patch) | |
| tree | bed080fcf3bf41731476795a113ef8c8dd5f8f80 /tmk_core/common/keyboard.c | |
| parent | 1816b163153b17b1ade22a905bf9509cc2f1b774 (diff) | |
| parent | b2d0e8a491f347d43b482808a744642fc975afab (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common/keyboard.c')
| -rw-r--r-- | tmk_core/common/keyboard.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 61b6674f90..40989ca4c6 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -113,8 +113,8 @@ void last_encoder_activity_trigger(void) { last_encoder_modification_ // Only enable this if console is enabled to print to #if defined(DEBUG_MATRIX_SCAN_RATE) -static uint32_t matrix_timer = 0; -static uint32_t matrix_scan_count = 0; +static uint32_t matrix_timer = 0; +static uint32_t matrix_scan_count = 0; static uint32_t last_matrix_scan_count = 0; void matrix_scan_perf_task(void) { @@ -126,14 +126,12 @@ void matrix_scan_perf_task(void) { dprintf("matrix scan frequency: %lu\n", matrix_scan_count); # endif last_matrix_scan_count = matrix_scan_count; - matrix_timer = timer_now; - matrix_scan_count = 0; + matrix_timer = timer_now; + matrix_scan_count = 0; } } -uint32_t get_matrix_scan_rate(void) { - return last_matrix_scan_count; -} +uint32_t get_matrix_scan_rate(void) { return last_matrix_scan_count; } #else # define matrix_scan_perf_task() #endif |