Mirrors_Framework/grblHAL
1
0
Fork 0
mirror of https://github.com/grblHAL/core.git synced 2026-09-23 20:55:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved handling of laser mode M4 for jogging and motion complete events.

Browse Source 
Bug fixes + expanded step/dir map to 8 axes.
This commit is contained in:
Terje Io
2022-09-22 18:45:33 +02:00
parent c7c64366e3
commit 7f53b2115b
8 changed files with 440 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gcode.c
+2 -2
View File
@@ -2526,7 +2526,7 @@ status_code_t gc_execute_block(char *block)
memcpy(&plan_data.spindle, &gc_state.spindle, sizeof(spindle_t));
plan_data.condition.spindle = gc_state.modal.spindle;
plan_data.condition.coolant = gc_state.modal.coolant;
plan_data.condition.is_rpm_rate_adjusted = gc_state.is_rpm_rate_adjusted;
plan_data.condition.is_rpm_rate_adjusted = gc_state.is_rpm_rate_adjusted || (gc_state.modal.spindle.ccw && sys.mode == Mode_Laser);
if ((status_code_t)(int_value = (uint_fast16_t)mc_jog_execute(&plan_data, &gc_block)) == Status_OK)
memcpy(gc_state.position, gc_block.values.xyz, sizeof(gc_state.position));
@@ -2555,7 +2555,7 @@ status_code_t gc_execute_block(char *block)
gc_parser_flags.spindle_force_sync = On;
}
gc_state.is_rpm_rate_adjusted = gc_state.modal.spindle.ccw && !gc_parser_flags.laser_disable && hal.spindle.cap.variable;
gc_state.is_rpm_rate_adjusted = gc_state.modal.spindle.ccw && !gc_parser_flags.laser_disable;
}
// [0. Non-specific/common error-checks and miscellaneous setup]: