Usbasploader bootloader option addition (#6304)

[qmk_firmware.git] / keyboards / meira / matrix.c

diff --git a/keyboards/meira/matrix.c b/keyboards/meira/matrix.c
index c1952f35fb1815adce0cef21807a24b3fc2ab309..030c91332d0d78a81689ae4f079c230e3ab46d42 100644 (file)
--- a/keyboards/meira/matrix.c
+++ b/keyboards/meira/matrix.c
@@ -33,11 +33,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config.h"
 #include "timer.h"
 
-#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
@@ -132,7 +132,7 @@ uint8_t _matrix_scan(void)
 {
     // Set col, read rows
     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) {
                 debouncing = true;
@@ -144,8 +144,8 @@ uint8_t _matrix_scan(void)
 
     }
 
-#   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];
             }
@@ -276,5 +276,3 @@ static void unselect_cols(void)
         _SFR_IO8((pin >> 4) + 2) &=  ~_BV(pin & 0xF); // LOW
     }
 }
-
-