diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-05 22:21:23 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-05 22:21:23 +0000 |
| commit | 843643aef36165ee6b00a52e19a272e69f19e6e1 (patch) | |
| tree | e033218c8d1c6fed65b360e684b41530e96dca8a /keyboards/hhkb | |
| parent | c3eee3a842366497abeacc22c02020622a339c46 (diff) | |
| parent | 5ea92a9c1cbe3e20bf4830d550d797a8e9650da8 (diff) | |
| download | qmk_firmware-843643aef36165ee6b00a52e19a272e69f19e6e1.tar.gz qmk_firmware-843643aef36165ee6b00a52e19a272e69f19e6e1.zip | |
Merge remote-tracking branch 'origin/master' into develop
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 5e4fece17d..78fe0c47ae 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/>. #define SUART_IN_PIN PIND #define SUART_IN_BIT 1 -#ifdef __AVR_ATmega32U4__ - #define SERIAL_UART_BAUD 115200 - #define SERIAL_UART_DATA UDR1 - #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5)) - #define SERIAL_UART_RXD_VECT USART1_RX_vect - #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1)) - #define SERIAL_UART_INIT() do { \ - UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \ - UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8); /* baud rate */ \ - UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ - UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \ - UCSR1C |= (0<<UPM11) | (0<<UPM10); /* parity: none(00), even(01), odd(11) */ \ - UCSR1D |= (0<<RTSEN) | (0<<CTSEN); /* RTS, CTS(no flow control by hardware) */ \ - DDRD |= (1<<5); PORTD &= ~(1<<5); /* RTS for flow control by firmware */ \ - sei(); \ - } while(0) - #define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) - #define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0) -#else - #error "USART configuration is needed." -#endif +#define SERIAL_UART_BAUD 115200 +#define SERIAL_UART_INIT_CUSTOM \ + /* RX interrupt, RX: enable */ \ + UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); \ + /* TX interrupt, TX: enable */ \ + UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); \ + /* parity: none(00), even(01), odd(11) */ \ + UCSR1C |= (0<<UPM11) | (0<<UPM10); \ + /* RTS, CTS(no flow control by hardware) */ \ + UCSR1D |= (0<<RTSEN) | (0<<CTSEN); \ + /* RTS for flow control by firmware */ \ + DDRD |= (1<<5); PORTD &= ~(1<<5); +#define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) +#define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0) /* power control of key switch board */ #define HHKB_POWER_SAVING diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h index c06c554b2a..22ac6aa623 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/>. #define SUART_IN_PIN PIND #define SUART_IN_BIT 1 -#ifdef __AVR_ATmega32U4__ - #define SERIAL_UART_BAUD 115200 - #define SERIAL_UART_DATA UDR1 - #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5)) - #define SERIAL_UART_RXD_VECT USART1_RX_vect - #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1)) - #define SERIAL_UART_INIT() do { \ - UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \ - UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8); /* baud rate */ \ - UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ - UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \ - UCSR1C |= (0<<UPM11) | (0<<UPM10); /* parity: none(00), even(01), odd(11) */ \ - UCSR1D |= (0<<RTSEN) | (0<<CTSEN); /* RTS, CTS(no flow control by hardware) */ \ - DDRD |= (1<<5); PORTD &= ~(1<<5); /* RTS for flow control by firmware */ \ - sei(); \ - } while(0) - #define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) - #define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0) -#else - #error "USART configuration is needed." -#endif +#define SERIAL_UART_BAUD 115200 +#define SERIAL_UART_INIT_CUSTOM \ + /* RX interrupt, RX: enable */ \ + UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); \ + /* TX interrupt, TX: enable */ \ + UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); \ + /* parity: none(00), even(01), odd(11) */ \ + UCSR1C |= (0<<UPM11) | (0<<UPM10); \ + /* RTS, CTS(no flow control by hardware) */ \ + UCSR1D |= (0<<RTSEN) | (0<<CTSEN); \ + /* RTS for flow control by firmware */ \ + DDRD |= (1<<5); PORTD &= ~(1<<5); +#define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0) +#define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0) /* power control of key switch board */ #define HHKB_POWER_SAVING |