AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Stewart Allen 2023-01-10 23:13:42 -05:00
commit 9e86971ece
1 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/kiri-mode/cam/export.js
View file

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