Merge pull request #3825 from smoe/fix_canterp_spindle_orientation

andypugh · web-flow · commit 8839d22bd2c5 · 2026-02-24T12:48:32.000Z
canterp: fix parsing of ORIENT_SPINDLE
diff --git a/src/emc/canterp/canterp.cc b/src/emc/canterp/canterp.cc
@@ -592,11 +592,11 @@ int Canterp::execute(const char *line) {
 	    return INTERP_ERROR;
 	}
 	if (!strcmp(s1, "CANON_CLOCKWISE")) {
-	    ORIENT_SPINDLE(i1, d2, CANON_CLOCKWISE);
+	    ORIENT_SPINDLE(i1, d1, CANON_CLOCKWISE);
 	    return 0;
 	}
 	if (!strcmp(s1, "CANON_COUNTERCLOCKWISE")) {
-	    ORIENT_SPINDLE(i1, d2, CANON_COUNTERCLOCKWISE);
+	    ORIENT_SPINDLE(i1, d1, CANON_COUNTERCLOCKWISE);
 	    return 0;
 	}
 	return INTERP_ERROR;

Original file line number	Diff line number	Diff line change
`@@ -592,11 +592,11 @@ int Canterp::execute(const char *line) {`
`592`	`592`	`return INTERP_ERROR;`
`593`	`593`	`}`
`594`	`594`	`if (!strcmp(s1, "CANON_CLOCKWISE")) {`
`595`		`- ORIENT_SPINDLE(i1, d2, CANON_CLOCKWISE);`
	`595`	`+ ORIENT_SPINDLE(i1, d1, CANON_CLOCKWISE);`
`596`	`596`	`return 0;`
`597`	`597`	`}`
`598`	`598`	`if (!strcmp(s1, "CANON_COUNTERCLOCKWISE")) {`
`599`		`- ORIENT_SPINDLE(i1, d2, CANON_COUNTERCLOCKWISE);`
	`599`	`+ ORIENT_SPINDLE(i1, d1, CANON_COUNTERCLOCKWISE);`
`600`	`600`	`return 0;`
`601`	`601`	`}`
`602`	`602`	`return INTERP_ERROR;`