diff options
Diffstat (limited to 'keyboards/matrix/m12og/rev1/matrix.c')
-rw-r--r-- | keyboards/matrix/m12og/rev1/matrix.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/keyboards/matrix/m12og/rev1/matrix.c b/keyboards/matrix/m12og/rev1/matrix.c index 9c36153da1..3317abbe29 100644 --- a/keyboards/matrix/m12og/rev1/matrix.c +++ b/keyboards/matrix/m12og/rev1/matrix.c @@ -14,33 +14,30 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdint.h> -#include <stdbool.h> #include "util.h" #include "matrix.h" #include "debounce.h" -#include "quantum.h" static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static void select_col(uint8_t col) { - setPinOutput(col_pins[col]); - writePinHigh(col_pins[col]); + gpio_set_pin_output(col_pins[col]); + gpio_write_pin_high(col_pins[col]); } -static void unselect_col(uint8_t col) { setPinInputLow(col_pins[col]); } +static void unselect_col(uint8_t col) { gpio_set_pin_input_low(col_pins[col]); } static void unselect_cols(void) { for (uint8_t x = 0; x < MATRIX_COLS; x++) { - setPinInputLow(col_pins[x]); + gpio_set_pin_input_low(col_pins[x]); } } static void init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { - setPinInputLow(row_pins[x]); + gpio_set_pin_input_low(row_pins[x]); } } @@ -58,7 +55,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) matrix_row_t current_row_value = last_row_value; // Check row pin state - if (readPin(row_pins[row_index]) != 0) { + if (gpio_read_pin(row_pins[row_index]) != 0) { // Pin LO, set col bit current_row_value |= (MATRIX_ROW_SHIFTER << current_col); } else { |