~ruther/qmk_firmware

3577e26fd9916ceab58779ec6323d43da54eb3b5 — Jack Humbert 9 years ago 7d28d6a
fix/annotate wait_us lines
2 files changed, 14 insertions(+), 12 deletions(-)

M keyboards/ergodox_ez/matrix.c
M quantum/matrix.c
M keyboards/ergodox_ez/matrix.c => keyboards/ergodox_ez/matrix.c +12 -0
@@ 39,6 39,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include  "timer.h"
#endif

/*
 * 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 DEBOUNCE
#   define DEBOUNCE	5
#endif


@@ 181,6 192,7 @@ uint8_t matrix_scan(void)
    if (debouncing) {
        if (--debouncing) {
            wait_us(1);
            // this should be wait_ms(1) but has been left as-is at EZ's request
        } else {
            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
                matrix[i] = matrix_debouncing[i];

M quantum/matrix.c => quantum/matrix.c +2 -12
@@ 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];