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

codenum => dwell_ms

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-14 16:39:49 -07:00
parent 69d6016941
commit 5ed1e7a464
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@ -2728,18 +2728,18 @@ inline void gcode_G0_G1() {
* G4: Dwell S<seconds> or P<milliseconds> * G4: Dwell S<seconds> or P<milliseconds>
*/ */
inline void gcode_G4() { inline void gcode_G4() {
millis_t codenum = 0; millis_t dwell_ms = 0;
if (code_seen('P')) codenum = code_value_millis(); // milliseconds to wait if (code_seen('P')) dwell_ms = code_value_millis(); // milliseconds to wait
if (code_seen('S')) codenum = code_value_millis_from_seconds(); // seconds to wait if (code_seen('S')) dwell_ms = code_value_millis_from_seconds(); // seconds to wait
stepper.synchronize(); stepper.synchronize();
refresh_cmd_timeout(); refresh_cmd_timeout();
codenum += previous_cmd_ms; // keep track of when we started waiting dwell_ms += previous_cmd_ms; // keep track of when we started waiting
if (!lcd_hasstatus()) LCD_MESSAGEPGM(MSG_DWELL); if (!lcd_hasstatus()) LCD_MESSAGEPGM(MSG_DWELL);
while (PENDING(millis(), codenum)) idle(); while (PENDING(millis(), dwell_ms)) idle();
} }
#if ENABLED(BEZIER_CURVE_SUPPORT) #if ENABLED(BEZIER_CURVE_SUPPORT)