Convert some AVR GPIO operations to macros (#23424)

8 files changed, 64 insertions, 114 deletions

diff --git a/keyboards/glenpickle/chimera_ergo/chimera_ergo.c b/keyboards/glenpickle/chimera_ergo/chimera_ergo.c
index 47653c2e4b..40748e0b3d 100644
--- a/keyboards/glenpickle/chimera_ergo/chimera_ergo.c
+++ b/keyboards/glenpickle/chimera_ergo/chimera_ergo.c
@@ -1,10 +1,12 @@
 #include "chimera_ergo.h"
 
 void led_init(void) {
-	DDRD  |= (1<<1);
-	PORTD |= (1<<1);
-	DDRF  |= (1<<4) | (1<<5);
-	PORTF |= (1<<4) | (1<<5);
+	gpio_set_pin_output(CHIMERA_ERGO_GREEN_LED_PIN);
+	gpio_write_pin_high(CHIMERA_ERGO_GREEN_LED_PIN);
+	gpio_set_pin_output(CHIMERA_ERGO_BLUE_LED_PIN);
+	gpio_write_pin_high(CHIMERA_ERGO_BLUE_LED_PIN);
+	gpio_set_pin_output(CHIMERA_ERGO_RED_LED_PIN);
+	gpio_write_pin_high(CHIMERA_ERGO_RED_LED_PIN);
 }
 
 
diff --git a/keyboards/glenpickle/chimera_ergo/chimera_ergo.h b/keyboards/glenpickle/chimera_ergo/chimera_ergo.h
index 04ef56503f..46f0b931e8 100644
--- a/keyboards/glenpickle/chimera_ergo/chimera_ergo.h
+++ b/keyboards/glenpickle/chimera_ergo/chimera_ergo.h
@@ -2,12 +2,16 @@
 
 #include "quantum.h"
 
-#define red_led_off   PORTF |= (1<<5)
-#define red_led_on    PORTF &= ~(1<<5)
-#define blu_led_off   PORTF |= (1<<4)
-#define blu_led_on    PORTF &= ~(1<<4)
-#define grn_led_off   PORTD |= (1<<1)
-#define grn_led_on    PORTD &= ~(1<<1)
+#define CHIMERA_ERGO_RED_LED_PIN F5
+#define CHIMERA_ERGO_GREEN_LED_PIN D1
+#define CHIMERA_ERGO_BLUE_LED_PIN F4
+
+#define red_led_off   gpio_write_pin_high(CHIMERA_ERGO_RED_LED_PIN)
+#define red_led_on    gpio_write_pin_low(CHIMERA_ERGO_RED_LED_PIN)
+#define blu_led_off   gpio_write_pin_high(CHIMERA_ERGO_BLUE_LED_PIN)
+#define blu_led_on    gpio_write_pin_low(CHIMERA_ERGO_BLUE_LED_PIN)
+#define grn_led_off   gpio_write_pin_high(CHIMERA_ERGO_GREEN_LED_PIN)
+#define grn_led_on    gpio_write_pin_low(CHIMERA_ERGO_GREEN_LED_PIN)
 
 #define set_led_off     red_led_off; grn_led_off; blu_led_off
 #define set_led_red     red_led_on;  grn_led_off; blu_led_off
@@ -17,27 +21,3 @@
 #define set_led_magenta red_led_on;  grn_led_off; blu_led_on
 #define set_led_cyan    red_led_off; grn_led_on;  blu_led_on
 #define set_led_white   red_led_on;  grn_led_on;  blu_led_on
-
-/*
-#define LED_B 5
-#define LED_R 6
-#define LED_G 7
-
-#define all_leds_off PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G)
-
-#define red_led_on   PORTF |= (1<<LED_R)
-#define red_led_off  PORTF &= ~(1<<LED_R)
-#define grn_led_on   PORTF |= (1<<LED_G)
-#define grn_led_off  PORTF &= ~(1<<LED_G)
-#define blu_led_on   PORTF |= (1<<LED_B)
-#define blu_led_off  PORTF &= ~(1<<LED_B)
-
-#define set_led_off     PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G)
-#define set_led_red     PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_G) | (1<<LED_R)
-#define set_led_blue    PORTF = PORTF & ~(1<<LED_G) & ~(1<<LED_R) | (1<<LED_B)
-#define set_led_green   PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_R) | (1<<LED_G)
-#define set_led_yellow  PORTF = PORTF & ~(1<<LED_B) | (1<<LED_R) | (1<<LED_G)
-#define set_led_magenta PORTF = PORTF & ~(1<<LED_G) | (1<<LED_R) | (1<<LED_B)
-#define set_led_cyan    PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G)
-#define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)
-*/
diff --git a/keyboards/glenpickle/chimera_ls/chimera_ls.c b/keyboards/glenpickle/chimera_ls/chimera_ls.c
index f88e9a4f12..80bd99047f 100644
--- a/keyboards/glenpickle/chimera_ls/chimera_ls.c
+++ b/keyboards/glenpickle/chimera_ls/chimera_ls.c
@@ -1,10 +1,12 @@
 #include "chimera_ls.h"
 
 void led_init(void) {
-	DDRD  |= (1<<1);
-	PORTD |= (1<<1);
-	DDRF  |= (1<<4) | (1<<5);
-	PORTF |= (1<<4) | (1<<5);
+	gpio_set_pin_output(CHIMERA_LS_GREEN_LED_PIN);
+	gpio_write_pin_high(CHIMERA_LS_GREEN_LED_PIN);
+	gpio_set_pin_output(CHIMERA_LS_BLUE_LED_PIN);
+	gpio_write_pin_high(CHIMERA_LS_BLUE_LED_PIN);
+	gpio_set_pin_output(CHIMERA_LS_RED_LED_PIN);
+	gpio_write_pin_high(CHIMERA_LS_RED_LED_PIN);
 }
 
 
diff --git a/keyboards/glenpickle/chimera_ls/chimera_ls.h b/keyboards/glenpickle/chimera_ls/chimera_ls.h
index 04ef56503f..f4c04614bb 100644
--- a/keyboards/glenpickle/chimera_ls/chimera_ls.h
+++ b/keyboards/glenpickle/chimera_ls/chimera_ls.h
@@ -2,12 +2,16 @@
 
 #include "quantum.h"
 
-#define red_led_off   PORTF |= (1<<5)
-#define red_led_on    PORTF &= ~(1<<5)
-#define blu_led_off   PORTF |= (1<<4)
-#define blu_led_on    PORTF &= ~(1<<4)
-#define grn_led_off   PORTD |= (1<<1)
-#define grn_led_on    PORTD &= ~(1<<1)
+#define CHIMERA_LS_RED_LED_PIN F5
+#define CHIMERA_LS_GREEN_LED_PIN D1
+#define CHIMERA_LS_BLUE_LED_PIN F4
+
+#define red_led_off   gpio_write_pin_high(CHIMERA_LS_RED_LED_PIN)
+#define red_led_on    gpio_write_pin_low(CHIMERA_LS_RED_LED_PIN)
+#define blu_led_off   gpio_write_pin_high(CHIMERA_LS_BLUE_LED_PIN)
+#define blu_led_on    gpio_write_pin_low(CHIMERA_LS_BLUE_LED_PIN)
+#define grn_led_off   gpio_write_pin_high(CHIMERA_LS_GREEN_LED_PIN)
+#define grn_led_on    gpio_write_pin_low(CHIMERA_LS_GREEN_LED_PIN)
 
 #define set_led_off     red_led_off; grn_led_off; blu_led_off
 #define set_led_red     red_led_on;  grn_led_off; blu_led_off
@@ -17,27 +21,3 @@
 #define set_led_magenta red_led_on;  grn_led_off; blu_led_on
 #define set_led_cyan    red_led_off; grn_led_on;  blu_led_on
 #define set_led_white   red_led_on;  grn_led_on;  blu_led_on
-
-/*
-#define LED_B 5
-#define LED_R 6
-#define LED_G 7
-
-#define all_leds_off PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G)
-
-#define red_led_on   PORTF |= (1<<LED_R)
-#define red_led_off  PORTF &= ~(1<<LED_R)
-#define grn_led_on   PORTF |= (1<<LED_G)
-#define grn_led_off  PORTF &= ~(1<<LED_G)
-#define blu_led_on   PORTF |= (1<<LED_B)
-#define blu_led_off  PORTF &= ~(1<<LED_B)
-
-#define set_led_off     PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G)
-#define set_led_red     PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_G) | (1<<LED_R)
-#define set_led_blue    PORTF = PORTF & ~(1<<LED_G) & ~(1<<LED_R) | (1<<LED_B)
-#define set_led_green   PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_R) | (1<<LED_G)
-#define set_led_yellow  PORTF = PORTF & ~(1<<LED_B) | (1<<LED_R) | (1<<LED_G)
-#define set_led_magenta PORTF = PORTF & ~(1<<LED_G) | (1<<LED_R) | (1<<LED_B)
-#define set_led_cyan    PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G)
-#define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)
-*/
diff --git a/keyboards/glenpickle/chimera_ortho/chimera_ortho.c b/keyboards/glenpickle/chimera_ortho/chimera_ortho.c
index 2cdc3d9331..d7dc7b68cf 100644
--- a/keyboards/glenpickle/chimera_ortho/chimera_ortho.c
+++ b/keyboards/glenpickle/chimera_ortho/chimera_ortho.c
@@ -1,10 +1,12 @@
 #include "chimera_ortho.h"
 
 void led_init(void) {
-	DDRD  |= (1<<1);
-	PORTD |= (1<<1);
-	DDRF  |= (1<<4) | (1<<5);
-	PORTF |= (1<<4) | (1<<5);
+	gpio_set_pin_output(CHIMERA_ORTHO_GREEN_LED_PIN);
+	gpio_write_pin_high(CHIMERA_ORTHO_GREEN_LED_PIN);
+	gpio_set_pin_output(CHIMERA_ORTHO_BLUE_LED_PIN);
+	gpio_write_pin_high(CHIMERA_ORTHO_BLUE_LED_PIN);
+	gpio_set_pin_output(CHIMERA_ORTHO_RED_LED_PIN);
+	gpio_write_pin_high(CHIMERA_ORTHO_RED_LED_PIN);
 }
 
 
diff --git a/keyboards/glenpickle/chimera_ortho/chimera_ortho.h b/keyboards/glenpickle/chimera_ortho/chimera_ortho.h
index 04ef56503f..5f9169b93b 100644
--- a/keyboards/glenpickle/chimera_ortho/chimera_ortho.h
+++ b/keyboards/glenpickle/chimera_ortho/chimera_ortho.h
@@ -2,12 +2,16 @@
 
 #include "quantum.h"
 
-#define red_led_off   PORTF |= (1<<5)
-#define red_led_on    PORTF &= ~(1<<5)
-#define blu_led_off   PORTF |= (1<<4)
-#define blu_led_on    PORTF &= ~(1<<4)
-#define grn_led_off   PORTD |= (1<<1)
-#define grn_led_on    PORTD &= ~(1<<1)
+#define CHIMERA_ORTHO_RED_LED_PIN F5
+#define CHIMERA_ORTHO_GREEN_LED_PIN D1
+#define CHIMERA_ORTHO_BLUE_LED_PIN F4
+
+#define red_led_off   gpio_write_pin_high(CHIMERA_ORTHO_RED_LED_PIN)
+#define red_led_on    gpio_write_pin_low(CHIMERA_ORTHO_RED_LED_PIN)
+#define blu_led_off   gpio_write_pin_high(CHIMERA_ORTHO_BLUE_LED_PIN)
+#define blu_led_on    gpio_write_pin_low(CHIMERA_ORTHO_BLUE_LED_PIN)
+#define grn_led_off   gpio_write_pin_high(CHIMERA_ORTHO_GREEN_LED_PIN)
+#define grn_led_on    gpio_write_pin_low(CHIMERA_ORTHO_GREEN_LED_PIN)
 
 #define set_led_off     red_led_off; grn_led_off; blu_led_off
 #define set_led_red     red_led_on;  grn_led_off; blu_led_off
@@ -17,27 +21,3 @@
 #define set_led_magenta red_led_on;  grn_led_off; blu_led_on
 #define set_led_cyan    red_led_off; grn_led_on;  blu_led_on
 #define set_led_white   red_led_on;  grn_led_on;  blu_led_on
-
-/*
-#define LED_B 5
-#define LED_R 6
-#define LED_G 7
-
-#define all_leds_off PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G)
-
-#define red_led_on   PORTF |= (1<<LED_R)
-#define red_led_off  PORTF &= ~(1<<LED_R)
-#define grn_led_on   PORTF |= (1<<LED_G)
-#define grn_led_off  PORTF &= ~(1<<LED_G)
-#define blu_led_on   PORTF |= (1<<LED_B)
-#define blu_led_off  PORTF &= ~(1<<LED_B)
-
-#define set_led_off     PORTF &= ~(1<<LED_B) & ~(1<<LED_R) & ~(1<<LED_G)
-#define set_led_red     PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_G) | (1<<LED_R)
-#define set_led_blue    PORTF = PORTF & ~(1<<LED_G) & ~(1<<LED_R) | (1<<LED_B)
-#define set_led_green   PORTF = PORTF & ~(1<<LED_B) & ~(1<<LED_R) | (1<<LED_G)
-#define set_led_yellow  PORTF = PORTF & ~(1<<LED_B) | (1<<LED_R) | (1<<LED_G)
-#define set_led_magenta PORTF = PORTF & ~(1<<LED_G) | (1<<LED_R) | (1<<LED_B)
-#define set_led_cyan    PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G)
-#define set_led_white   PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)
-*/
diff --git a/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c b/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c
index 6d87ed7053..6f32d1fb55 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c
+++ b/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c
@@ -1,12 +1,12 @@
 #include "chimera_ortho_plus.h"
 
 void led_init(void) {
-    setPinOutput(D1);
-    setPinOutput(F4);
-    setPinOutput(F5);
-    writePinHigh(D1);
-    writePinHigh(F4);
-    writePinHigh(F5);
+    gpio_set_pin_output(CHIMERA_ORTHO_PLUS_GREEN_LED_PIN);
+    gpio_set_pin_output(CHIMERA_ORTHO_PLUS_BLUE_LED_PIN);
+    gpio_set_pin_output(CHIMERA_ORTHO_PLUS_RED_LED_PIN);
+    gpio_write_pin_high(CHIMERA_ORTHO_PLUS_GREEN_LED_PIN);
+    gpio_write_pin_high(CHIMERA_ORTHO_PLUS_BLUE_LED_PIN);
+    gpio_write_pin_high(CHIMERA_ORTHO_PLUS_RED_LED_PIN);
 }
 
 
diff --git a/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.h b/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.h
index a5d79bbfcb..25aec599ad 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.h
+++ b/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.h
@@ -2,12 +2,16 @@
 
 #include "quantum.h"
 
-#define red_led_off   PORTF |= (1<<5)
-#define red_led_on    PORTF &= ~(1<<5)
-#define blu_led_off   PORTF |= (1<<4)
-#define blu_led_on    PORTF &= ~(1<<4)
-#define grn_led_off   PORTD |= (1<<1)
-#define grn_led_on    PORTD &= ~(1<<1)
+#define CHIMERA_ORTHO_PLUS_RED_LED_PIN F5
+#define CHIMERA_ORTHO_PLUS_GREEN_LED_PIN D1
+#define CHIMERA_ORTHO_PLUS_BLUE_LED_PIN F4
+
+#define red_led_off   gpio_write_pin_high(CHIMERA_ORTHO_PLUS_RED_LED_PIN)
+#define red_led_on    gpio_write_pin_low(CHIMERA_ORTHO_PLUS_RED_LED_PIN)
+#define blu_led_off   gpio_write_pin_high(CHIMERA_ORTHO_PLUS_BLUE_LED_PIN)
+#define blu_led_on    gpio_write_pin_low(CHIMERA_ORTHO_PLUS_BLUE_LED_PIN)
+#define grn_led_off   gpio_write_pin_high(CHIMERA_ORTHO_PLUS_GREEN_LED_PIN)
+#define grn_led_on    gpio_write_pin_low(CHIMERA_ORTHO_PLUS_GREEN_LED_PIN)
 
 #define set_led_off     red_led_off; grn_led_off; blu_led_off
 #define set_led_red     red_led_on;  grn_led_off; blu_led_off