diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-07-04 18:32:08 +0200 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-07-04 18:32:08 +0200 |
| commit | 2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d (patch) | |
| tree | 9d8e9c6b71116f01c56c870a9e1071760899ff77 /keyboards/ergodox_ez/matrix.c | |
| parent | 44a5f7630f18b40b36270d49449a43cd42b802f0 (diff) | |
| parent | 9e01b219f32b0086728c10658928b8bffcc26ef7 (diff) | |
| download | qmk_firmware-2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d.tar.gz qmk_firmware-2e1cfaf73fccdfaba2d7542f00bd7c3d49998d5d.tar.xz | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/ergodox_ez/matrix.c')
| -rw-r--r-- | keyboards/ergodox_ez/matrix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c index b87fddbad..9c1efa1d0 100644 --- a/keyboards/ergodox_ez/matrix.c +++ b/keyboards/ergodox_ez/matrix.c @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <stdint.h> #include <stdbool.h> #include <avr/io.h> -#include <util/delay.h> +#include "wait.h" #include "action_layer.h" #include "print.h" #include "debug.h" @@ -166,6 +166,7 @@ uint8_t matrix_scan(void) for (uint8_t i = 0; i < MATRIX_ROWS; i++) { select_row(i); + wait_us(30); // without this wait read unstable value. matrix_row_t cols = read_cols(i); if (matrix_debouncing[i] != cols) { matrix_debouncing[i] = cols; @@ -179,7 +180,7 @@ uint8_t matrix_scan(void) if (debouncing) { if (--debouncing) { - _delay_ms(1); + wait_us(1); } else { for (uint8_t i = 0; i < MATRIX_ROWS; i++) { matrix[i] = matrix_debouncing[i]; @@ -267,7 +268,6 @@ static matrix_row_t read_cols(uint8_t row) return data; } } else { - _delay_us(30); // without this wait read unstable value. // read from teensy return (PINF&(1<<0) ? 0 : (1<<0)) | |