diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-06 14:16:03 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-06 14:16:03 +0000 |
| commit | a1ddba6bc484647de96d10766695a25748eabef3 (patch) | |
| tree | 0c0017192185f6b163e330dbfe5a5870e01c9a11 /tmk_core | |
| parent | 5f2b7bd78e11fe5042240cdf1859e5e87bf5e2bb (diff) | |
| parent | 9b874d50713d27b4726aa6b759abf3f3abede3fa (diff) | |
| download | qmk_firmware-a1ddba6bc484647de96d10766695a25748eabef3.tar.gz qmk_firmware-a1ddba6bc484647de96d10766695a25748eabef3.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/serial_uart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/protocol/serial_uart.c b/tmk_core/protocol/serial_uart.c index 4fe059e7d..d5b565709 100644 --- a/tmk_core/protocol/serial_uart.c +++ b/tmk_core/protocol/serial_uart.c | |||
| @@ -50,10 +50,10 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 50 | 50 | ||
| 51 | #ifndef SERIAL_UART_INIT_CUSTOM | 51 | #ifndef SERIAL_UART_INIT_CUSTOM |
| 52 | # define SERIAL_UART_INIT_CUSTOM \ | 52 | # define SERIAL_UART_INIT_CUSTOM \ |
| 53 | /* enable TX */ \ | 53 | /* enable TX */ \ |
| 54 | UCSR1B = _BV(TXEN1); \ | 54 | UCSR1B = _BV(TXEN1); \ |
| 55 | /* 8-bit data */ \ | 55 | /* 8-bit data */ \ |
| 56 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); | 56 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); |
| 57 | #endif | 57 | #endif |
| 58 | 58 | ||
| 59 | #if defined(SERIAL_UART_RTS_LO) && defined(SERIAL_UART_RTS_HI) | 59 | #if defined(SERIAL_UART_RTS_LO) && defined(SERIAL_UART_RTS_HI) |