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/honeycomb/config.h | |
| 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/honeycomb/config.h')
| -rwxr-xr-x | keyboards/honeycomb/config.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/keyboards/honeycomb/config.h b/keyboards/honeycomb/config.h index 4991c8a0e..725f9490c 100755 --- a/keyboards/honeycomb/config.h +++ b/keyboards/honeycomb/config.h | |||
| @@ -48,17 +48,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 48 | 48 | ||
| 49 | //UART settings for communication with the RF microcontroller | 49 | //UART settings for communication with the RF microcontroller |
| 50 | #define SERIAL_UART_BAUD 1000000 | 50 | #define SERIAL_UART_BAUD 1000000 |
| 51 | #define SERIAL_UART_DATA UDR1 | ||
| 52 | #define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1) | ||
| 53 | #define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) | ||
| 54 | #define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1)) | 51 | #define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1)) |
| 55 | #define SERIAL_UART_INIT() do { \ | 52 | #define SERIAL_UART_INIT_CUSTOM \ |
| 56 | /* baud rate */ \ | 53 | /* enable TX and RX */ \ |
| 57 | UBRR1L = SERIAL_UART_UBRR; \ | 54 | UCSR1B = _BV(TXEN1) | _BV(RXEN1); \ |
| 58 | /* baud rate */ \ | 55 | /* 8-bit data */ \ |
| 59 | UBRR1H = SERIAL_UART_UBRR >> 8; \ | 56 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); |
| 60 | /* enable TX and RX */ \ | ||
| 61 | UCSR1B = _BV(TXEN1) | _BV(RXEN1); \ | ||
| 62 | /* 8-bit data */ \ | ||
| 63 | UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ | ||
| 64 | } while(0) | ||