aboutsummaryrefslogtreecommitdiff
path: root/keyboards/ergodox_ez/matrix.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ergodox_ez/matrix.c')
-rw-r--r--keyboards/ergodox_ez/matrix.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index 6f604ae2b..2bfe27b9a 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -1,9 +1,5 @@
1/* 1/*
2 2
3Note for ErgoDox EZ customizers: Here be dragons!
4This is not a file you want to be messing with.
5All of the interesting stuff for you is under keymaps/ :)
6Love, Erez
7 3
8Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com> 4Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
9 5
@@ -95,7 +91,7 @@ void matrix_init(void) {
95 // initialize matrix state: all keys off 91 // initialize matrix state: all keys off
96 for (uint8_t i = 0; i < MATRIX_ROWS; i++) { 92 for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
97 matrix[i] = 0; 93 matrix[i] = 0;
98 raw_matrix[i] = 0; 94 raw_matrix[i] = 0;
99 } 95 }
100 96
101#ifdef DEBUG_MATRIX_SCAN_RATE 97#ifdef DEBUG_MATRIX_SCAN_RATE
@@ -168,7 +164,7 @@ uint8_t matrix_scan(void) {
168#ifdef LEFT_LEDS 164#ifdef LEFT_LEDS
169 mcp23018_status = ergodox_left_leds_update(); 165 mcp23018_status = ergodox_left_leds_update();
170#endif // LEFT_LEDS 166#endif // LEFT_LEDS
171 bool changed = false; 167 bool changed = false;
172 for (uint8_t i = 0; i < MATRIX_ROWS_PER_SIDE; i++) { 168 for (uint8_t i = 0; i < MATRIX_ROWS_PER_SIDE; i++) {
173 // select rows from left and right hands 169 // select rows from left and right hands
174 uint8_t left_index = i; 170 uint8_t left_index = i;
@@ -178,13 +174,13 @@ uint8_t matrix_scan(void) {
178 174
179 // we don't need a 30us delay anymore, because selecting a 175 // we don't need a 30us delay anymore, because selecting a
180 // left-hand row requires more than 30us for i2c. 176 // left-hand row requires more than 30us for i2c.
181 177
182 changed |= store_raw_matrix_row(left_index); 178 changed |= store_raw_matrix_row(left_index);
183 changed |= store_raw_matrix_row(right_index); 179 changed |= store_raw_matrix_row(right_index);
184 180
185 unselect_rows(); 181 unselect_rows();
186 } 182 }
187 183
188 debounce(raw_matrix, matrix, MATRIX_ROWS, changed); 184 debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
189 matrix_scan_quantum(); 185 matrix_scan_quantum();
190 186