zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use lowercase names for serial instances

Browse source
This commit is contained in:
Richard Wackerbarth 2015-07-31 22:31:53 -05:00
parent 1e2deff4fd
commit 4b9d5cd352
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Marlin.h
View file

@ -52,12 +52,12 @@ typedef unsigned long millis_t;
#ifdef USBCON #ifdef USBCON
#if ENABLED(BLUETOOTH) #if ENABLED(BLUETOOTH)
#define MYSERIAL bt #define MYSERIAL bluetoothSerial
#else #else
#define MYSERIAL Serial #define MYSERIAL Serial
#endif // BLUETOOTH #endif // BLUETOOTH
#else #else
#define MYSERIAL MSerial #define MYSERIAL customizedSerial
#endif #endif
#define SERIAL_CHAR(x) MYSERIAL.write(x) #define SERIAL_CHAR(x) MYSERIAL.write(x)

4
Marlin/MarlinSerial.cpp
View file

@ -281,12 +281,12 @@ void MarlinSerial::printFloat(double number, uint8_t digits) {
// Preinstantiate Objects ////////////////////////////////////////////////////// // Preinstantiate Objects //////////////////////////////////////////////////////
MarlinSerial MSerial; MarlinSerial customizedSerial;
#endif // whole file #endif // whole file
#endif // !USBCON #endif // !USBCON
// For AT90USB targets use the UART for BT interfacing // For AT90USB targets use the UART for BT interfacing
#if defined(USBCON) && ENABLED(BLUETOOTH) #if defined(USBCON) && ENABLED(BLUETOOTH)
HardwareSerial bt; HardwareSerial bluetoothSerial;
#endif #endif

6
Marlin/MarlinSerial.h
View file

@ -149,12 +149,12 @@ class MarlinSerial { //: public Stream
void println(void); void println(void);
}; };
extern MarlinSerial MSerial; extern MarlinSerial customizedSerial;
#endif // !USBCON #endif // !USBCON
// Use the UART for BT in AT90USB configurations // Use the UART for Bluetooth in AT90USB configurations
#if defined(USBCON) && ENABLED(BLUETOOTH) #if defined(USBCON) && ENABLED(BLUETOOTH)
extern HardwareSerial bt; extern HardwareSerial bluetoothSerial;
#endif #endif
#endif #endif

2
Marlin/stepper.cpp
View file

@ -655,7 +655,7 @@ ISR(TIMER1_COMPA_vect) {
// Take multiple steps per interrupt (For high speed moves) // Take multiple steps per interrupt (For high speed moves)
for (int8_t i = 0; i < step_loops; i++) { for (int8_t i = 0; i < step_loops; i++) {
#ifndef USBCON #ifndef USBCON
MSerial.checkRx(); // Check for serial chars. customizedSerial.checkRx(); // Check for serial chars.
#endif #endif
#if ENABLED(ADVANCE) #if ENABLED(ADVANCE)