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

Merge pull request #4832 from thinkyhead/rc_fix_M0_M1

Browse Source 
Enable M0/M1 with Emergency Parser
This commit is contained in:
Scott Lahteine 2016-09-18 11:31:36 -05:00 committed by GitHub
commit 37258956d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View File

@ -352,7 +352,7 @@ static bool relative_mode = false;
volatile bool wait_for_heatup = true; volatile bool wait_for_heatup = true;
#if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL) #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
wait_for_user = false; volatile bool wait_for_user = false;
#endif #endif
const char errormagic[] PROGMEM = "Error:"; const char errormagic[] PROGMEM = "Error:";
@ -7010,7 +7010,7 @@ void process_next_command() {
break; break;
case 'M': switch (codenum) { case 'M': switch (codenum) {
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL) || ENABLED(EMERGENCY_PARSER)
case 0: // M0 - Unconditional stop - Wait for user button press on LCD case 0: // M0 - Unconditional stop - Wait for user button press on LCD
case 1: // M1 - Conditional stop - Wait for user button press on LCD case 1: // M1 - Conditional stop - Wait for user button press on LCD
gcode_M0_M1(); gcode_M0_M1();