Browse Source

Use lowercase names for serial instances

Richard Wackerbarth 10 years ago
parent
commit
4b9d5cd352
5 changed files with 9 additions and 9 deletions
  1. 2
    2
      Marlin/Marlin.h
  2. 2
    2
      Marlin/MarlinSerial.cpp
  3. 3
    3
      Marlin/MarlinSerial.h
  4. 1
    1
      Marlin/pins_TEENSYLU.h
  5. 1
    1
      Marlin/stepper.cpp

+ 2
- 2
Marlin/Marlin.h View File

52
 
52
 
53
 #ifdef USBCON
53
 #ifdef USBCON
54
   #if ENABLED(BLUETOOTH)
54
   #if ENABLED(BLUETOOTH)
55
-    #define MYSERIAL bt
55
+    #define MYSERIAL bluetoothSerial
56
   #else
56
   #else
57
     #define MYSERIAL Serial
57
     #define MYSERIAL Serial
58
   #endif // BLUETOOTH
58
   #endif // BLUETOOTH
59
 #else
59
 #else
60
-  #define MYSERIAL MSerial
60
+  #define MYSERIAL customizedSerial
61
 #endif
61
 #endif
62
 
62
 
63
 #define SERIAL_CHAR(x) MYSERIAL.write(x)
63
 #define SERIAL_CHAR(x) MYSERIAL.write(x)

+ 2
- 2
Marlin/MarlinSerial.cpp View File

281
 // Preinstantiate Objects //////////////////////////////////////////////////////
281
 // Preinstantiate Objects //////////////////////////////////////////////////////
282
 
282
 
283
 
283
 
284
-MarlinSerial MSerial;
284
+MarlinSerial customizedSerial;
285
 
285
 
286
 #endif // whole file
286
 #endif // whole file
287
 #endif // !USBCON
287
 #endif // !USBCON
288
 
288
 
289
 // For AT90USB targets use the UART for BT interfacing
289
 // For AT90USB targets use the UART for BT interfacing
290
 #if defined(USBCON) && ENABLED(BLUETOOTH)
290
 #if defined(USBCON) && ENABLED(BLUETOOTH)
291
-  HardwareSerial bt;
291
+  HardwareSerial bluetoothSerial;
292
 #endif
292
 #endif

+ 3
- 3
Marlin/MarlinSerial.h View File

149
     void println(void);
149
     void println(void);
150
 };
150
 };
151
 
151
 
152
-extern MarlinSerial MSerial;
152
+extern MarlinSerial customizedSerial;
153
 #endif // !USBCON
153
 #endif // !USBCON
154
 
154
 
155
-// Use the UART for BT in AT90USB configurations
155
+// Use the UART for Bluetooth in AT90USB configurations
156
 #if defined(USBCON) && ENABLED(BLUETOOTH)
156
 #if defined(USBCON) && ENABLED(BLUETOOTH)
157
-  extern HardwareSerial bt;
157
+  extern HardwareSerial bluetoothSerial;
158
 #endif
158
 #endif
159
 
159
 
160
 #endif
160
 #endif

+ 1
- 1
Marlin/pins_TEENSYLU.h View File

74
   #if ENABLED(LCD_I2C_PANELOLU2)
74
   #if ENABLED(LCD_I2C_PANELOLU2)
75
     #define BTN_EN1        27  //RX1 - fastio.h pin mapping 27
75
     #define BTN_EN1        27  //RX1 - fastio.h pin mapping 27
76
     #define BTN_EN2        26  //TX1 - fastio.h pin mapping 26
76
     #define BTN_EN2        26  //TX1 - fastio.h pin mapping 26
77
-    #define BTN_ENC        43  //A3 - fastio.h pin mapping 43
77
+    #define BTN_ENC        43  //A3  - fastio.h pin mapping 43
78
     #define SDSS           40  //use SD card on Panelolu2 (Teensyduino pin mapping)
78
     #define SDSS           40  //use SD card on Panelolu2 (Teensyduino pin mapping)
79
   #endif // LCD_I2C_PANELOLU2
79
   #endif // LCD_I2C_PANELOLU2
80
 
80
 

+ 1
- 1
Marlin/stepper.cpp View File

655
     // Take multiple steps per interrupt (For high speed moves)
655
     // Take multiple steps per interrupt (For high speed moves)
656
     for (int8_t i = 0; i < step_loops; i++) {
656
     for (int8_t i = 0; i < step_loops; i++) {
657
       #ifndef USBCON
657
       #ifndef USBCON
658
-        MSerial.checkRx(); // Check for serial chars.
658
+        customizedSerial.checkRx(); // Check for serial chars.
659
       #endif
659
       #endif
660
 
660
 
661
       #if ENABLED(ADVANCE)
661
       #if ENABLED(ADVANCE)

Loading…
Cancel
Save