From b7053156fed8b492c3517ea6bf4986fcd9cdb433 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 9 Feb 2018 01:52:28 -0600 Subject: [PATCH] Minor comment/condition cleanup --- Marlin/src/gcode/config/M200-M205.cpp | 2 -- Marlin/src/gcode/queue.cpp | 2 +- Marlin/src/pins/pins_RAMBO.h | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp index 01e26f2fa1..9692fedfed 100644 --- a/Marlin/src/gcode/config/M200-M205.cpp +++ b/Marlin/src/gcode/config/M200-M205.cpp @@ -89,8 +89,6 @@ void GcodeSuite::M203() { * P = Printing moves * R = Retract only (no X, Y, Z) moves * T = Travel (non printing) moves - * - * Also sets minimum segment time in ms (B20000) to prevent buffer under-runs and M20 minimum feedrate */ void GcodeSuite::M204() { if (parser.seen('S')) { // Kept for legacy compatibility. Should NOT BE USED for new developments. diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp index d5ad43550a..ce619814a7 100644 --- a/Marlin/src/gcode/queue.cpp +++ b/Marlin/src/gcode/queue.cpp @@ -271,7 +271,7 @@ inline void get_serial_commands() { // If the command buffer is empty for too long, // send "wait" to indicate Marlin is still waiting. - #if defined(NO_TIMEOUTS) && NO_TIMEOUTS > 0 + #if NO_TIMEOUTS > 0 static millis_t last_command_time = 0; const millis_t ms = millis(); if (commands_in_queue == 0 && !serial_data_available() && ELAPSED(ms, last_command_time + NO_TIMEOUTS)) { diff --git a/Marlin/src/pins/pins_RAMBO.h b/Marlin/src/pins/pins_RAMBO.h index 20f8b6b163..b294a169fc 100644 --- a/Marlin/src/pins/pins_RAMBO.h +++ b/Marlin/src/pins/pins_RAMBO.h @@ -192,7 +192,7 @@ #define STAT_LED_RED_PIN 22 #define STAT_LED_BLUE_PIN 32 - #else + #else // !VIKI2 && !miniVIKI #define BEEPER_PIN 79 // AUX-4 @@ -203,7 +203,7 @@ #define SD_DETECT_PIN 81 - #endif // VIKI2/miniVIKI + #endif // !VIKI2 && !miniVIKI #else // !NEWPANEL - old style panel with shift register