From 91bd988d6e0efe79ccfe11c59e8ae44f50010a09 Mon Sep 17 00:00:00 2001 From: Oleg Kostyuk Date: Sun, 30 Mar 2014 05:04:21 +0300 Subject: [PATCH] Rename DEBUG_MATRIX_FREQ to more appropriate DEBUG_MATRIX_SCAN_RATE --- keyboard/ergodox/config.h | 2 +- keyboard/ergodox/matrix.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboard/ergodox/config.h b/keyboard/ergodox/config.h index 7883d3c..8b9d3b2 100644 --- a/keyboard/ergodox/config.h +++ b/keyboard/ergodox/config.h @@ -82,6 +82,6 @@ Project located at //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION -//#define DEBUG_MATRIX_FREQ +//#define DEBUG_MATRIX_SCAN_RATE #endif diff --git a/keyboard/ergodox/matrix.c b/keyboard/ergodox/matrix.c index 7621e91..e8d6910 100644 --- a/keyboard/ergodox/matrix.c +++ b/keyboard/ergodox/matrix.c @@ -29,7 +29,7 @@ along with this program. If not, see . #include "matrix.h" #include "ergodox.h" #include "i2cmaster.h" -#ifdef DEBUG_MATRIX_FREQ +#ifdef DEBUG_MATRIX_SCAN_RATE #include "timer.h" #endif @@ -49,7 +49,7 @@ static void select_row(uint8_t row); static uint8_t mcp23018_reset_loop; -#ifdef DEBUG_MATRIX_FREQ +#ifdef DEBUG_MATRIX_SCAN_RATE uint32_t matrix_timer; uint32_t matrix_scan_count; #endif @@ -81,7 +81,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } -#ifdef DEBUG_MATRIX_FREQ +#ifdef DEBUG_MATRIX_SCAN_RATE matrix_timer = timer_read32(); matrix_scan_count = 0; #endif @@ -104,7 +104,7 @@ uint8_t matrix_scan(void) } } -#ifdef DEBUG_MATRIX_FREQ +#ifdef DEBUG_MATRIX_SCAN_RATE matrix_scan_count++; uint32_t timer_now = timer_read32(); -- 2.39.2