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

Workaround for Pronterface M29

Browse Source
This commit is contained in:
Scott Lahteine 2018-09-27 15:40:19 -05:00
parent eeab4141db
commit cb6454118c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/gcode/queue.cpp
View File

@ -350,7 +350,7 @@ inline void get_serial_commands() {
gcode_LastN = gcode_N; gcode_LastN = gcode_N;
} }
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
else if (card.saving) else if (card.saving && strcmp(command, "M29") != 0) // No line number with M29 in Pronterface
return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i); return gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM), i);
#endif #endif
@ -358,13 +358,17 @@ inline void get_serial_commands() {
if (IsStopped()) { if (IsStopped()) {
char* gpos = strchr(command, 'G'); char* gpos = strchr(command, 'G');
if (gpos) { if (gpos) {
const int codenum = strtol(gpos + 1, NULL, 10); switch (strtol(gpos + 1, NULL, 10)) {
switch (codenum) {
case 0: case 0:
case 1: case 1:
case 2: #if ENABLED(ARC_SUPPORT)
case 3: case 2:
SERIAL_ERRORLNPGM_P(i, MSG_ERR_STOPPED); case 3:
#endif
#if ENABLED(BEZIER_CURVE_SUPPORT)
case 5:
#endif
SERIAL_ERRORLNPGM(MSG_ERR_STOPPED);
LCD_MESSAGEPGM(MSG_STOPPED); LCD_MESSAGEPGM(MSG_STOPPED);
break; break;
} }