From 7974bb17c55b3bf3c30ac5b40b5afc7a9db8457e Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 10 May 2025 16:28:53 +0800 Subject: [PATCH] update skyloong/gk75/q2/matrix.c --- keyboards/skyloong/gk75/q2/matrix.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index bfdb39dd056..bd8699cf73e 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -9,9 +9,9 @@ #define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 -#define HC595_ST_PIN A6 -#define HC595_SH_PIN A5 -#define HC595_DS_PIN A7 //定义74HC595的串口数据输入端 +#define MATRIX_HC595_ST_PIN A6 +#define MATRIX_HC595_SH_PIN A5 +#define MATRIX_HC595_DS_PIN A7 //定义74HC595的串口数据输入端 /* matrix state(1:on, 0:off) */ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values @@ -57,22 +57,22 @@ static inline uint8_t readMatrixPin(pin_t pin) { } static inline void clockPulse(uint16_t n) { - gpio_write_pin_high(HC595_SH_PIN); - gpio_write_pin_high(HC595_ST_PIN); + gpio_write_pin_high(MATRIX_HC595_SH_PIN); + gpio_write_pin_high(MATRIX_HC595_ST_PIN); select_delay(n); - gpio_write_pin_low(HC595_SH_PIN); - gpio_write_pin_low(HC595_ST_PIN); + gpio_write_pin_low(MATRIX_HC595_SH_PIN); + gpio_write_pin_low(MATRIX_HC595_ST_PIN); } // matrix code static bool select_col(uint8_t col) { - gpio_atomic_set_pin_output_high(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(MATRIX_HC595_DS_PIN); for (uint8_t m = 0; m <= col; m++) { if(m == 0){ - gpio_write_pin_low(HC595_DS_PIN); + gpio_write_pin_low(MATRIX_HC595_DS_PIN); }else{ - gpio_write_pin_high(HC595_DS_PIN); + gpio_write_pin_high(MATRIX_HC595_DS_PIN); } clockPulse(CLOCK_TIME); } @@ -82,16 +82,16 @@ static bool select_col(uint8_t col) { static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); - gpio_atomic_set_pin_output_high(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(MATRIX_HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { clockPulse(CLOCK_TIME); } } static void unselect_cols(void) { - gpio_atomic_set_pin_output_low(HC595_SH_PIN); - gpio_atomic_set_pin_output_low(HC595_ST_PIN); - gpio_atomic_set_pin_output_high(HC595_DS_PIN); + gpio_atomic_set_pin_output_low(MATRIX_HC595_SH_PIN); + gpio_atomic_set_pin_output_low(MATRIX_HC595_ST_PIN); + gpio_atomic_set_pin_output_high(MATRIX_HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { clockPulse(CLOCK_TIME); }