G4 shows status message only if no message is set already

- Address issue raised in #1961
This commit is contained in:
Scott Lahteine
2015-04-24 20:13:01 -07:00
parent c5a1b227a4
commit ce142afdda
3 changed files with 6 additions and 2 deletions

View File

@ -1740,14 +1740,15 @@ inline void gcode_G2_G3(bool clockwise) {
inline void gcode_G4() {
millis_t codenum = 0;
LCD_MESSAGEPGM(MSG_DWELL);
if (code_seen('P')) codenum = code_value_long(); // milliseconds to wait
if (code_seen('S')) codenum = code_value_long() * 1000; // seconds to wait
st_synchronize();
refresh_cmd_timeout();
codenum += previous_cmd_ms; // keep track of when we started waiting
if (!lcd_hasstatus()) LCD_MESSAGEPGM(MSG_DWELL);
while (millis() < codenum) {
manage_heater();
manage_inactivity();