aboutsummaryrefslogtreecommitdiff
path: root/keyboards/sirius/uni660
diff options
context:
space:
mode:
authorRyan <[email protected]>2024-05-02 19:48:49 +1000
committerGitHub <[email protected]>2024-05-02 10:48:49 +0100
commit61c7c1f74cc5365501a3038181df551df11f719e (patch)
tree67b134bfd3ba45660765f5c2c46b8d3f535b5b69 /keyboards/sirius/uni660
parent7220715dd1619dfb073db78cfc23998a67994655 (diff)
downloadqmk_firmware-61c7c1f74cc5365501a3038181df551df11f719e.tar.gz
qmk_firmware-61c7c1f74cc5365501a3038181df551df11f719e.zip
Convert some AVR GPIO operations to macros (#23424)
Diffstat (limited to 'keyboards/sirius/uni660')
-rw-r--r--keyboards/sirius/uni660/rev1/rev1.c12
-rw-r--r--keyboards/sirius/uni660/rev1/rev1.h40
-rw-r--r--keyboards/sirius/uni660/rev2/rev2.c12
-rw-r--r--keyboards/sirius/uni660/rev2/rev2.h40
4 files changed, 32 insertions, 72 deletions
diff --git a/keyboards/sirius/uni660/rev1/rev1.c b/keyboards/sirius/uni660/rev1/rev1.c
index 7cc75ee22a..9bfc46c37e 100644
--- a/keyboards/sirius/uni660/rev1/rev1.c
+++ b/keyboards/sirius/uni660/rev1/rev1.c
@@ -1,12 +1,12 @@
#include "rev1.h"
void led_init(void) {
- setPinOutput(D1); // Pin to green, set as output
- writePinHigh(D1); // Turn it off
- setPinOutput(F4); // Pins to red and blue, set as output
- setPinOutput(F5);
- writePinHigh(F4); // Turn them off
- writePinHigh(F5);
+ gpio_set_pin_output(UNI660_GREEN_LED_PIN);
+ gpio_write_pin_high(UNI660_GREEN_LED_PIN);
+ gpio_set_pin_output(UNI660_BLUE_LED_PIN);
+ gpio_write_pin_high(UNI660_BLUE_LED_PIN);
+ gpio_set_pin_output(UNI660_RED_LED_PIN);
+ gpio_write_pin_high(UNI660_RED_LED_PIN);
}
void matrix_init_kb(void) {
diff --git a/keyboards/sirius/uni660/rev1/rev1.h b/keyboards/sirius/uni660/rev1/rev1.h
index 06a7176fbd..5baf9d4236 100644
--- a/keyboards/sirius/uni660/rev1/rev1.h
+++ b/keyboards/sirius/uni660/rev1/rev1.h
@@ -2,12 +2,16 @@
#include "quantum.h"
-#define red_led_off writePinHigh(F5)
-#define red_led_on writePinLow(F5)
-#define blu_led_off writePinHigh(F4)
-#define blu_led_on writePinLow(F4)
-#define grn_led_off writePinHigh(D1)
-#define grn_led_on writePinLow(D1)
+#define UNI660_RED_LED_PIN F5
+#define UNI660_GREEN_LED_PIN D1
+#define UNI660_BLUE_LED_PIN F4
+
+#define red_led_off gpio_write_pin_high(UNI660_RED_LED_PIN)
+#define red_led_on gpio_write_pin_low(UNI660_RED_LED_PIN)
+#define blu_led_off gpio_write_pin_high(UNI660_BLUE_LED_PIN)
+#define blu_led_on gpio_write_pin_low(UNI660_BLUE_LED_PIN)
+#define grn_led_off gpio_write_pin_high(UNI660_GREEN_LED_PIN)
+#define grn_led_on gpio_write_pin_low(UNI660_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/sirius/uni660/rev2/rev2.c b/keyboards/sirius/uni660/rev2/rev2.c
index 2c2515c0ed..9207ed1e4f 100644
--- a/keyboards/sirius/uni660/rev2/rev2.c
+++ b/keyboards/sirius/uni660/rev2/rev2.c
@@ -1,12 +1,12 @@
#include "rev2.h"
void led_init(void) {
- setPinOutput(D1); // Pin to green, set as output
- writePinHigh(D1); // Turn it off
- setPinOutput(F4); // Pins to red and blue, set as output
- setPinOutput(F5);
- writePinHigh(F4); // Turn them off
- writePinHigh(F5);
+ gpio_set_pin_output(UNI660_GREEN_LED_PIN);
+ gpio_write_pin_high(UNI660_GREEN_LED_PIN);
+ gpio_set_pin_output(UNI660_BLUE_LED_PIN);
+ gpio_write_pin_high(UNI660_BLUE_LED_PIN);
+ gpio_set_pin_output(UNI660_RED_LED_PIN);
+ gpio_write_pin_high(UNI660_RED_LED_PIN);
}
void matrix_init_kb(void) {
diff --git a/keyboards/sirius/uni660/rev2/rev2.h b/keyboards/sirius/uni660/rev2/rev2.h
index 06a7176fbd..5baf9d4236 100644
--- a/keyboards/sirius/uni660/rev2/rev2.h
+++ b/keyboards/sirius/uni660/rev2/rev2.h
@@ -2,12 +2,16 @@
#include "quantum.h"
-#define red_led_off writePinHigh(F5)
-#define red_led_on writePinLow(F5)
-#define blu_led_off writePinHigh(F4)
-#define blu_led_on writePinLow(F4)
-#define grn_led_off writePinHigh(D1)
-#define grn_led_on writePinLow(D1)
+#define UNI660_RED_LED_PIN F5
+#define UNI660_GREEN_LED_PIN D1
+#define UNI660_BLUE_LED_PIN F4
+
+#define red_led_off gpio_write_pin_high(UNI660_RED_LED_PIN)
+#define red_led_on gpio_write_pin_low(UNI660_RED_LED_PIN)
+#define blu_led_off gpio_write_pin_high(UNI660_BLUE_LED_PIN)
+#define blu_led_on gpio_write_pin_low(UNI660_BLUE_LED_PIN)
+#define grn_led_off gpio_write_pin_high(UNI660_GREEN_LED_PIN)
+#define grn_led_on gpio_write_pin_low(UNI660_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)
-*/