Browse Source

Minor comment/condition cleanup

Scott Lahteine 7 years ago
parent
commit
b7053156fe

+ 0
- 2
Marlin/src/gcode/config/M200-M205.cpp View File

89
  *    P = Printing moves
89
  *    P = Printing moves
90
  *    R = Retract only (no X, Y, Z) moves
90
  *    R = Retract only (no X, Y, Z) moves
91
  *    T = Travel (non printing) moves
91
  *    T = Travel (non printing) moves
92
- *
93
- *  Also sets minimum segment time in ms (B20000) to prevent buffer under-runs and M20 minimum feedrate
94
  */
92
  */
95
 void GcodeSuite::M204() {
93
 void GcodeSuite::M204() {
96
   if (parser.seen('S')) {  // Kept for legacy compatibility. Should NOT BE USED for new developments.
94
   if (parser.seen('S')) {  // Kept for legacy compatibility. Should NOT BE USED for new developments.

+ 1
- 1
Marlin/src/gcode/queue.cpp View File

271
 
271
 
272
   // If the command buffer is empty for too long,
272
   // If the command buffer is empty for too long,
273
   // send "wait" to indicate Marlin is still waiting.
273
   // send "wait" to indicate Marlin is still waiting.
274
-  #if defined(NO_TIMEOUTS) && NO_TIMEOUTS > 0
274
+  #if NO_TIMEOUTS > 0
275
     static millis_t last_command_time = 0;
275
     static millis_t last_command_time = 0;
276
     const millis_t ms = millis();
276
     const millis_t ms = millis();
277
     if (commands_in_queue == 0 && !serial_data_available() && ELAPSED(ms, last_command_time + NO_TIMEOUTS)) {
277
     if (commands_in_queue == 0 && !serial_data_available() && ELAPSED(ms, last_command_time + NO_TIMEOUTS)) {

+ 2
- 2
Marlin/src/pins/pins_RAMBO.h View File

192
       #define STAT_LED_RED_PIN 22
192
       #define STAT_LED_RED_PIN 22
193
       #define STAT_LED_BLUE_PIN 32
193
       #define STAT_LED_BLUE_PIN 32
194
 
194
 
195
-    #else
195
+    #else // !VIKI2 && !miniVIKI
196
 
196
 
197
       #define BEEPER_PIN 79 // AUX-4
197
       #define BEEPER_PIN 79 // AUX-4
198
 
198
 
203
 
203
 
204
       #define SD_DETECT_PIN 81
204
       #define SD_DETECT_PIN 81
205
 
205
 
206
-    #endif // VIKI2/miniVIKI
206
+    #endif // !VIKI2 && !miniVIKI
207
 
207
 
208
   #else // !NEWPANEL - old style panel with shift register
208
   #else // !NEWPANEL - old style panel with shift register
209
 
209
 

Loading…
Cancel
Save