[Keyboard] fixed pins for numpad_5x4 layout (#6311)

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

diff --git a/keyboards/meira/matrix.c b/keyboards/meira/matrix.c
index a4d8ec247db5976b0bf6015d1be3941c22422d77..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
@@ -75,15 +75,6 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
 static void unselect_cols(void);
 static void select_col(uint8_t col);
 
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
@@ -141,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;
@@ -153,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];
             }
@@ -169,19 +160,6 @@ uint8_t matrix_scan(void)
 {
        uint8_t ret = _matrix_scan();
        matrix_scan_quantum();
-//     // HACK backlighting
-//     for (uint8_t t = 0; t < meira_get_backlight_level(); t++) {
-//             for (uint8_t x = 0; x < 13; x++) {
-//                     for (uint8_t y = 0; y < 4; y++) {
-//                             uint8_t pin = lcol_pins[y];
-//                             if ((x >> y) & 1) {
-//                                     _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI
-//                             } else {
-//                                     _SFR_IO8((pin >> 4) + 2) &=  ~_BV(pin & 0xF); // LO
-//                             }
-//                     }
-//             }
-//     }
        return ret;
 }
 
@@ -229,21 +207,9 @@ static void init_rows(void)
         uint8_t pin = row_pins[x];
         _SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN
         _SFR_IO8((pin >> 4) + 2) |=  _BV(pin & 0xF); // HI
-//        // HACK backlighting
-//        uint8_t lpin = lrow_pins[x];
-//        _SFR_IO8((lpin >> 4) + 1) |= _BV(lpin & 0xF); // OUT
-//        _SFR_IO8((lpin >> 4) + 2) |=  _BV(lpin & 0xF); // HI
     }
 }
 
-//static void init_lcols(void)
-//{
-//     for (uint8_t x = 0; x < 4; x++) {
-//             uint8_t pin = lcol_pins[x];
-//             _SFR_IO8((pin >> 4) + 1) |= _BV(pin & 0xF); // OUT
-//             _SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HIGH
-//     }
-//}
 
 static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
 {
@@ -310,5 +276,3 @@ static void unselect_cols(void)
         _SFR_IO8((pin >> 4) + 2) &=  ~_BV(pin & 0xF); // LOW
     }
 }
-
-