CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear LCD to welcome_msg if not printing

Browse Source 
The welcome message is more appropriate than “resuming print” if
nothing is printing.
This commit is contained in:
Scott Lahteine 2014-11-24 18:50:11 -08:00
parent aa4160ba62
commit 7681711e7e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/Marlin_main.cpp
View File

@ -1363,7 +1363,7 @@ void process_commands()
st_synchronize();
codenum += millis(); // keep track of when we started waiting
previous_millis_cmd = millis();
while(millis() < codenum ){
while(millis() < codenum) {
manage_heater();
manage_inactivity();
lcd_update();
@ -1391,7 +1391,6 @@ void process_commands()
plan_bed_level_matrix.set_to_identity(); //Reset the plane ("erase" all leveling data)
#endif //ENABLE_AUTO_BED_LEVELING
saved_feedrate = feedrate;
saved_feedmultiply = feedmultiply;
feedmultiply = 100;
@ -1437,7 +1436,7 @@ void process_commands()
#else // NOT DELTA
home_all_axis = !((code_seen(axis_codes[X_AXIS])) || (code_seen(axis_codes[Y_AXIS])) || (code_seen(axis_codes[Z_AXIS])));
#if Z_HOME_DIR > 0 // If homing away from BED do Z first
if((home_all_axis) || (code_seen(axis_codes[Z_AXIS]))) {
HOMEAXIS(Z);
@ -1852,9 +1851,9 @@ void process_commands()
if (hasS) codenum = code_value() * 1000; // seconds to wait
if (!hasP && !hasS && *src != '\0') {
while (*src == ' ') ++src;
starpos = strchr(src, '*');
if (starpos != NULL) *(starpos) = '\0';
while (*src == ' ') ++src;
lcd_setstatus(src);
} else {
LCD_MESSAGEPGM(MSG_USERWAIT);
@ -1865,7 +1864,7 @@ void process_commands()
previous_millis_cmd = millis();
if (codenum > 0){
codenum += millis(); // keep track of when we started waiting
while(millis() < codenum && !lcd_clicked()){
while(millis() < codenum && !lcd_clicked()){
manage_heater();
manage_inactivity();
lcd_update();
@ -1878,7 +1877,10 @@ void process_commands()
lcd_update();
}
}
LCD_MESSAGEPGM(MSG_RESUMING);
if (IS_SD_PRINTING)
LCD_MESSAGEPGM(MSG_RESUMING);
else
LCD_MESSAGEPGM(WELCOME_MSG);
}
break;
#endif