diff options
Diffstat (limited to 'keyboards/gmmk/numpad/matrix.c')
-rw-r--r-- | keyboards/gmmk/numpad/matrix.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/keyboards/gmmk/numpad/matrix.c b/keyboards/gmmk/numpad/matrix.c index 99adb38f18..4ec41bdb73 100644 --- a/keyboards/gmmk/numpad/matrix.c +++ b/keyboards/gmmk/numpad/matrix.c @@ -4,15 +4,12 @@ /* * scan matrix */ -#include <stdint.h> -#include <stdbool.h> +#include "matrix.h" +#include <string.h> +#include "atomic_util.h" #include "wait.h" #include "print.h" #include "debug.h" -#include "util.h" -#include "matrix.h" -#include "debounce.h" -#include "quantum.h" /* matrix state(1:on, 0:off) */ extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values @@ -24,27 +21,27 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } static inline void setPinInputHigh_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinInputHigh(pin); + gpio_set_pin_input_high(pin); } } static inline uint8_t readMatrixPin(pin_t pin) { if (pin != NO_PIN) { - return readPin(pin); + return gpio_read_pin(pin); } else { return 1; } |