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

Merge branch 'master' into cam-topo-new

Browse source
This commit is contained in:
Stewart Allen 2023-01-11 11:36:41 -05:00
commit 9502a07c62
11 changed files with 85 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -211,20 +211,37 @@ CAM.export = function(print, online) {
if (points === 0) {
pos.x = pos.y = pos.z = 0;
points++;
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
});
if (spro.camFirstZMax) {
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;
}