Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-22 19:43:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Marlin: Fix G28 to work when either marlin gcode flavor or marlin protocol are active. (For Repetier to home from the console.)

Browse Source
This commit is contained in:
Rob Giseburt
2017-01-26 10:45:43 -06:00
parent 018bc18a09
commit fb1860dc02
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/gcode_parser.cpp
+8 -8
View File
@@ -600,14 +600,7 @@ stat_t _parse_gcode_block(char *buf, char *active_comment)
case 21: SET_MODAL (MODAL_GROUP_G6, units_mode, MILLIMETERS);
case 28: {
switch (_point(value)) {
case 0: {
#if MARLIN_COMPAT_ENABLED == true
if (cm.gmx.marlin_flavor) {
SET_NON_MODAL (next_action, NEXT_ACTION_SEARCH_HOME);
}
#endif
SET_MODAL (MODAL_GROUP_G0, next_action, NEXT_ACTION_GOTO_G28_POSITION);
}
case 0: SET_MODAL (MODAL_GROUP_G0, next_action, NEXT_ACTION_GOTO_G28_POSITION);
case 1: SET_MODAL (MODAL_GROUP_G0, next_action, NEXT_ACTION_SET_G28_POSITION);
case 2: SET_NON_MODAL (next_action, NEXT_ACTION_SEARCH_HOME);
case 3: SET_NON_MODAL (next_action, NEXT_ACTION_SET_ABSOLUTE_ORIGIN);
@@ -872,6 +865,13 @@ stat_t _execute_gcode_block(char *active_comment)
}
}
if ((cm.gmx.marlin_flavor || (MARLIN_COMM_MODE == js.json_mode)) &&
(NEXT_ACTION_GOTO_G28_POSITION == gv.next_action)
)
{
gv.next_action = NEXT_ACTION_SEARCH_HOME;
}
switch (gv.next_action) {
case NEXT_ACTION_MARLIN_PRINT_TEMPERATURES: { // M105
js.json_mode = MARLIN_COMM_MODE; // we use M105 to know when to switch