sv/Marlin
1
1
Fork 0
Code Issues Pull Requests Wiki Activity

Combine __AVR__ and USBCON for 2.0.x parity

Browse Source
This commit is contained in:
Scott Lahteine
2018-03-10 01:26:06 -06:00
parent c05c5d96d9
commit 5ce64f6d16
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/MarlinSerial.h
View File

@@ -85,7 +85,7 @@
#define TX_BUFFER_SIZE 32
#endif
#ifndef USBCON
#if !(defined(__AVR__) && defined(USBCON))
#if RX_BUFFER_SIZE > 256
typedef uint16_t ring_buffer_pos_t;
@@ -163,10 +163,10 @@
extern MarlinSerial customizedSerial;
#endif // !USBCON
#endif // !(__AVR__ && USBCON)
// Use the UART for Bluetooth in AT90USB configurations
#if defined(USBCON) && ENABLED(BLUETOOTH)
#if defined(__AVR__) && defined(USBCON) && ENABLED(BLUETOOTH)
extern HardwareSerial bluetoothSerial;
#endif