MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor comment/condition cleanup

Browse Source
This commit is contained in:
Scott Lahteine 2018-02-09 00:43:37 -06:00
parent ad323d852e
commit 9727e5e3d6
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View File

@ -1027,7 +1027,7 @@ inline void get_serial_commands() {
// If the command buffer is empty for too long, // If the command buffer is empty for too long,
// send "wait" to indicate Marlin is still waiting. // 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; static millis_t last_command_time = 0;
const millis_t ms = millis(); const millis_t ms = millis();
if (commands_in_queue == 0 && !MYSERIAL.available() && ELAPSED(ms, last_command_time + NO_TIMEOUTS)) { 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 * P = Printing moves
* R = Retract only (no X, Y, Z) moves * R = Retract only (no X, Y, Z) moves
* T = Travel (non printing) 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() { inline void gcode_M204() {
if (parser.seen('S')) { // Kept for legacy compatibility. Should NOT BE USED for new developments. if (parser.seen('S')) { // Kept for legacy compatibility. Should NOT BE USED for new developments.

4
Marlin/pins_RAMBO.h
View File

@ -189,7 +189,7 @@
#define STAT_LED_RED_PIN 22 #define STAT_LED_RED_PIN 22
#define STAT_LED_BLUE_PIN 32 #define STAT_LED_BLUE_PIN 32
#else #else // !VIKI2 && !miniVIKI
#define BEEPER_PIN 79 // AUX-4 #define BEEPER_PIN 79 // AUX-4
@ -200,7 +200,7 @@
#define SD_DETECT_PIN 81 #define SD_DETECT_PIN 81
#endif // VIKI2/miniVIKI #endif // !VIKI2 && !miniVIKI
#else // !NEWPANEL - old style panel with shift register #else // !NEWPANEL - old style panel with shift register