diff options
| author | zvecr <git@zvecr.com> | 2019-11-17 14:02:26 +0000 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-11-17 08:25:58 -0800 |
| commit | a91c0c476507cb8c12840abb59bff34ab0de3c03 (patch) | |
| tree | 313d9a0ec2f17c47f33305b350eef8768b5efa1c /quantum/config_common.h | |
| parent | 6b18ca2875ceb38011f32f2d17238ba55ce7ad67 (diff) | |
| download | qmk_firmware-a91c0c476507cb8c12840abb59bff34ab0de3c03.tar.gz qmk_firmware-a91c0c476507cb8c12840abb59bff34ab0de3c03.zip | |
Run clang-format manually to fix recently changed files
Diffstat (limited to 'quantum/config_common.h')
| -rw-r--r-- | quantum/config_common.h | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/quantum/config_common.h b/quantum/config_common.h index f42df6357..c1c1d4bd4 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h | |||
| @@ -303,25 +303,26 @@ | |||
| 303 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ | 303 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ |
| 304 | sei(); \ | 304 | sei(); \ |
| 305 | } while (0) | 305 | } while (0) |
| 306 | # elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)) | 306 | # elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)) |
| 307 | # define SERIAL_UART_BAUD 115200 | 307 | # define SERIAL_UART_BAUD 115200 |
| 308 | # define SERIAL_UART_DATA UDR1 | 308 | # define SERIAL_UART_DATA UDR1 |
| 309 | /* UBRR should result in ~16 and set UCSR1A = _BV(U2X1) as per rn42 documentation. HC05 needs baudrate configured accordingly */ | 309 | /* UBRR should result in ~16 and set UCSR1A = _BV(U2X1) as per rn42 documentation. HC05 needs baudrate configured accordingly */ |
| 310 | # define SERIAL_UART_UBRR (F_CPU / (8UL * SERIAL_UART_BAUD) - 1) | 310 | # define SERIAL_UART_UBRR (F_CPU / (8UL * SERIAL_UART_BAUD) - 1) |
| 311 | # define SERIAL_UART_RXD_VECT USART1_RX_vect | 311 | # define SERIAL_UART_RXD_VECT USART1_RX_vect |
| 312 | # define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) | 312 | # define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) |
| 313 | # define SERIAL_UART_INIT() do { \ | 313 | # define SERIAL_UART_INIT() \ |
| 314 | UCSR1A = _BV(U2X1); \ | 314 | do { \ |
| 315 | /* baud rate */ \ | 315 | UCSR1A = _BV(U2X1); \ |
| 316 | UBRR1L = SERIAL_UART_UBRR; \ | 316 | /* baud rate */ \ |
| 317 | /* baud rate */ \ | 317 | UBRR1L = SERIAL_UART_UBRR; \ |
| 318 | UBRR1H = SERIAL_UART_UBRR >> 8; \ | 318 | /* baud rate */ \ |
| 319 | /* enable TX */ \ | 319 | UBRR1H = SERIAL_UART_UBRR >> 8; \ |
| 320 | UCSR1B = _BV(TXEN1); \ | 320 | /* enable TX */ \ |
| 321 | /* 8-bit data */ \ | 321 | UCSR1B = _BV(TXEN1); \ |
| 322 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ | 322 | /* 8-bit data */ \ |
| 323 | sei(); \ | 323 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ |
| 324 | } while(0) | 324 | sei(); \ |
| 325 | } while (0) | ||
| 325 | # else | 326 | # else |
| 326 | # error "USART configuration is needed." | 327 | # error "USART configuration is needed." |
| 327 | # endif | 328 | # endif |