diff options
author | fauxpark <fauxpark@gmail.com> | 2020-12-18 02:15:28 +1100 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2020-12-18 02:15:28 +1100 |
commit | 7797070b376ff18a5d540ccc2a95033fc548c611 (patch) | |
tree | e3092fed02c154ed104c5fa541a604c9ed8643cb /quantum/split_common/matrix.c | |
parent | 973057cfe4ac0ddc23b7ed1016245e6fc939c456 (diff) | |
parent | 6ea4b06f9fc19825605477cdc27f5bec0f3dc0a9 (diff) |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'quantum/split_common/matrix.c')
-rw-r--r-- | quantum/split_common/matrix.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c index cd5a024c3d..51bf8b1095 100644 --- a/quantum/split_common/matrix.c +++ b/quantum/split_common/matrix.c @@ -53,9 +53,7 @@ static inline void setPinOutput_writeLow(pin_t pin) { } static inline void setPinInputHigh_atomic(pin_t pin) { - ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); - } + ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); } } // matrix code @@ -95,13 +93,9 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) #elif defined(DIODE_DIRECTION) # if (DIODE_DIRECTION == COL2ROW) -static void select_row(uint8_t row) { - setPinOutput_writeLow(row_pins[row]); -} +static void select_row(uint8_t row) { setPinOutput_writeLow(row_pins[row]); } -static void unselect_row(uint8_t row) { - setPinInputHigh_atomic(row_pins[row]); -} +static void unselect_row(uint8_t row) { setPinInputHigh_atomic(row_pins[row]); } static void unselect_rows(void) { for (uint8_t x = 0; x < ROWS_PER_HAND; x++) { @@ -146,13 +140,9 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) # elif (DIODE_DIRECTION == ROW2COL) -static void select_col(uint8_t col) { - setPinOutput_writeLow(col_pins[col]); -} +static void select_col(uint8_t col) { setPinOutput_writeLow(col_pins[col]); } -static void unselect_col(uint8_t col) { - setPinInputHigh_atomic(col_pins[col]); -} +static void unselect_col(uint8_t col) { setPinInputHigh_atomic(col_pins[col]); } static void unselect_cols(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { |