From 90eda6da5ae5ed047db46ef7a3786d6050955fa4 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 23 Jul 2024 14:51:41 +0800 Subject: [PATCH] delete skyloong/gk980/q1/readme.md and add skyloong/gk980/q1/ansi/readme.md. --- .../skyloong/gk980/q1/{ => ansi}/readme.md | 4 +-- keyboards/skyloong/gk980/q1/matrix.c | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) rename keyboards/skyloong/gk980/q1/{ => ansi}/readme.md (94%) diff --git a/keyboards/skyloong/gk980/q1/readme.md b/keyboards/skyloong/gk980/q1/ansi/readme.md similarity index 94% rename from keyboards/skyloong/gk980/q1/readme.md rename to keyboards/skyloong/gk980/q1/ansi/readme.md index dfc62ba000b..e76b4b1c4eb 100644 --- a/keyboards/skyloong/gk980/q1/readme.md +++ b/keyboards/skyloong/gk980/q1/ansi/readme.md @@ -16,11 +16,11 @@ The following is the QMK Firmware for the Destop 96% keylayout - designed by Do Make example for this keyboard (after setting up your build environment): - make skyloong/gk980/q1:default + make skyloong/gk980/q1/ansi:default Flashing example for this keyboard: - make skyloong/gk980/q1:default:flash + make skyloong/gk980/q1/ansi:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index 4f5ecab3289..2279544d8d3 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -24,27 +24,27 @@ static inline void select_delay(uint16_t n) { }; } -static inline void setPinOutput_writeLow(pin_t pin) { +static inline void gpio_set_pin_output_write_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_set_pin_output_write_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_set_pin_input_high_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_input_high(pin); } } -static inline uint8_t readMatrixPin(pin_t pin) { +static inline uint8_t gpio_read_matrix_pin(pin_t pin) { if (pin != NO_PIN) { return (gpio_read_pin(pin) == MATRIX_INPUT_PRESSED_STATE) ? 0 : 1; } else { @@ -52,7 +52,7 @@ static inline uint8_t readMatrixPin(pin_t pin) { } } -static inline void clockPulse(uint16_t n) { +static inline void clock_pulse(uint16_t n) { gpio_write_pin_high(HC595_SH_PIN); gpio_write_pin_high(HC595_ST_PIN); select_delay(n); @@ -63,14 +63,14 @@ static inline void clockPulse(uint16_t n) { // matrix code static bool select_col(uint8_t col) { - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t m = 0; m <= col; m++) { if(m == 0){ - writePinLow(HC595_DS_PIN); + gpio_write_pin_low(HC595_DS_PIN); }else{ - writePinHigh(HC595_DS_PIN); + gpio_write_pin_high(HC595_DS_PIN); } - clockPulse(ClockTime); + clock_pulse(ClockTime); } return true; @@ -78,18 +78,18 @@ static bool select_col(uint8_t col) { static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { - clockPulse(ClockTime); + clock_pulse(ClockTime); } } static void unselect_cols(void) { - setPinOutput_writeLow(HC595_SH_PIN); - setPinOutput_writeLow(HC595_ST_PIN); - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_set_pin_output_write_low(HC595_SH_PIN); + gpio_set_pin_output_write_low(HC595_ST_PIN); + gpio_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - clockPulse(ClockTime); + clock_pulse(ClockTime); } } @@ -97,7 +97,7 @@ __attribute__((weak)) 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_set_pin_input_high_atomic(row_pins[x]); } } } @@ -114,7 +114,7 @@ __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[] // For each row... for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { // Check row pin state - if (readMatrixPin(row_pins[row_index]) == 0) { + if (gpio_read_matrix_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= row_shifter; key_pressed = true;