aboutsummaryrefslogtreecommitdiff
path: root/keyboards/keychron/q12/matrix.c
diff options
context:
space:
mode:
authorRyan <[email protected]>2024-07-13 18:41:05 +1000
committerGitHub <[email protected]>2024-07-13 18:41:05 +1000
commit1552cf2ddca1668c5230506de03e6b4a870f8961 (patch)
treeaff19101b7bedf6d5f35d15948e257a96e7c93d5 /keyboards/keychron/q12/matrix.c
parent5c43a9bed13e885f9a5b04f521f508f8c7e44e7e (diff)
downloadqmk_firmware-1552cf2ddca1668c5230506de03e6b4a870f8961.tar.gz
qmk_firmware-1552cf2ddca1668c5230506de03e6b4a870f8961.zip
Update atomic GPIO macros in keyboard custom matrix (#23796)
Diffstat (limited to 'keyboards/keychron/q12/matrix.c')
-rw-r--r--keyboards/keychron/q12/matrix.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/keyboards/keychron/q12/matrix.c b/keyboards/keychron/q12/matrix.c
index 9d5e9c4d39..bfb51703a0 100644
--- a/keyboards/keychron/q12/matrix.c
+++ b/keyboards/keychron/q12/matrix.c
@@ -34,21 +34,21 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
#define ROWS_PER_HAND (MATRIX_ROWS)
-static inline void setPinOutput_writeLow(pin_t pin) {
+static inline void gpio_atomic_set_pin_output_low(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
gpio_set_pin_output(pin);
gpio_write_pin_low(pin);
}
}
-static inline void setPinOutput_writeHigh(pin_t pin) {
+static inline void gpio_atomic_set_pin_output_high(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
gpio_set_pin_output(pin);
gpio_write_pin_high(pin);
}
}
-static inline void setPinInputHigh_atomic(pin_t pin) {
+static inline void gpio_atomic_set_pin_input_high(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
gpio_set_pin_input_high(pin);
}
@@ -65,36 +65,36 @@ static inline uint8_t readMatrixPin(pin_t pin) {
static void shiftOut(uint8_t dataOut) {
for (uint8_t i = 0; i < 8; i++) {
if (dataOut & 0x1) {
- setPinOutput_writeHigh(DATA_PIN);
+ gpio_atomic_set_pin_output_high(DATA_PIN);
} else {
- setPinOutput_writeLow(DATA_PIN);
+ gpio_atomic_set_pin_output_low(DATA_PIN);
}
dataOut = dataOut >> 1;
- setPinOutput_writeHigh(CLOCK_PIN);
- setPinOutput_writeLow(CLOCK_PIN);
+ gpio_atomic_set_pin_output_high(CLOCK_PIN);
+ gpio_atomic_set_pin_output_low(CLOCK_PIN);
}
- setPinOutput_writeHigh(LATCH_PIN);
- setPinOutput_writeLow(LATCH_PIN);
+ gpio_atomic_set_pin_output_high(LATCH_PIN);
+ gpio_atomic_set_pin_output_low(LATCH_PIN);
}
static void shiftout_single(uint8_t data) {
if (data & 0x1) {
- setPinOutput_writeHigh(DATA_PIN);
+ gpio_atomic_set_pin_output_high(DATA_PIN);
} else {
- setPinOutput_writeLow(DATA_PIN);
+ gpio_atomic_set_pin_output_low(DATA_PIN);
}
- setPinOutput_writeHigh(CLOCK_PIN);
- setPinOutput_writeLow(CLOCK_PIN);
+ gpio_atomic_set_pin_output_high(CLOCK_PIN);
+ gpio_atomic_set_pin_output_low(CLOCK_PIN);
- setPinOutput_writeHigh(LATCH_PIN);
- setPinOutput_writeLow(LATCH_PIN);
+ gpio_atomic_set_pin_output_high(LATCH_PIN);
+ gpio_atomic_set_pin_output_low(LATCH_PIN);
}
static bool select_col(uint8_t col) {
pin_t pin = col_pins[col];
if (pin != NO_PIN) {
- setPinOutput_writeLow(pin);
+ gpio_atomic_set_pin_output_low(pin);
return true;
} else {
if (col == 10) {
@@ -112,16 +112,16 @@ static void unselect_col(uint8_t col) {
if (pin != NO_PIN) {
#ifdef MATRIX_UNSELECT_DRIVE_HIGH
- setPinOutput_writeHigh(pin);
+ gpio_atomic_set_pin_output_high(pin);
#else
- setPinInputHigh_atomic(pin);
+ gpio_atomic_set_pin_input_high(pin);
#endif
} else {
if (col == (MATRIX_COLS - 1))
- setPinOutput_writeHigh(CLOCK_PIN);
- setPinOutput_writeLow(CLOCK_PIN);
- setPinOutput_writeHigh(LATCH_PIN);
- setPinOutput_writeLow(LATCH_PIN);
+ gpio_atomic_set_pin_output_high(CLOCK_PIN);
+ gpio_atomic_set_pin_output_low(CLOCK_PIN);
+ gpio_atomic_set_pin_output_high(LATCH_PIN);
+ gpio_atomic_set_pin_output_low(LATCH_PIN);
}
}
@@ -131,9 +131,9 @@ static void unselect_cols(void) {
pin_t pin = col_pins[x];
if (pin != NO_PIN) {
#ifdef MATRIX_UNSELECT_DRIVE_HIGH
- setPinOutput_writeHigh(pin);
+ gpio_atomic_set_pin_output_high(pin);
#else
- setPinInputHigh_atomic(pin);
+ gpio_atomic_set_pin_input_high(pin);
#endif
}
if (x == 10)
@@ -146,7 +146,7 @@ static void matrix_init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
if (row_pins[x] != NO_PIN) {
- setPinInputHigh_atomic(row_pins[x]);
+ gpio_atomic_set_pin_input_high(row_pins[x]);
}
}
}