diff options
| author | fauxpark <fauxpark@gmail.com> | 2020-01-19 14:11:57 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-19 14:11:57 +1100 |
| commit | eb5d267e637db4c2c639932b8c8176bf47dff78f (patch) | |
| tree | 8e9f36d80dac91f40b95eb53022118bb7deb94a3 /quantum/matrix.c | |
| parent | eaed517c0bfb10c9169457ba2a187c0c4b0eef2e (diff) | |
| download | firmware-eb5d267e637db4c2c639932b8c8176bf47dff78f.tar.gz firmware-eb5d267e637db4c2c639932b8c8176bf47dff78f.tar.bz2 firmware-eb5d267e637db4c2c639932b8c8176bf47dff78f.zip | |
Enforce definition of `DIODE_DIRECTION` for non-custom matrix boards (#7915)
* Enforce definition of `DIODE_DIRECTION` for non-custom matrix boards
* Define diode direction for failing boards
* Matching parentheses
* Put onekey diode directions in top level config
Diffstat (limited to 'quantum/matrix.c')
| -rw-r--r-- | quantum/matrix.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c index 1675f2477..6bd604bb7 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -62,7 +62,8 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) return (last_row_value != current_matrix[current_row]); } -#elif (DIODE_DIRECTION == COL2ROW) +#elif defined(DIODE_DIRECTION) +# if (DIODE_DIRECTION == COL2ROW) static void select_row(uint8_t row) { setPinOutput(row_pins[row]); @@ -110,7 +111,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) return (last_row_value != current_matrix[current_row]); } -#elif (DIODE_DIRECTION == ROW2COL) +# elif (DIODE_DIRECTION == ROW2COL) static void select_col(uint8_t col) { setPinOutput(col_pins[col]); @@ -165,6 +166,11 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) return matrix_changed; } +# else +# error DIODE_DIRECTION must be one of COL2ROW or ROW2COL! +# endif +#else +# error DIODE_DIRECTION is not defined! #endif void matrix_init(void) { |