summaryrefslogtreecommitdiff
path: root/keyboards/ergodone/matrix.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ergodone/matrix.c')
-rw-r--r--keyboards/ergodone/matrix.c39
1 files changed, 0 insertions, 39 deletions
diff --git a/keyboards/ergodone/matrix.c b/keyboards/ergodone/matrix.c
index 2eb8f24ba8..456f73c954 100644
--- a/keyboards/ergodone/matrix.c
+++ b/keyboards/ergodone/matrix.c
@@ -9,9 +9,6 @@
#include "matrix.h"
#include "ergodone.h"
#include "expander.h"
-#ifdef DEBUG_MATRIX_SCAN_RATE
-#include "timer.h"
-#endif
/*
* This constant define not debouncing time in msecs, but amount of matrix
@@ -41,12 +38,6 @@ static void init_cols(void);
static void unselect_rows(void);
static void select_row(uint8_t row);
-#ifdef DEBUG_MATRIX_SCAN_RATE
-uint32_t matrix_timer;
-uint32_t matrix_scan_count;
-#endif
-
-
__attribute__ ((weak))
void matrix_init_user(void) {}
@@ -77,10 +68,6 @@ uint8_t matrix_cols(void)
void matrix_init(void)
{
- // disable JTAG
- MCUCR = (1<<JTD);
- MCUCR = (1<<JTD);
-
unselect_rows();
init_cols();
@@ -92,13 +79,7 @@ void matrix_init(void)
}
}
-#ifdef DEBUG_MATRIX_SCAN_RATE
- matrix_timer = timer_read32();
- matrix_scan_count = 0;
-#endif
-
matrix_init_quantum();
-
}
void matrix_power_up(void) {
@@ -109,11 +90,6 @@ void matrix_power_up(void) {
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
matrix[i] = 0;
}
-
-#ifdef DEBUG_MATRIX_SCAN_RATE
- matrix_timer = timer_read32();
- matrix_scan_count = 0;
-#endif
}
// Returns a matrix_row_t whose bits are set if the corresponding key should be
@@ -144,21 +120,6 @@ uint8_t matrix_scan(void)
{
expander_scan();
-#ifdef DEBUG_MATRIX_SCAN_RATE
- matrix_scan_count++;
-
- uint32_t timer_now = timer_read32();
- if (TIMER_DIFF_32(timer_now, matrix_timer)>1000) {
- print("matrix scan frequency: ");
- pdec(matrix_scan_count);
- print("\n");
- matrix_print();
-
- matrix_timer = timer_now;
- matrix_scan_count = 0;
- }
-#endif
-
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
select_row(i);
wait_us(30); // without this wait read unstable value.