fix first XY / Z moves to take into account Z over or under current position

This commit is contained in:
Stewart Allen 2023-01-10 23:13:42 -05:00
commit 9e86971ece

View file

@ -211,29 +211,37 @@ CAM.export = function(print, online) {
if (points === 0) {
pos.x = pos.y = pos.z = 0;
points++;
if (newpos.z > pos.z)
moveTo({
// speed: Infinity,
tool: out.tool,
point: { x: newpos.x, y: newpos.y, z: newpos.z, a: newpos.a }
}, {
dx: 0, dy: 0, dz: 1, time: 0
});
moveTo({
// speed: Infinity,
tool: out.tool,
point: { x: newpos.x, y: newpos.y, z: pos.z, a: pos.a }
}, {
dx: 1, dy: 1, dz: 0, time: 0
});
if (newpos.z < pos.z)
moveTo({
// speed: Infinity,
tool: out.tool,
point: { x: newpos.x, y: newpos.y, z: newpos.z, a: newpos.a }
}, {
dx: 0, dy: 0, dz: 1, time: 0
});
if (newpos.z > pos.z) {
moveTo({
// speed: Infinity,
tool: out.tool,
point: { x: pos.x, y: pos.y, z: newpos.z, a: newpos.a }
}, {
dx: 0, dy: 0, dz: 1, time: 0
});
moveTo({
// speed: Infinity,
tool: out.tool,
point: { x: newpos.x, y: newpos.y, z: newpos.z, a: pos.a }
}, {
dx: 1, dy: 1, dz: 0, time: 0
});
} else if (newpos.z <= pos.z) {
moveTo({
// speed: Infinity,
tool: out.tool,
point: { x: newpos.x, y: newpos.y, z: pos.z, a: pos.a }
}, {
dx: 1, dy: 1, dz: 0, time: 0
});
moveTo({
// speed: Infinity,
tool: out.tool,
point: { x: newpos.x, y: newpos.y, z: newpos.z, a: newpos.a }
}, {
dx: 0, dy: 0, dz: 1, time: 0
});
}
points--;
return;
}