aboutsummaryrefslogtreecommitdiff
path: root/keyboards/converter
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/converter
parent7220715dd1619dfb073db78cfc23998a67994655 (diff)
downloadqmk_firmware-61c7c1f74cc5365501a3038181df551df11f719e.tar.gz
qmk_firmware-61c7c1f74cc5365501a3038181df551df11f719e.zip
Convert some AVR GPIO operations to macros (#23424)
Diffstat (limited to 'keyboards/converter')
-rw-r--r--keyboards/converter/hp_46010a/matrix.c31
-rw-r--r--keyboards/converter/sun_usb/matrix.c6
2 files changed, 19 insertions, 18 deletions
diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c
index 7f4e11ab27..a36e8821a3 100644
--- a/keyboards/converter/hp_46010a/matrix.c
+++ b/keyboards/converter/hp_46010a/matrix.c
@@ -82,17 +82,17 @@ void matrix_scan_user(void) {
// switch, and then into the diode, then into one of the columns into the
// matrix. the reset pin can be used to reset the entire counter.
-#define RESET _BV(PB0)
-#define SCLK _BV(PB1)
-#define SDATA _BV(PB3)
-#define LED _BV(PD6)
+#define HP_46010A_RESET_PIN B0
+#define HP_46010A_SCLK_PIN B1
+#define HP_46010A_SDATA_PIN B3
+#define HP_46010A_LED_PIN D6
inline
static
void SCLK_increment(void) {
- PORTB &= ~SCLK ;
+ gpio_write_pin_low(HP_46010A_SCLK_PIN);
_delay_us( 4 ) ; // make sure the line is stable
- PORTB |= SCLK ;
+ gpio_write_pin_high(HP_46010A_SCLK_PIN);
_delay_us( 4 ) ;
return ;
@@ -101,9 +101,9 @@ void SCLK_increment(void) {
inline
static
void Matrix_Reset(void) {
- PORTB |= RESET ;
+ gpio_write_pin_high(HP_46010A_RESET_PIN);
_delay_us( 4 ) ; // make sure the line is stable
- PORTB &= ~RESET ;
+ gpio_write_pin_low(HP_46010A_RESET_PIN);
return ;
}
@@ -116,7 +116,7 @@ uint8_t Matrix_ReceiveByte (void) {
for ( uint8_t bit = 0; bit < MATRIX_COLS; ++bit ) {
// toggle the clock
SCLK_increment();
- temp = (PINB & SDATA) << 4 ;
+ temp = gpio_read_pin(HP_46010A_SDATA_PIN) << 4 ;
received |= temp >> bit ;
}
@@ -138,18 +138,19 @@ void Matrix_ThrowByte(void) {
void matrix_init (void) {
// debug_matrix = 1;
// PB0 (SS) and PB1 (SCLK) set to outputs
- DDRB |= RESET | SCLK ;
+ gpio_set_pin_output(HP_46010A_RESET_PIN);
+ gpio_set_pin_output(HP_46010A_SCLK_PIN);
// PB2, is unused, and PB3 is our serial input
- DDRB &= ~SDATA ;
+ gpio_set_pin_input(HP_46010A_SDATA_PIN);
// SS is reset for this board, and is active High
// SCLK is the serial clock and is active High
- PORTB &= ~RESET ;
- PORTB |= SCLK ;
+ gpio_write_pin_low(HP_46010A_RESET_PIN);
+ gpio_write_pin_high(HP_46010A_SCLK_PIN);
// led pin
- DDRD |= LED ;
- PORTD &= ~LED ;
+ gpio_set_pin_output(HP_46010A_LED_PIN);
+ gpio_write_pin_low(HP_46010A_LED_PIN);
matrix_init_kb();
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index 6d52d5cd6c..93354ee114 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -74,8 +74,8 @@ uint8_t matrix_cols(void)
void matrix_init(void)
{
- /* DDRD |= (1<<6); */
- /* PORTD |= (1<<6); */
+ /* gpio_set_pin_output(D6); */
+ /* gpio_write_pin_high(D6); */
debug_enable = true;
uart_init(1200);
@@ -99,7 +99,7 @@ void matrix_init(void)
/* } */
/* print(" Done\n"); */
- /* PORTD &= ~(1<<6); */
+ /* gpio_write_pin_low(D6) */
matrix_init_kb();
return;