drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE (#5997)

Browse source
This commit is contained in:
Drashna Jael're 2019-06-06 12:09:56 -07:00 • committed by MechMerlin
parent fe6b8edd58
commit faaaa134fd
448 changed files with 594 additions and 627 deletions
Download patch file Download diff file Expand all files Collapse all files

16
keyboards/handwired/dactyl/matrix.c
View file

@ -31,11 +31,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Set 0 if debouncing isn't needed */
#ifndef DEBOUNCING_DELAY
# define DEBOUNCING_DELAY 5
#ifndef DEBOUNCE
# define DEBOUNCE 5
#endif
#if (DEBOUNCING_DELAY > 0)
#if (DEBOUNCE > 0)
static uint16_t debouncing_time;
static bool debouncing = false;
#endif
@ -256,7 +256,7 @@ uint8_t matrix_scan(void)
#if (DIODE_DIRECTION == COL2ROW)
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
# if (DEBOUNCING_DELAY > 0)
# if (DEBOUNCE > 0)
bool matrix_changed = read_cols_on_row(matrix_debouncing, current_row);
if (matrix_changed) {
@ -270,7 +270,7 @@ uint8_t matrix_scan(void)
#elif (DIODE_DIRECTION == ROW2COL)
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
# if (DEBOUNCING_DELAY > 0)
# if (DEBOUNCE > 0)
bool matrix_changed = read_rows_on_col(matrix_debouncing, current_col);
if (matrix_changed) {
@ -284,8 +284,8 @@ uint8_t matrix_scan(void)
}
#endif
# if (DEBOUNCING_DELAY > 0)
if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCING_DELAY)) {
# if (DEBOUNCE > 0)
if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCE)) {
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
matrix[i] = matrix_debouncing[i];
}
@ -299,7 +299,7 @@ uint8_t matrix_scan(void)
bool matrix_is_modified(void) // deprecated and evidently not called.
{
#if (DEBOUNCING_DELAY > 0)
#if (DEBOUNCE > 0)
if (debouncing) return false;
#endif
return true;