diff options
author | Ryan <[email protected]> | 2024-05-03 15:21:29 +1000 |
---|---|---|
committer | GitHub <[email protected]> | 2024-05-03 15:21:29 +1000 |
commit | d09a06a1b354760fd0e64a453abade972900e885 (patch) | |
tree | 88d94640f4507ac8d7f570607423825bec3c6f89 /keyboards/ktec/ergodone | |
parent | 5426a7a129acf2ff5c8b435014747f1238e17965 (diff) | |
download | qmk_firmware-d09a06a1b354760fd0e64a453abade972900e885.tar.gz qmk_firmware-d09a06a1b354760fd0e64a453abade972900e885.zip |
Update GPIO API usage in keyboard code (#23361)
Diffstat (limited to 'keyboards/ktec/ergodone')
-rw-r--r-- | keyboards/ktec/ergodone/ergodox_compat.h | 16 | ||||
-rw-r--r-- | keyboards/ktec/ergodone/matrix.c | 100 |
2 files changed, 58 insertions, 58 deletions
diff --git a/keyboards/ktec/ergodone/ergodox_compat.h b/keyboards/ktec/ergodone/ergodox_compat.h index de6ee4a211..b566e6cc94 100644 --- a/keyboards/ktec/ergodone/ergodox_compat.h +++ b/keyboards/ktec/ergodone/ergodox_compat.h @@ -15,12 +15,12 @@ #endif #define LED_BRIGHTNESS_LO 15 #define LED_BRIGHTNESS_HI 255 -static inline void ergodox_right_led_1_off(void) { setPinOutput(LED_NUM_LOCK_PIN); writePin(LED_NUM_LOCK_PIN, 0); } -static inline void ergodox_right_led_1_on(void) { setPinOutput(LED_NUM_LOCK_PIN); writePin(LED_NUM_LOCK_PIN, 1); } -static inline void ergodox_right_led_2_off(void) { setPinOutput(LED_CAPS_LOCK_PIN); writePin(LED_CAPS_LOCK_PIN, 0); } -static inline void ergodox_right_led_2_on(void) { setPinOutput(LED_CAPS_LOCK_PIN); writePin(LED_CAPS_LOCK_PIN, 1); } -static inline void ergodox_right_led_3_off(void) { setPinOutput(LED_SCROLL_LOCK_PIN); writePin(LED_SCROLL_LOCK_PIN, 0); } -static inline void ergodox_right_led_3_on(void) { setPinOutput(LED_SCROLL_LOCK_PIN); writePin(LED_SCROLL_LOCK_PIN, 1); } +static inline void ergodox_right_led_1_off(void) { gpio_set_pin_output(LED_NUM_LOCK_PIN); gpio_write_pin(LED_NUM_LOCK_PIN, 0); } +static inline void ergodox_right_led_1_on(void) { gpio_set_pin_output(LED_NUM_LOCK_PIN); gpio_write_pin(LED_NUM_LOCK_PIN, 1); } +static inline void ergodox_right_led_2_off(void) { gpio_set_pin_output(LED_CAPS_LOCK_PIN); gpio_write_pin(LED_CAPS_LOCK_PIN, 0); } +static inline void ergodox_right_led_2_on(void) { gpio_set_pin_output(LED_CAPS_LOCK_PIN); gpio_write_pin(LED_CAPS_LOCK_PIN, 1); } +static inline void ergodox_right_led_3_off(void) { gpio_set_pin_output(LED_SCROLL_LOCK_PIN); gpio_write_pin(LED_SCROLL_LOCK_PIN, 0); } +static inline void ergodox_right_led_3_on(void) { gpio_set_pin_output(LED_SCROLL_LOCK_PIN); gpio_write_pin(LED_SCROLL_LOCK_PIN, 1); } static inline void ergodox_right_led_on(uint8_t l) { switch (l) { case 1: @@ -51,8 +51,8 @@ static inline void ergodox_right_led_off(uint8_t l) { break; } } -static inline void ergodox_board_led_off(void) { setPinOutput(D5); writePin(D5, !ERGODOX_BOARD_LED_ON_STATE); } -static inline void ergodox_board_led_on(void) { setPinOutput(D5); writePin(D5, ERGODOX_BOARD_LED_ON_STATE); } +static inline void ergodox_board_led_off(void) { gpio_set_pin_output(D5); gpio_write_pin(D5, !ERGODOX_BOARD_LED_ON_STATE); } +static inline void ergodox_board_led_on(void) { gpio_set_pin_output(D5); gpio_write_pin(D5, ERGODOX_BOARD_LED_ON_STATE); } static inline void ergodox_led_all_on(void) { ergodox_right_led_1_on(); ergodox_right_led_2_on(); diff --git a/keyboards/ktec/ergodone/matrix.c b/keyboards/ktec/ergodone/matrix.c index a9a517f2f1..f034e1f2db 100644 --- a/keyboards/ktec/ergodone/matrix.c +++ b/keyboards/ktec/ergodone/matrix.c @@ -82,13 +82,13 @@ static void expander_scan(void) { */ static void init_cols(void) { // Pro Micro - setPinInputHigh(E6); - setPinInputHigh(D2); - setPinInputHigh(D3); - setPinInputHigh(D4); - setPinInputHigh(D7); - setPinInputHigh(C6); - setPinInputHigh(B4); + gpio_set_pin_input_high(E6); + gpio_set_pin_input_high(D2); + gpio_set_pin_input_high(D3); + gpio_set_pin_input_high(D4); + gpio_set_pin_input_high(D7); + gpio_set_pin_input_high(C6); + gpio_set_pin_input_high(B4); // Expander expander_init_cols(); @@ -97,13 +97,13 @@ static void init_cols(void) { static matrix_row_t read_cols(void) { // clang-format off return expander_read_row() | - (readPin(D3) ? 0 : (1<<6)) | - (readPin(D2) ? 0 : (1<<5)) | - (readPin(D4) ? 0 : (1<<4)) | - (readPin(C6) ? 0 : (1<<3)) | - (readPin(D7) ? 0 : (1<<2)) | - (readPin(E6) ? 0 : (1<<1)) | - (readPin(B4) ? 0 : (1<<0)) ; + (gpio_read_pin(D3) ? 0 : (1<<6)) | + (gpio_read_pin(D2) ? 0 : (1<<5)) | + (gpio_read_pin(D4) ? 0 : (1<<4)) | + (gpio_read_pin(C6) ? 0 : (1<<3)) | + (gpio_read_pin(D7) ? 0 : (1<<2)) | + (gpio_read_pin(E6) ? 0 : (1<<1)) | + (gpio_read_pin(B4) ? 0 : (1<<0)) ; // clang-format on } @@ -116,18 +116,18 @@ static matrix_row_t read_cols(void) { */ static void unselect_rows(void) { // Pro Micro - setPinInput(B1); - setPinInput(B2); - setPinInput(F4); - setPinInput(F5); - setPinInput(F6); - setPinInput(F7); - writePinLow(B1); - writePinLow(B2); - writePinLow(F4); - writePinLow(F5); - writePinLow(F6); - writePinLow(F7); + gpio_set_pin_input(B1); + gpio_set_pin_input(B2); + gpio_set_pin_input(F4); + gpio_set_pin_input(F5); + gpio_set_pin_input(F6); + gpio_set_pin_input(F7); + gpio_write_pin_low(B1); + gpio_write_pin_low(B2); + gpio_write_pin_low(F4); + gpio_write_pin_low(F5); + gpio_write_pin_low(F6); + gpio_write_pin_low(F7); // Expander expander_unselect_rows(); @@ -137,28 +137,28 @@ static void unselect_row(uint8_t row) { // Pro Micro switch (row) { case 0: - setPinInput(F4); - writePinLow(F4); + gpio_set_pin_input(F4); + gpio_write_pin_low(F4); break; case 1: - setPinInput(F5); - writePinLow(F5); + gpio_set_pin_input(F5); + gpio_write_pin_low(F5); break; case 2: - setPinInput(F6); - writePinLow(F6); + gpio_set_pin_input(F6); + gpio_write_pin_low(F6); break; case 3: - setPinInput(F7); - writePinLow(F7); + gpio_set_pin_input(F7); + gpio_write_pin_low(F7); break; case 4: - setPinInput(B1); - writePinLow(B1); + gpio_set_pin_input(B1); + gpio_write_pin_low(B1); break; case 5: - setPinInput(B2); - writePinLow(B2); + gpio_set_pin_input(B2); + gpio_write_pin_low(B2); break; } @@ -170,28 +170,28 @@ static void select_row(uint8_t row) { // Pro Micro switch (row) { case 0: - setPinOutput(F4); - writePinLow(F4); + gpio_set_pin_output(F4); + gpio_write_pin_low(F4); break; case 1: - setPinOutput(F5); - writePinLow(F5); + gpio_set_pin_output(F5); + gpio_write_pin_low(F5); break; case 2: - setPinOutput(F6); - writePinLow(F6); + gpio_set_pin_output(F6); + gpio_write_pin_low(F6); break; case 3: - setPinOutput(F7); - writePinLow(F7); + gpio_set_pin_output(F7); + gpio_write_pin_low(F7); break; case 4: - setPinOutput(B1); - writePinLow(B1); + gpio_set_pin_output(B1); + gpio_write_pin_low(B1); break; case 5: - setPinOutput(B2); - writePinLow(B2); + gpio_set_pin_output(B2); + gpio_write_pin_low(B2); break; } |