Use lowercase names for serial instances
This commit is contained in:
parent
1e2deff4fd
commit
4b9d5cd352
|
@ -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)
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -74,7 +74,7 @@
|
||||||
#if ENABLED(LCD_I2C_PANELOLU2)
|
#if ENABLED(LCD_I2C_PANELOLU2)
|
||||||
#define BTN_EN1 27 //RX1 - fastio.h pin mapping 27
|
#define BTN_EN1 27 //RX1 - fastio.h pin mapping 27
|
||||||
#define BTN_EN2 26 //TX1 - fastio.h pin mapping 26
|
#define BTN_EN2 26 //TX1 - fastio.h pin mapping 26
|
||||||
#define BTN_ENC 43 //A3 - fastio.h pin mapping 43
|
#define BTN_ENC 43 //A3 - fastio.h pin mapping 43
|
||||||
#define SDSS 40 //use SD card on Panelolu2 (Teensyduino pin mapping)
|
#define SDSS 40 //use SD card on Panelolu2 (Teensyduino pin mapping)
|
||||||
#endif // LCD_I2C_PANELOLU2
|
#endif // LCD_I2C_PANELOLU2
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue