bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

M0-M1 Enhancements

Browse Source 
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
This commit is contained in:
Scott Lahteine
2014-11-24 16:56:37 -08:00
parent 90eb266139
commit 92e21d3ee2
3 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Marlin/Marlin_main.cpp
View File

@ -1863,11 +1863,26 @@ void process_commands()
case 0: // M0 - Unconditional stop - Wait for user button press on LCD
case 1: // M1 - Conditional stop - Wait for user button press on LCD
{
LCD_MESSAGEPGM(MSG_USERWAIT);
codenum = 0;
if(code_seen('P')) codenum = code_value(); // milliseconds to wait
if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
char *src = strchr_pointer + 2;
codenum = 0;
bool hasP = code_seen('P');
if (hasP) codenum = code_value(); // milliseconds to wait
bool hasS = code_seen('S');
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';
lcd_setstatus(src);
} else {
LCD_MESSAGEPGM(MSG_USERWAIT);
}
lcd_ignore_click();
st_synchronize();
previous_millis_cmd = millis();
if (codenum > 0){
@ -1877,6 +1892,7 @@ void process_commands()
manage_inactivity();
lcd_update();
}
lcd_ignore_click(false);
}else{
while(!lcd_clicked()){
manage_heater();