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 /quantum | |
| parent | 464eb7137d27e3a31e85032c85c9fda627a8b33f (diff) | |
| download | qmk_firmware-5ea92a9c1cbe3e20bf4830d550d797a8e9650da8.tar.gz qmk_firmware-5ea92a9c1cbe3e20bf4830d550d797a8e9650da8.zip | |
Serial refactor (#11521)
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/config_common.h | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/quantum/config_common.h b/quantum/config_common.h index 2d9c70b08..5973232ef 100644 --- a/quantum/config_common.h +++ b/quantum/config_common.h | |||
| @@ -367,51 +367,6 @@ | |||
| 367 | # endif | 367 | # endif |
| 368 | #endif | 368 | #endif |
| 369 | 369 | ||
| 370 | /* USART configuration */ | ||
| 371 | #ifdef BLUETOOTH_ENABLE | ||
| 372 | # ifdef __AVR_ATmega32U4__ | ||
| 373 | # define SERIAL_UART_BAUD 9600 | ||
| 374 | # define SERIAL_UART_DATA UDR1 | ||
| 375 | # define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1) | ||
| 376 | # define SERIAL_UART_RXD_VECT USART1_RX_vect | ||
| 377 | # define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) | ||
| 378 | # define SERIAL_UART_INIT() \ | ||
| 379 | do { \ | ||
| 380 | /* baud rate */ \ | ||
| 381 | UBRR1L = SERIAL_UART_UBRR; \ | ||
| 382 | /* baud rate */ \ | ||
| 383 | UBRR1H = SERIAL_UART_UBRR >> 8; \ | ||
| 384 | /* enable TX */ \ | ||
| 385 | UCSR1B = _BV(TXEN1); \ | ||
| 386 | /* 8-bit data */ \ | ||
| 387 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ | ||
| 388 | sei(); \ | ||
| 389 | } while (0) | ||
| 390 | # elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) | ||
| 391 | # define SERIAL_UART_BAUD 115200 | ||
| 392 | # define SERIAL_UART_DATA UDR1 | ||
| 393 | /* UBRR should result in ~16 and set UCSR1A = _BV(U2X1) as per rn42 documentation. HC05 needs baudrate configured accordingly */ | ||
| 394 | # define SERIAL_UART_UBRR (F_CPU / (8UL * SERIAL_UART_BAUD) - 1) | ||
| 395 | # define SERIAL_UART_RXD_VECT USART1_RX_vect | ||
| 396 | # define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) | ||
| 397 | # define SERIAL_UART_INIT() \ | ||
| 398 | do { \ | ||
| 399 | UCSR1A = _BV(U2X1); \ | ||
| 400 | /* baud rate */ \ | ||
| 401 | UBRR1L = SERIAL_UART_UBRR; \ | ||
| 402 | /* baud rate */ \ | ||
| 403 | UBRR1H = SERIAL_UART_UBRR >> 8; \ | ||
| 404 | /* enable TX */ \ | ||
| 405 | UCSR1B = _BV(TXEN1); \ | ||
| 406 | /* 8-bit data */ \ | ||
| 407 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ | ||
| 408 | sei(); \ | ||
| 409 | } while (0) | ||
| 410 | # else | ||
| 411 | # error "USART configuration is needed." | ||
| 412 | # endif | ||
| 413 | #endif | ||
| 414 | |||
| 415 | #define API_SYSEX_MAX_SIZE 32 | 370 | #define API_SYSEX_MAX_SIZE 32 |
| 416 | 371 | ||
| 417 | #include "song_list.h" | 372 | #include "song_list.h" |