diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index fad838e9346b..b70abe27a9d3 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -52,12 +52,12 @@ typedef unsigned long millis_t; #ifdef USBCON #if ENABLED(BLUETOOTH) - #define MYSERIAL bt + #define MYSERIAL BluetoothSerial #else #define MYSERIAL Serial #endif // BLUETOOTH #else - #define MYSERIAL MSerial + #define MYSERIAL MarlinCustomizedSerial #endif #define SERIAL_CHAR(x) MYSERIAL.write(x) diff --git a/Marlin/MarlinSerial.cpp b/Marlin/MarlinSerial.cpp index bd7314b24558..056b6030db4f 100644 --- a/Marlin/MarlinSerial.cpp +++ b/Marlin/MarlinSerial.cpp @@ -281,12 +281,12 @@ void MarlinSerial::printFloat(double number, uint8_t digits) { // Preinstantiate Objects ////////////////////////////////////////////////////// -MarlinSerial MSerial; +MarlinSerial MarlinCustomizedSerial; #endif // whole file #endif // !USBCON // For AT90USB targets use the UART for BT interfacing #if defined(USBCON) && ENABLED(BLUETOOTH) - HardwareSerial bt; + HardwareSerial BluetoothSerial; #endif diff --git a/Marlin/MarlinSerial.h b/Marlin/MarlinSerial.h index bd1e447268c6..c20de8485702 100644 --- a/Marlin/MarlinSerial.h +++ b/Marlin/MarlinSerial.h @@ -149,12 +149,12 @@ class MarlinSerial { //: public Stream void println(void); }; -extern MarlinSerial MSerial; +extern MarlinSerial MarlinCustomizedSerial; #endif // !USBCON -// Use the UART for BT in AT90USB configurations +// Use the UART for Bluetooth in AT90USB configurations #if defined(USBCON) && ENABLED(BLUETOOTH) - extern HardwareSerial bt; + extern HardwareSerial BluetoothSerial; #endif #endif diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 2dd2f477c148..3dec487eb13e 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -655,7 +655,7 @@ ISR(TIMER1_COMPA_vect) { // Take multiple steps per interrupt (For high speed moves) for (int8_t i = 0; i < step_loops; i++) { #ifndef USBCON - MSerial.checkRx(); // Check for serial chars. + MarlinCustomizedSerial.checkRx(); // Check for serial chars. #endif #if ENABLED(ADVANCE)