CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests 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
#if ENABLED(BLUETOOTH)
#define MYSERIAL bt
#define MYSERIAL bluetoothSerial
#else
#define MYSERIAL Serial
#endif // BLUETOOTH
#else
#define MYSERIAL MSerial
#define MYSERIAL customizedSerial
#endif
#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 //////////////////////////////////////////////////////
MarlinSerial MSerial;
MarlinSerial customizedSerial;
#endif // whole file
#endif // !USBCON
// For AT90USB targets use the UART for BT interfacing
#if defined(USBCON) && ENABLED(BLUETOOTH)
HardwareSerial bt;
HardwareSerial bluetoothSerial;
#endif

6
Marlin/MarlinSerial.h
View File

@ -149,12 +149,12 @@ class MarlinSerial { //: public Stream
void println(void);
};
extern MarlinSerial MSerial;
extern MarlinSerial customizedSerial;
#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

2
Marlin/pins_TEENSYLU.h
View File

@ -74,7 +74,7 @@
#if ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 27 //RX1 - fastio.h pin mapping 27
#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)
#endif // LCD_I2C_PANELOLU2

2
Marlin/stepper.cpp
View File

@ -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.
customizedSerial.checkRx(); // Check for serial chars.
#endif
#if ENABLED(ADVANCE)