--- emc2/src/emc/task/emccanon.cc.orig 2007-07-26 13:33:49.000000000 -0400
+++ emc2/src/emc/task/emccanon.cc 2007-07-26 13:35:13.000000000 -0400
@@ -1191,8 +1191,9 @@
if (HAVE_TOOL_CHANGE_POSITION) {
double vel, acc, x, y, z, a, b, c;
- x = FROM_EXT_LEN(TOOL_CHANGE_POSITION.tran.x);
- y = FROM_EXT_LEN(TOOL_CHANGE_POSITION.tran.y);
+ //more of dad's stupidity. below two hacks are used to inhibit XY-plane movement when M6 is issued.
+ x = FROM_EXT_LEN(GET_EXTERNAL_POSITION_X()); //(TOOL_CHANGE_POSITION.tran.x);
+ y = FROM_EXT_LEN(GET_EXTERNAL_POSITION_Y()); //(TOOL_CHANGE_POSITION.tran.y);
z = FROM_EXT_LEN(TOOL_CHANGE_POSITION.tran.z);
a = FROM_EXT_ANG(0.0);
b = FROM_EXT_ANG(0.0);