Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add M400 dummy command for Octoprint workaround #391

Open
wants to merge 1 commit into
base: edge
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion g2core/gcode_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ static stat_t _parse_gcode_block(char *buf, char *active_comment)
break;

case 'M':
switch((uint8_t)value) {
switch((uint16_t)value) {
case 0: case 1: case 60:
SET_MODAL (MODAL_GROUP_M4, program_flow, PROGRAM_STOP);
case 2: case 30:
Expand Down Expand Up @@ -840,6 +840,7 @@ static stat_t _parse_gcode_block(char *buf, char *active_comment)

case 115: SET_NON_MODAL (next_action, NEXT_ACTION_MARLIN_REPORT_VERSION); // report version information
case 117: status = STAT_COMPLETE; break; //SET_NON_MODAL (next_action, NEXT_ACTION_MARLIN_DISPLAY_ON_SCREEN);
case 400: status = STAT_COMPLETE; break; // Workaround for OctoPrint.
#endif // MARLIN_COMPAT_ENABLED

default: status = STAT_MCODE_COMMAND_UNSUPPORTED;
Expand Down