diff options
| author | Ryan <fauxpark@gmail.com> | 2021-02-06 09:20:48 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-06 09:20:48 +1100 |
| commit | 5ea92a9c1cbe3e20bf4830d550d797a8e9650da8 (patch) | |
| tree | 75ea1413ae4fa23bd0b1230629b6a3b3e215c5eb /keyboards/hhkb | |
| parent | 464eb7137d27e3a31e85032c85c9fda627a8b33f (diff) | |
| download | qmk_firmware-5ea92a9c1cbe3e20bf4830d550d797a8e9650da8.tar.gz qmk_firmware-5ea92a9c1cbe3e20bf4830d550d797a8e9650da8.zip | |
Serial refactor (#11521)
Diffstat (limited to 'keyboards/hhkb')
| -rw-r--r-- | keyboards/hhkb/ansi/config.h | 35 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/config.h | 35 |
2 files changed, 28 insertions, 42 deletions
diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h index 5e4fece17..78fe0c47a 100644 --- a/keyboards/hhkb/ansi/config.h +++ b/keyboards/hhkb/ansi/config.h | |||
| @@ -52,27 +52,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 52 | #define SUART_IN_PIN PIND | 52 | #define SUART_IN_PIN PIND |
| 53 | #define SUART_IN_BIT 1 | 53 | #define SUART_IN_BIT 1 |
| 54 | 54 | ||
| 55 | #ifdef __AVR_ATmega32U4__ | 55 | #define SERIAL_UART_BAUD 115200 |
| 56 | #define SERIAL_UART_BAUD 115200 | 56 | #define SERIAL_UART_INIT_CUSTOM \ |
| 57 | #define SERIAL_UART_DATA UDR1 | 57 | /* RX interrupt, RX: enable */ \ |
| 58 | #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5)) | 58 | UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); \ |
| 59 | #define SERIAL_UART_RXD_VECT USART1_RX_vect | 59 | /* TX interrupt, TX: enable */ \ |
| 60 | #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1)) | 60 | UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); \ |
| 61 | #define SERIAL_UART_INIT() do { \ | 61 | /* parity: none(00), even(01), odd(11) */ \ |
| 62 | UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \ | 62 | UCSR1C |= (0<<UPM11) | (0<<UPM10); \ |
| 63 | UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8); /* baud rate */ \ | 63 | /* RTS, CTS(no flow control by hardware) */ \ |
| 64 | UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ | 64 | UCSR1D |= (0<<RTSEN) | (0<<CTSEN); \ |
| 65 | UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \ | 65 | /* RTS for flow control by firmware */ \ |
| 66 | UCSR1C |= (0<<UPM11) | (0<<UPM10); /* parity: none(00), even(01), odd(11) */ \ | 66 | DDRD |= (1<<5); PORTD &= ~(1<<5); |
| 67 | UCSR1D |= (0<<RTSEN) | (0<<CTSEN); /* RTS, CTS(no flow control by hardware) */ \ | 67 | #define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) |
| 68 | DDRD |= (1<<5); PORTD &= ~(1<<5); /* RTS for flow control by firmware */ \ | 68 | #define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0) |
| 69 | sei(); \ | ||
| 70 | } while(0) | ||
| 71 | #define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) | ||
| 72 | #define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0) | ||
| 73 | #else | ||
| 74 | #error "USART configuration is needed." | ||
| 75 | #endif | ||
| 76 | 69 | ||
| 77 | /* power control of key switch board */ | 70 | /* power control of key switch board */ |
| 78 | #define HHKB_POWER_SAVING | 71 | #define HHKB_POWER_SAVING |
diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h index c06c554b2..22ac6aa62 100644 --- a/keyboards/hhkb/jp/config.h +++ b/keyboards/hhkb/jp/config.h | |||
| @@ -52,27 +52,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 52 | #define SUART_IN_PIN PIND | 52 | #define SUART_IN_PIN PIND |
| 53 | #define SUART_IN_BIT 1 | 53 | #define SUART_IN_BIT 1 |
| 54 | 54 | ||
| 55 | #ifdef __AVR_ATmega32U4__ | 55 | #define SERIAL_UART_BAUD 115200 |
| 56 | #define SERIAL_UART_BAUD 115200 | 56 | #define SERIAL_UART_INIT_CUSTOM \ |
| 57 | #define SERIAL_UART_DATA UDR1 | 57 | /* RX interrupt, RX: enable */ \ |
| 58 | #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5)) | 58 | UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); \ |
| 59 | #define SERIAL_UART_RXD_VECT USART1_RX_vect | 59 | /* TX interrupt, TX: enable */ \ |
| 60 | #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1)) | 60 | UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); \ |
| 61 | #define SERIAL_UART_INIT() do { \ | 61 | /* parity: none(00), even(01), odd(11) */ \ |
| 62 | UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \ | 62 | UCSR1C |= (0<<UPM11) | (0<<UPM10); \ |
| 63 | UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8); /* baud rate */ \ | 63 | /* RTS, CTS(no flow control by hardware) */ \ |
| 64 | UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ | 64 | UCSR1D |= (0<<RTSEN) | (0<<CTSEN); \ |
| 65 | UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \ | 65 | /* RTS for flow control by firmware */ \ |
| 66 | UCSR1C |= (0<<UPM11) | (0<<UPM10); /* parity: none(00), even(01), odd(11) */ \ | 66 | DDRD |= (1<<5); PORTD &= ~(1<<5); |
| 67 | UCSR1D |= (0<<RTSEN) | (0<<CTSEN); /* RTS, CTS(no flow control by hardware) */ \ | 67 | #define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) |
| 68 | DDRD |= (1<<5); PORTD &= ~(1<<5); /* RTS for flow control by firmware */ \ | 68 | #define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0) |
| 69 | sei(); \ | ||
| 70 | } while(0) | ||
| 71 | #define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) | ||
| 72 | #define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0) | ||
| 73 | #else | ||
| 74 | #error "USART configuration is needed." | ||
| 75 | #endif | ||
| 76 | 69 | ||
| 77 | /* power control of key switch board */ | 70 | /* power control of key switch board */ |
| 78 | #define HHKB_POWER_SAVING | 71 | #define HHKB_POWER_SAVING |