Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-02-08 05:48:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correction on how Marlin M104, M140, M109, M190 are handled.

Browse Source
This commit is contained in:
Rob Giseburt
2017-01-23 17:05:15 -06:00
parent cd9ca7edb3
commit 015e9060d9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
g2core/gcode_parser.cpp
View File

@@ -734,11 +734,11 @@ stat_t _parse_gcode_block(char *buf, char *active_comment)
case 105: SET_NON_MODAL (next_action, NEXT_ACTION_MARLIN_PRINT_TEMPERATURES);
case 114: SET_NON_MODAL (next_action, NEXT_ACTION_MARLIN_PRINT_POSITION);
case 140: gf.marlin_wait_for_temp = true; // NO break!
case 109: gf.marlin_wait_for_temp = true; // NO break!
case 104: SET_NON_MODAL (next_action, NEXT_ACTION_MARLIN_SET_EXTRUDER_TEMP);
case 190: gf.marlin_wait_for_temp = true; // NO break!
case 109: SET_NON_MODAL (next_action, NEXT_ACTION_MARLIN_SET_BED_TEMP);
case 140: SET_NON_MODAL (next_action, NEXT_ACTION_MARLIN_SET_BED_TEMP);
case 108: SET_NON_MODAL (next_action, NEXT_ACTION_MARLIN_CANCEL_WAIT_TEMP);
@@ -875,8 +875,8 @@ stat_t _execute_gcode_block(char *active_comment)
ritorno(marlin_request_position_report());
break;
}
case NEXT_ACTION_MARLIN_SET_EXTRUDER_TEMP: // M104 or M140
case NEXT_ACTION_MARLIN_SET_BED_TEMP: { // M109 or M190
case NEXT_ACTION_MARLIN_SET_EXTRUDER_TEMP: // M104 or M109
case NEXT_ACTION_MARLIN_SET_BED_TEMP: { // M140 or M190
cm.gmx.marlin_flavor = true; // these gcodes are ONLY in marlin flavor
float temp = 0;
if (gf.S_word) { temp = gv.S_word; }