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

work on first point output. laser output proved a corner case

Browse source
This commit is contained in:
Stewart Allen 2022-10-19 16:31:01 -04:00
commit c4961901c9
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,7 +147,7 @@ CAM.export = function(print, online) {
return "unknown"; return "unknown";
} }
function moveTo(out) { function moveTo(out, opt = {}) {
let laser = out.type === 'laser'; let laser = out.type === 'laser';
let newpos = out.point; let newpos = out.point;
@ -190,18 +190,24 @@ CAM.export = function(print, online) {
} }
} }
// first point out sets the current position (but not Z) // split first move to X,Y then Z for that new location
// hacky AF way to split initial x,y,z into z then x,y // safety to prevent tool crashing
if (points === 0) { if (points === 0) {
pos.x = pos.y = pos.z = 0; pos.x = pos.y = pos.z = 0;
points++; points++;
moveTo({ moveTo({
// speed: Infinity,
tool: out.tool, tool: out.tool,
point: { x: 0, y: 0, z: newpos.z } point: { x: newpos.x, y: newpos.y, z: pos.z }
}, {
dx: 1, dy: 1, dz: 0, time: 0
}); });
moveTo({ moveTo({
// speed: Infinity,
tool: out.tool, tool: out.tool,
point: { x: newpos.x, y: newpos.y, z: newpos.z } point: { x: newpos.x, y: newpos.y, z: newpos.z }
}, {
dx: 0, dy: 0, dz: 1, time: 0
}); });
points--; points--;
return; return;
@ -209,9 +215,9 @@ CAM.export = function(print, online) {
let speed = out.speed, let speed = out.speed,
nl = [speed ? 'G1' : 'G0'], nl = [speed ? 'G1' : 'G0'],
dx = newpos.x - pos.x, dx = opt.dx || newpos.x - pos.x,
dy = newpos.y - pos.y, dy = opt.dy || newpos.y - pos.y,
dz = newpos.z - pos.z, dz = opt.dz || newpos.z - pos.z,
maxf = dz ? maxZd : maxXYd, maxf = dz ? maxZd : maxXYd,
feed = Math.min(speed || maxf, maxf), feed = Math.min(speed || maxf, maxf),
dist = Math.sqrt(dx * dx + dy * dy + dz * dz), dist = Math.sqrt(dx * dx + dy * dy + dz * dz),
@ -222,19 +228,19 @@ CAM.export = function(print, online) {
return; return;
} }
if (newpos.x !== pos.x) { if (dx || newpos.x !== pos.x) {
pos.x = newpos.x; pos.x = newpos.x;
runbox.min.x = Math.min(runbox.min.x, pos.x); runbox.min.x = Math.min(runbox.min.x, pos.x);
runbox.max.x = Math.max(runbox.max.x, pos.x); runbox.max.x = Math.max(runbox.max.x, pos.x);
nl.append(space).append("X").append(add0(pos.x * factor)); nl.append(space).append("X").append(add0(pos.x * factor));
} }
if (newpos.y !== pos.y) { if (dy || newpos.y !== pos.y) {
pos.y = newpos.y; pos.y = newpos.y;
runbox.min.y = Math.min(runbox.min.y, pos.y); runbox.min.y = Math.min(runbox.min.y, pos.y);
runbox.max.y = Math.max(runbox.max.y, pos.y); runbox.max.y = Math.max(runbox.max.y, pos.y);
nl.append(space).append("Y").append(add0(pos.y * factor)); nl.append(space).append("Y").append(add0(pos.y * factor));
} }
if (newpos.z !== pos.z) { if (dz || newpos.z !== pos.z) {
pos.z = newpos.z; pos.z = newpos.z;
runbox.min.z = Math.min(runbox.min.z, pos.z); runbox.min.z = Math.min(runbox.min.z, pos.z);
runbox.max.z = Math.max(runbox.max.z, pos.z); runbox.max.z = Math.max(runbox.max.z, pos.z);
@ -280,7 +286,7 @@ CAM.export = function(print, online) {
lasering = laser; lasering = laser;
// update time calculation // update time calculation
time += (dist / (pos.f || 1000)) * 60; time += opt.time >= 0 ? opt.time : (dist / (pos.f || 1000)) * 60;
// if (comment && !stripComments) { // if (comment && !stripComments) {
// nl.append(" ; ").append(comment); // nl.append(" ; ").append(comment);

2
src/kiri-mode/cam/ops.js
View file

@ -54,7 +54,9 @@ class OpLaserOn extends CamOp {
} }
prepare(ops, progress) { prepare(ops, progress) {
const { printPoint, setPrintPoint, setTool, zmax, camOut } = ops;
this.op.silent = true; this.op.silent = true;
setTool(0);
ops.addGCode(this.op.enable); ops.addGCode(this.op.enable);
ops.setLasering(true, this.op.power); ops.setLasering(true, this.op.power);
} }