Rename DEBUG_MATRIX_FREQ to more appropriate DEBUG_MATRIX_SCAN_RATE

This commit is contained in:
Oleg Kostyuk 2014-03-30 05:04:21 +03:00
parent 976b595c2e
commit 91bd988d6e
2 changed files with 5 additions and 5 deletions

View file

@ -82,6 +82,6 @@ Project located at <https://github.com/benblazak/ergodox-firmware>
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
//#define DEBUG_MATRIX_FREQ
//#define DEBUG_MATRIX_SCAN_RATE
#endif

View file

@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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();