summaryrefslogtreecommitdiff
path: root/keyboards/ibm
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2024-05-03 15:21:29 +1000
committerGitHub <noreply@github.com>2024-05-03 15:21:29 +1000
commitd09a06a1b354760fd0e64a453abade972900e885 (patch)
tree88d94640f4507ac8d7f570607423825bec3c6f89 /keyboards/ibm
parent5426a7a129acf2ff5c8b435014747f1238e17965 (diff)
Update GPIO API usage in keyboard code (#23361)
Diffstat (limited to 'keyboards/ibm')
-rw-r--r--keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c18
-rw-r--r--keyboards/ibm/model_m/modelh/modelh.c4
-rw-r--r--keyboards/ibm/model_m/mschwingen/matrix.c12
-rw-r--r--keyboards/ibm/model_m/mschwingen/mschwingen.c36
-rw-r--r--keyboards/ibm/model_m/teensypp/teensypp.c18
-rw-r--r--keyboards/ibm/model_m/yugo_m/yugo_m.c12
6 files changed, 50 insertions, 50 deletions
diff --git a/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c b/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c
index 92b577635c..8bdcfe070a 100644
--- a/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c
+++ b/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c
@@ -18,19 +18,19 @@
18 18
19void keyboard_pre_init_kb(void) { 19void keyboard_pre_init_kb(void) {
20 /* Setting status LEDs pins to output and +5V (off) */ 20 /* Setting status LEDs pins to output and +5V (off) */
21 setPinOutput(D5); 21 gpio_set_pin_output(D5);
22 setPinOutput(D6); 22 gpio_set_pin_output(D6);
23 setPinOutput(D7); 23 gpio_set_pin_output(D7);
24 writePinHigh(D5); 24 gpio_write_pin_high(D5);
25 writePinHigh(D6); 25 gpio_write_pin_high(D6);
26 writePinHigh(D7); 26 gpio_write_pin_high(D7);
27} 27}
28 28
29bool led_update_kb(led_t led_state) { 29bool led_update_kb(led_t led_state) {
30 if(led_update_user(led_state)) { 30 if(led_update_user(led_state)) {
31 writePin(D5, !led_state.num_lock); 31 gpio_write_pin(D5, !led_state.num_lock);
32 writePin(D6, !led_state.caps_lock); 32 gpio_write_pin(D6, !led_state.caps_lock);
33 writePin(D7, !led_state.scroll_lock); 33 gpio_write_pin(D7, !led_state.scroll_lock);
34 } 34 }
35 return true; 35 return true;
36} 36}
diff --git a/keyboards/ibm/model_m/modelh/modelh.c b/keyboards/ibm/model_m/modelh/modelh.c
index 5384b37338..4bf3d12e6a 100644
--- a/keyboards/ibm/model_m/modelh/modelh.c
+++ b/keyboards/ibm/model_m/modelh/modelh.c
@@ -18,8 +18,8 @@
18 18
19 19
20void keyboard_pre_init_kb(void) { 20void keyboard_pre_init_kb(void) {
21 setPinOutput(MODELH_STATUS_LED); 21 gpio_set_pin_output(MODELH_STATUS_LED);
22 writePin(MODELH_STATUS_LED, 0); 22 gpio_write_pin(MODELH_STATUS_LED, 0);
23 23
24 keyboard_pre_init_user(); 24 keyboard_pre_init_user();
25} 25}
diff --git a/keyboards/ibm/model_m/mschwingen/matrix.c b/keyboards/ibm/model_m/mschwingen/matrix.c
index 85df5e5d6f..ae032a00a0 100644
--- a/keyboards/ibm/model_m/mschwingen/matrix.c
+++ b/keyboards/ibm/model_m/mschwingen/matrix.c
@@ -31,15 +31,15 @@ static uint16_t row_bits[MATRIX_ROWS] = {
31static const pin_t col_pins[MATRIX_COLS] = {D1, D4, D7, B4, F7, F6, F5, F4}; 31static const pin_t col_pins[MATRIX_COLS] = {D1, D4, D7, B4, F7, F6, F5, F4};
32 32
33static void select_col(uint8_t col) { 33static void select_col(uint8_t col) {
34 setPinOutput(col_pins[col]); 34 gpio_set_pin_output(col_pins[col]);
35 writePinLow(col_pins[col]); 35 gpio_write_pin_low(col_pins[col]);
36} 36}
37 37
38static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); } 38static void unselect_col(uint8_t col) { gpio_set_pin_input_high(col_pins[col]); }
39 39
40static void unselect_cols(void) { 40static void unselect_cols(void) {
41 for (uint8_t x = 0; x < MATRIX_COLS; x++) { 41 for (uint8_t x = 0; x < MATRIX_COLS; x++) {
42 setPinInputHigh(col_pins[x]); 42 gpio_set_pin_input_high(col_pins[x]);
43 } 43 }
44} 44}
45 45
@@ -51,8 +51,8 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
51 select_col(current_col); 51 select_col(current_col);
52 matrix_io_delay(); 52 matrix_io_delay();
53 53
54 writePinLow(SR_LOAD_PIN); 54 gpio_write_pin_low(SR_LOAD_PIN);
55 writePinHigh(SR_LOAD_PIN); 55 gpio_write_pin_high(SR_LOAD_PIN);
56 56
57 row_data = spi_read() << 8; 57 row_data = spi_read() << 8;
58 row_data |= spi_read(); 58 row_data |= spi_read();
diff --git a/keyboards/ibm/model_m/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c
index 6a8a0ec8fc..7112ab63a5 100644
--- a/keyboards/ibm/model_m/mschwingen/mschwingen.c
+++ b/keyboards/ibm/model_m/mschwingen/mschwingen.c
@@ -74,12 +74,12 @@ void sleep_led_toggle(void) {}
74 74
75void sleep_led_disable(void) { 75void sleep_led_disable(void) {
76 suspend_active = false; 76 suspend_active = false;
77 writePinHigh(MODELM_STATUS_LED); 77 gpio_write_pin_high(MODELM_STATUS_LED);
78} 78}
79 79
80void sleep_led_enable(void) { 80void sleep_led_enable(void) {
81 suspend_active = true; 81 suspend_active = true;
82 writePinLow(MODELM_STATUS_LED); 82 gpio_write_pin_low(MODELM_STATUS_LED);
83#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 83#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812
84 led[0] = black; 84 led[0] = black;
85 led[1] = black; 85 led[1] = black;
@@ -94,15 +94,15 @@ void keyboard_pre_init_kb(void) {
94 ws2812_setleds(led, RGBLIGHT_LED_COUNT); 94 ws2812_setleds(led, RGBLIGHT_LED_COUNT);
95#else 95#else
96 /* Set status LEDs pins to output and Low (on) */ 96 /* Set status LEDs pins to output and Low (on) */
97 setPinOutput(MODELM_LED_CAPSLOCK); 97 gpio_set_pin_output(MODELM_LED_CAPSLOCK);
98 setPinOutput(MODELM_LED_SCROLLOCK); 98 gpio_set_pin_output(MODELM_LED_SCROLLOCK);
99 setPinOutput(MODELM_LED_NUMLOCK); 99 gpio_set_pin_output(MODELM_LED_NUMLOCK);
100 writePinLow(MODELM_LED_CAPSLOCK); 100 gpio_write_pin_low(MODELM_LED_CAPSLOCK);
101 writePinLow(MODELM_LED_SCROLLOCK); 101 gpio_write_pin_low(MODELM_LED_SCROLLOCK);
102 writePinLow(MODELM_LED_NUMLOCK); 102 gpio_write_pin_low(MODELM_LED_NUMLOCK);
103#endif 103#endif
104 setPinOutput(MODELM_STATUS_LED); 104 gpio_set_pin_output(MODELM_STATUS_LED);
105 writePinHigh(MODELM_STATUS_LED); 105 gpio_write_pin_high(MODELM_STATUS_LED);
106 _delay_ms(50); 106 _delay_ms(50);
107#ifdef UART_DEBUG 107#ifdef UART_DEBUG
108 uart_init(115200); 108 uart_init(115200);
@@ -110,10 +110,10 @@ void keyboard_pre_init_kb(void) {
110 uprintf("\r\nHello world!\r\n"); 110 uprintf("\r\nHello world!\r\n");
111#endif 111#endif
112 112
113 setPinOutput(SR_LOAD_PIN); 113 gpio_set_pin_output(SR_LOAD_PIN);
114 setPinOutput(SR_CLK_PIN); 114 gpio_set_pin_output(SR_CLK_PIN);
115 setPinOutput(SR_DOUT_PIN); // MOSI - unused 115 gpio_set_pin_output(SR_DOUT_PIN); // MOSI - unused
116 writePinLow(SR_CLK_PIN); 116 gpio_write_pin_low(SR_CLK_PIN);
117} 117}
118 118
119#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 119#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812
@@ -187,9 +187,9 @@ bool led_update_kb(led_t led_state) {
187 dprintf("LED Update: %d %d %d", led_state.num_lock, led_state.caps_lock, led_state.scroll_lock); 187 dprintf("LED Update: %d %d %d", led_state.num_lock, led_state.caps_lock, led_state.scroll_lock);
188 188
189 if (led_update_user(led_state)) { 189 if (led_update_user(led_state)) {
190 if (!isRecording) writePin(MODELM_LED_NUMLOCK, !led_state.num_lock); 190 if (!isRecording) gpio_write_pin(MODELM_LED_NUMLOCK, !led_state.num_lock);
191 writePin(MODELM_LED_CAPSLOCK, !led_state.caps_lock); 191 gpio_write_pin(MODELM_LED_CAPSLOCK, !led_state.caps_lock);
192 writePin(MODELM_LED_SCROLLOCK, !led_state.scroll_lock); 192 gpio_write_pin(MODELM_LED_SCROLLOCK, !led_state.scroll_lock);
193 } 193 }
194 return true; 194 return true;
195} 195}
@@ -198,7 +198,7 @@ void update_layer_leds(void) {
198 if (isRecording && timer_elapsed(blink_cycle_timer) > 150) { 198 if (isRecording && timer_elapsed(blink_cycle_timer) > 150) {
199 blink_state = !blink_state; 199 blink_state = !blink_state;
200 blink_cycle_timer = timer_read(); 200 blink_cycle_timer = timer_read();
201 writePin(MODELM_LED_NUMLOCK, blink_state); 201 gpio_write_pin(MODELM_LED_NUMLOCK, blink_state);
202 } 202 }
203} 203}
204 204
diff --git a/keyboards/ibm/model_m/teensypp/teensypp.c b/keyboards/ibm/model_m/teensypp/teensypp.c
index fa8669dc81..aac85424bf 100644
--- a/keyboards/ibm/model_m/teensypp/teensypp.c
+++ b/keyboards/ibm/model_m/teensypp/teensypp.c
@@ -17,20 +17,20 @@
17 17
18void led_init_ports(void) { 18void led_init_ports(void) {
19 /* Setting status LEDs pins to output and +5V (off) */ 19 /* Setting status LEDs pins to output and +5V (off) */
20 setPinOutput(B4); 20 gpio_set_pin_output(B4);
21 setPinOutput(B5); 21 gpio_set_pin_output(B5);
22 setPinOutput(B6); 22 gpio_set_pin_output(B6);
23 writePinHigh(B4); 23 gpio_write_pin_high(B4);
24 writePinHigh(B5); 24 gpio_write_pin_high(B5);
25 writePinHigh(B6); 25 gpio_write_pin_high(B6);
26} 26}
27 27
28bool led_update_kb(led_t led_state) { 28bool led_update_kb(led_t led_state) {
29 bool res = led_update_user(led_state); 29 bool res = led_update_user(led_state);
30 if(res) { 30 if(res) {
31 writePin(B4, !led_state.num_lock); 31 gpio_write_pin(B4, !led_state.num_lock);
32 writePin(B6, !led_state.caps_lock); 32 gpio_write_pin(B6, !led_state.caps_lock);
33 writePin(B5, !led_state.scroll_lock); 33 gpio_write_pin(B5, !led_state.scroll_lock);
34 } 34 }
35 return res; 35 return res;
36} 36}
diff --git a/keyboards/ibm/model_m/yugo_m/yugo_m.c b/keyboards/ibm/model_m/yugo_m/yugo_m.c
index 542043d5dc..a725a3657b 100644
--- a/keyboards/ibm/model_m/yugo_m/yugo_m.c
+++ b/keyboards/ibm/model_m/yugo_m/yugo_m.c
@@ -17,9 +17,9 @@
17 17
18void keyboard_pre_init_kb(void) { 18void keyboard_pre_init_kb(void) {
19 // Set our LED pins as output 19 // Set our LED pins as output
20 setPinOutput(A2); 20 gpio_set_pin_output(A2);
21 setPinOutput(A1); 21 gpio_set_pin_output(A1);
22 setPinOutput(A0); 22 gpio_set_pin_output(A0);
23 23
24 keyboard_pre_init_user(); 24 keyboard_pre_init_user();
25} 25}
@@ -27,9 +27,9 @@ void keyboard_pre_init_kb(void) {
27bool led_update_kb(led_t led_state) { 27bool led_update_kb(led_t led_state) {
28 bool res = led_update_user(led_state); 28 bool res = led_update_user(led_state);
29 if(res) { 29 if(res) {
30 writePin(A2, !led_state.num_lock); 30 gpio_write_pin(A2, !led_state.num_lock);
31 writePin(A1, !led_state.caps_lock); 31 gpio_write_pin(A1, !led_state.caps_lock);
32 writePin(A0, !led_state.scroll_lock); 32 gpio_write_pin(A0, !led_state.scroll_lock);
33 } 33 }
34 return res; 34 return res;
35} 35}