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

Wait for end of line before invoking action

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-06 16:03:33 -07:00
parent ea47803ae2
commit bd5a825b8b
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Marlin/MarlinSerial.cpp
View File

@ -329,16 +329,17 @@ MarlinSerial customizedSerial;
state_M, state_M,
state_M1, state_M1,
state_M10, state_M10,
state_M108,
state_M11, state_M11,
state_M112,
state_M4, state_M4,
state_M41, state_M41,
state_M410,
state_IGNORE // to '\n' state_IGNORE // to '\n'
}; };
static e_parser_state state = state_RESET; static e_parser_state state = state_RESET;
if (c == '\n') state = state_IGNORE;
switch (state) { switch (state) {
case state_RESET: case state_RESET:
switch (c) { switch (c) {
@ -378,13 +379,11 @@ MarlinSerial customizedSerial;
break; break;
case state_M10: case state_M10:
if (c == '8') wait_for_heatup = false; // M108 state = (c == '8') ? state_M108 : state_IGNORE;
state = state_IGNORE;
break; break;
case state_M11: case state_M11:
if (c == '2') kill(PSTR(MSG_KILLED)); // M112 state = (c == '2') ? state_M112 : state_IGNORE;
state = state_IGNORE;
break; break;
case state_M4: case state_M4:
@ -392,8 +391,7 @@ MarlinSerial customizedSerial;
break; break;
case state_M41: case state_M41:
if (c == '0') quickstop_stepper(); // M410 state = (c == '0') ? state_M410 : state_IGNORE;
state = state_IGNORE;
break; break;
case state_IGNORE: case state_IGNORE:
@ -401,7 +399,20 @@ MarlinSerial customizedSerial;
break; break;
default: default:
state = state_RESET; if (c == '\n') {
switch (state) {
case state_M108:
wait_for_heatup = false;
break;
case state_M112:
kill(PSTR(MSG_KILLED));
break;
case state_M410:
quickstop_stepper();
break;
}
state = state_RESET;
}
} }
} }
#endif #endif