Skip to content

task: reset canon length units on program open (fixes #4194) #4196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
grandixximo wants to merge 1 commit into from
+12 −0
Closed

task: reset canon length units on program open (fixes #4194) #4196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/emc/task/emctask.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
********************************************************************/

#include <stdlib.h>
#include <math.h> // fabs()
#include <rtapi_string.h> // rtapi_strlcpy()
#include <sys/stat.h> // struct stat
#include <unistd.h> // stat()
Expand Down Expand Up @@ -548,6 +549,17 @@ int emcTaskPlanOpen(const char *file)
emcStatus->task.readLine = 0;
}

// Reset canon length units to machine default before re-opening.
// Without this, G20/G21 from the previous run persists in
// canon.lengthUnits, causing FROM_PROG_LEN() to convert differently
// on re-run for G-code commands that appear before G20/G21.
double units = GET_EXTERNAL_LENGTH_UNITS();
if (fabs(units - 1.0 / 25.4) < 1.0e-3) {
USE_LENGTH_UNITS(CANON_UNITS_INCHES);
} else if (fabs(units - 1.0) < 1.0e-3) {
USE_LENGTH_UNITS(CANON_UNITS_MM);
}

int retval = interp.open(file);
if (retval > INTERP_MIN_ERROR) {
print_interp_error(retval);
Expand Down
Loading