From 9727e5e3d67ee641b62272bac783a81a46906b40 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 9 Feb 2018 00:43:37 -0600 Subject: [PATCH] Minor comment/condition cleanup --- Marlin/Marlin_main.cpp | 4 +--- Marlin/pins_RAMBO.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 18a4d6894..7dc33e77f 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1027,7 +1027,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 && !MYSERIAL.available() && ELAPSED(ms, last_command_time + NO_TIMEOUTS)) { @@ -8828,8 +8828,6 @@ inline void gcode_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 */ inline void gcode_M204() { if (parser.seen('S')) { // Kept for legacy compatibility. Should NOT BE USED for new developments. diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h index c6ef675bc..99e2d0319 100644 --- a/Marlin/pins_RAMBO.h +++ b/Marlin/pins_RAMBO.h @@ -189,7 +189,7 @@ #define STAT_LED_RED_PIN 22 #define STAT_LED_BLUE_PIN 32 - #else + #else // !VIKI2 && !miniVIKI #define BEEPER_PIN 79 // AUX-4 @@ -200,7 +200,7 @@ #define SD_DETECT_PIN 81 - #endif // VIKI2/miniVIKI + #endif // !VIKI2 && !miniVIKI #else // !NEWPANEL - old style panel with shift register