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

Merge pull request #873 from gcormier/fix-toolchange-z-restore

Browse Source 
Fix Z home movement when XY already at TLS position
This commit is contained in:
Terje Io
2025-12-21 20:27:05 +07:00
committed by GitHub
parent aaa7b6e73e c5d888fdee
commit fe858f73e9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tool_change.c
View File

@@ -139,18 +139,20 @@ static void reset (void)
// Restore coolant and spindle status, return controlled point to original position.
static bool restore (void)
{
bool ok;
bool ok = true;
plan_line_data_t plan_data;
plan_data_init(&plan_data);
plan_data.condition.rapid_motion = On;
if(!(ok = (target.values[plane.axis_0] == previous.values[plane.axis_0] &&
target.values[plane.axis_1] == previous.values[plane.axis_1]))) {
// Always move Z to home position first (unless full restore is disabled)
target.values[plane.axis_linear] = sys.home_position[plane.axis_linear];
ok = mc_line(target.values, &plan_data);
target.values[plane.axis_linear] = sys.home_position[plane.axis_linear];
if((ok = mc_line(target.values, &plan_data)) && !settings.flags.no_restore_position_after_M6) {
// Then move XY to previous position if needed and full restore is enabled
if(ok && !settings.flags.no_restore_position_after_M6) {
if(target.values[plane.axis_0] != previous.values[plane.axis_0] ||
target.values[plane.axis_1] != previous.values[plane.axis_1]) {
memcpy(&target, &previous, sizeof(coord_data_t));
target.values[plane.axis_linear] = sys.home_position[plane.axis_linear];
ok = mc_line(target.values, &plan_data);