diff options
| author | itsnoteasy <pyrosoma1@yahoo.ie> | 2020-06-10 22:23:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 22:23:11 +0100 |
| commit | 7aa4cc9603b8cdb0ea3ede753eff7d07a86a18b0 (patch) | |
| tree | c48255b3861208d8b85e341b68bbc827b5f06711 /tmk_core | |
| parent | e26bc21d1452dcf04332d300a874dacc8d74862d (diff) | |
| download | qmk_firmware-7aa4cc9603b8cdb0ea3ede753eff7d07a86a18b0.tar.gz qmk_firmware-7aa4cc9603b8cdb0ea3ede753eff7d07a86a18b0.zip | |
adds support for the atmega328 (#9043)
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/avr/bootloader.c | 2 | ||||
| -rw-r--r-- | tmk_core/common/uart.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c index 7e5d2b057..a1db55da9 100644 --- a/tmk_core/common/avr/bootloader.c +++ b/tmk_core/common/avr/bootloader.c | |||
| @@ -247,7 +247,7 @@ void bootloader_jump(void) { | |||
| 247 | 247 | ||
| 248 | #else // Assume remaining boards are DFU, even if the flag isn't set | 248 | #else // Assume remaining boards are DFU, even if the flag isn't set |
| 249 | 249 | ||
| 250 | # if !(defined(__AVR_ATmega32A__) || defined(__AVR_ATmega328P__) || defined(__AVR_ATtiny85__)) // no USB - maybe BOOTLOADER_BOOTLOADHID instead though? | 250 | # if !(defined(__AVR_ATmega32A__) || defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__) || defined(__AVR_ATtiny85__)) // no USB - maybe BOOTLOADER_BOOTLOADHID instead though? |
| 251 | UDCON = 1; | 251 | UDCON = 1; |
| 252 | USBCON = (1 << FRZCLK); // disable USB | 252 | USBCON = (1 << FRZCLK); // disable USB |
| 253 | UCSR1B = 0; | 253 | UCSR1B = 0; |
diff --git a/tmk_core/common/uart.c b/tmk_core/common/uart.c index b29d3bbb9..150e256c8 100644 --- a/tmk_core/common/uart.c +++ b/tmk_core/common/uart.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | #include "uart.h" | 32 | #include "uart.h" |
| 33 | 33 | ||
| 34 | #if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__) | 34 | #if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__) |
| 35 | # define UDRn UDR0 | 35 | # define UDRn UDR0 |
| 36 | # define UBRRnL UBRR0L | 36 | # define UBRRnL UBRR0L |
| 37 | # define UCSRnA UCSR0A | 37 | # define UCSRnA UCSR0A |