Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-10-06 22:52:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

080.30 spindle states are more rational

Browse Source
This commit is contained in:
aldenhart
2015-03-23 14:04:38 -04:00
parent 5dc92d887c
commit ccb7a73c31
9 changed files with 122 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TinyG2/gcode_parser.cpp
+4 -4
View File
@@ -339,9 +339,9 @@ static stat_t _parse_gcode_block(char_t *buf)
SET_MODAL (MODAL_GROUP_M4, program_flow, PROGRAM_STOP);
case 2: case 30:
SET_MODAL (MODAL_GROUP_M4, program_flow, PROGRAM_END);
case 3: SET_MODAL (MODAL_GROUP_M7, spindle_state, SPINDLE_CW);
case 4: SET_MODAL (MODAL_GROUP_M7, spindle_state, SPINDLE_CCW);
case 5: SET_MODAL (MODAL_GROUP_M7, spindle_state, SPINDLE_OFF);
case 3: SET_MODAL (MODAL_GROUP_M7, spindle_control, SPINDLE_CONTROL_CW);
case 4: SET_MODAL (MODAL_GROUP_M7, spindle_control, SPINDLE_CONTROL_CCW);
case 5: SET_MODAL (MODAL_GROUP_M7, spindle_control, SPINDLE_CONTROL_OFF);
case 6: SET_NON_MODAL (tool_change, true);
case 7: SET_MODAL (MODAL_GROUP_M8, mist_coolant, true);
case 8: SET_MODAL (MODAL_GROUP_M8, flood_coolant, true);
@@ -434,7 +434,7 @@ static stat_t _execute_gcode_block()
// EXEC_FUNC(cm_spindle_override_factor, spindle_override_factor);
EXEC_FUNC(cm_select_tool, tool_select); // tool_select is where it's written
EXEC_FUNC(cm_change_tool, tool_change);
EXEC_FUNC(cm_spindle_control, spindle_state); // spindle on or off
EXEC_FUNC(cm_spindle_control, spindle_control); // spindle CW, CCW, OFF
EXEC_FUNC(cm_mist_coolant_control, mist_coolant);
EXEC_FUNC(cm_flood_coolant_control, flood_coolant); // also disables mist coolant if OFF
// EXEC_FUNC(cm_feed_rate_override_enable, feed_rate_override_enable);