diff options
author | 2016-07-06 18:05:50 -0400 | |
---|---|---|
committer | 2016-07-06 18:05:50 -0400 | |
commit | c88207884b5fb16c8955b54b4331fc605158b9f2 (patch) | |
tree | 3c929a4e018db257b7f0238f2a52d21600352bca /quantum/matrix.c | |
parent | eb6e17be6fc378fdfb8c5c2c7253c17ffc07d225 (diff) | |
parent | 5baaf871bbdd6667625860b0daef7fe9a91e08db (diff) | |
download | qmk_firmware-c88207884b5fb16c8955b54b4331fc605158b9f2.tar.gz |
Merge branch 'master' into lets-split-support
Diffstat (limited to 'quantum/matrix.c')
-rw-r--r-- | quantum/matrix.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c index 094917025..3174e0739 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -27,16 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "matrix.h" /* Set 0 if debouncing isn't needed */ -/* - * This constant define not debouncing time in msecs, but amount of matrix - * scan loops which should be made to get stable debounced results. - * - * On Ergodox matrix scan rate is relatively low, because of slow I2C. - * Now it's only 317 scans/second, or about 3.15 msec/scan. - * According to Cherry specs, debouncing time is 5 msec. - * - * And so, there is no sense to have DEBOUNCE higher than 2. - */ #ifndef DEBOUNCING_DELAY # define DEBOUNCING_DELAY 5 @@ -168,7 +158,7 @@ uint8_t matrix_scan(void) if (debouncing) { if (--debouncing) { - wait_us(1); + wait_ms(1); } else { for (uint8_t i = 0; i < MATRIX_ROWS; i++) { matrix[i] = matrix_debouncing[i]; @@ -192,7 +182,7 @@ uint8_t matrix_scan(void) if (debouncing) { if (--debouncing) { - wait_us(1); + wait_ms(1); } else { for (uint8_t i = 0; i < MATRIX_COLS; i++) { matrix_reversed[i] = matrix_reversed_debouncing[i]; |