|
@@ -60,8 +60,10 @@ along with this program. If not, see <http:
|
|
|
extern const matrix_row_t matrix_mask[];
|
|
|
#endif
|
|
|
|
|
|
+#if (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
|
|
|
static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
|
|
|
static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
static matrix_row_t matrix[MATRIX_ROWS];
|
|
@@ -75,7 +77,7 @@ static matrix_row_t matrix_debouncing[MATRIX_ROWS];
|
|
|
static void unselect_rows(void);
|
|
|
static void select_row(uint8_t row);
|
|
|
static void unselect_row(uint8_t row);
|
|
|
-#else
|
|
|
+#elif (DIODE_DIRECTION == ROW2COL)
|
|
|
static void init_rows(void);
|
|
|
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col);
|
|
|
static void unselect_cols(void);
|
|
@@ -132,7 +134,7 @@ uint8_t matrix_cols(void) {
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
@@ -157,7 +159,7 @@ void matrix_init(void) {
|
|
|
#if (DIODE_DIRECTION == COL2ROW)
|
|
|
unselect_rows();
|
|
|
init_cols();
|
|
|
-#else
|
|
|
+#elif (DIODE_DIRECTION == ROW2COL)
|
|
|
unselect_cols();
|
|
|
init_rows();
|
|
|
#endif
|
|
@@ -192,7 +194,7 @@ uint8_t matrix_scan(void)
|
|
|
|
|
|
}
|
|
|
|
|
|
-#else
|
|
|
+#elif (DIODE_DIRECTION == ROW2COL)
|
|
|
|
|
|
|
|
|
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
|
|
@@ -334,7 +336,7 @@ static void unselect_rows(void)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-#else
|
|
|
+#elif (DIODE_DIRECTION == ROW2COL)
|
|
|
|
|
|
static void init_rows(void)
|
|
|
{
|