MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compile with BLUETOOTH

Browse Source 
Addressing #7110
This commit is contained in:
Scott Lahteine 2018-02-07 06:13:28 -06:00
parent 50582e3b47
commit 42866db251
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/SanityCheck.h
View File

@ -276,6 +276,8 @@
#error "RX_BUFFER_SIZE must be a power of 2 greater than 1." #error "RX_BUFFER_SIZE must be a power of 2 greater than 1."
#elif TX_BUFFER_SIZE && (TX_BUFFER_SIZE < 2 || TX_BUFFER_SIZE > 256 || !IS_POWER_OF_2(TX_BUFFER_SIZE)) #elif TX_BUFFER_SIZE && (TX_BUFFER_SIZE < 2 || TX_BUFFER_SIZE > 256 || !IS_POWER_OF_2(TX_BUFFER_SIZE))
#error "TX_BUFFER_SIZE must be 0, a power of 2 greater than 1, and no greater than 256." #error "TX_BUFFER_SIZE must be 0, a power of 2 greater than 1, and no greater than 256."
#elif ENABLED(BLUETOOTH)
#error "BLUETOOTH is only supported with AT90USB."
#endif #endif
#elif ENABLED(SERIAL_XON_XOFF) || ENABLED(SERIAL_STATS_MAX_RX_QUEUED) || ENABLED(SERIAL_STATS_DROPPED_RX) #elif ENABLED(SERIAL_XON_XOFF) || ENABLED(SERIAL_STATS_MAX_RX_QUEUED) || ENABLED(SERIAL_STATS_DROPPED_RX)
#error "SERIAL_XON_XOFF and SERIAL_STATS_* features not supported on USB-native AVR devices." #error "SERIAL_XON_XOFF and SERIAL_STATS_* features not supported on USB-native AVR devices."

1
Marlin/serial.h
View File

@ -28,6 +28,7 @@
#ifdef USBCON #ifdef USBCON
#include <HardwareSerial.h> #include <HardwareSerial.h>
#if ENABLED(BLUETOOTH) #if ENABLED(BLUETOOTH)
extern HardwareSerial bluetoothSerial;
#define MYSERIAL bluetoothSerial #define MYSERIAL bluetoothSerial
#else #else
#define MYSERIAL Serial #define MYSERIAL Serial