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

get prepare displaying G2s

Browse source
This commit is contained in:
bakedpotatolord 2025-05-31 18:40:14 -06:00
commit 47e312d486
5 changed files with 139 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,8 @@ CAM.export = function(print, online) {
const widget = print.widgets[0];
if (!widget) return;
console.log(print);
const { settings } = print;
const { device, tools } = settings;
@ -164,6 +166,7 @@ CAM.export = function(print, online) {
}
}
function moveTo(out, opt = {}) {
let laser = out.type === 'laser';
let newpos = out.point;
@ -251,18 +254,23 @@ CAM.export = function(print, online) {
points--;
return;
}
console.log(out)
let gn;
if ( out.emit >=0 && out.emit <= 3) gn = `G${out.emit}`;
else throw new Error(`malformed emit type ${out.emit}`);
let speed = out.speed,
gn = speed ? 'G1' : 'G0',
nl = (compact_output && lastGn === gn) ? [] : [gn],
dx = opt.dx || newpos.x - pos.x,
dy = opt.dy || newpos.y - pos.y,
dz = opt.dz || newpos.z - pos.z,
da = newpos.a != pos.a,
maxf = dz ? maxZd : maxXYd,
feed = Math.min(speed || maxf, maxf),
dist = Math.sqrt(dx * dx + dy * dy + dz * dz),
newFeed = feed && feed !== pos.f;
arc = out.emit == 2 || out.emit == 3,
nl = (compact_output && lastGn === gn) ? [] : [gn],
dx = opt.dx || newpos.x - pos.x,
dy = opt.dy || newpos.y - pos.y,
dz = opt.dz || newpos.z - pos.z,
da = newpos.a != pos.a,
maxf = dz ? maxZd : maxXYd,
feed = Math.min(speed || maxf, maxf),
dist = Math.sqrt(dx * dx + dy * dy + dz * dz),
newFeed = feed && feed !== pos.f;
// drop dup points (all deltas are 0)
if (!(dx || dy || dz || da)) {

87
src/kiri-mode/cam/prepare.js
View file

@ -7,6 +7,7 @@
// dep: geo.polygons
// dep: kiri.render
// dep: kiri-mode.cam.driver
// dep: kiri.print
// use: kiri-mode.cam.ops
gapp.register("kiri-mode.cam.prepare", (root, exports) => {
@ -18,6 +19,7 @@ const { CAM } = driver;
const POLY = polygons;
/**
* DRIVER PRINT CONTRACT
*
@ -43,18 +45,21 @@ CAM.prepare = async function(widall, settings, update) {
const output = print.output.filter(level => Array.isArray(level));
if (render) // allows it to run from CLI
return render.path(output, (progress, layer) => {
update(0.75 + progress * 0.25, "render", layer);
}, {
thin: true,
print: 0,
move: 0x557799,
speed: false,
moves: true,
other: "moving",
action: "milling",
maxspeed: settings.process.camFastFeed || 6000
});
return render.path(
output,
(progress, layer) => {
update(0.75 + progress * 0.25, "render", layer);
}, {
thin: true,
print: 0,
move: 0x557799,
speed: false,
moves: true,
other: "moving",
action: "milling",
maxspeed: settings.process.camFastFeed || 6000
}
);
};
function prepEach(widget, settings, print, firstPoint, update) {
@ -258,11 +263,12 @@ function prepEach(widget, settings, print, firstPoint, update) {
/**
* @param {Point} point
* @param {number} emit (0=move, !0=filament emit/laser on/cut mode)
* @param {number} emit (0=move, 1=/laser on/cut mode, 2/3= G2/G3 arc)
* @param {number} [speed] feed/plunge rate in mm/min
* @param {number} [tool] tool number
*/
function layerPush(point, emit, speed, tool, type) {
function layerPush(point, emit, speed, tool, options) {
const { type, radius, arcPoints } = options ?? {};
const dz = (point && lastPush && lastPush.point) ? point.z - lastPush.point.z : 0;
if (dz < 0 && speed > plungeRate) {
speed = plungeRate;
@ -292,9 +298,9 @@ function prepEach(widget, settings, print, firstPoint, update) {
if (lasering.flat) {
point.z = (stock && stock.z ? stock.z : wztop) + lasering.flatz;
}
print.addOutput(layerOut, point, power, speed, tool, 'laser');
print.addOutput(layerOut, point, power, speed, tool, {type:'laser'});
} else {
print.addOutput(layerOut, point, emit, speed, tool, type);
print.addOutput(layerOut, point, emit, speed, tool, {type, radius, arcPoints});
}
lastPush = { point, emit, speed, tool };
return point;
@ -321,12 +327,15 @@ function prepEach(widget, settings, print, firstPoint, update) {
function camOut(point, cut,opts) {
let {
radius = null,
radius = 0,
clockwise = true,
arcPoints = [],
moveLen = toolDiamMove,
factor = 1,
} = opts ?? {}
const isArc = radius > 0;
point = point.clone();
point.x += wmx;
point.y += wmy;
@ -360,7 +369,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
cut ? 1 : 0,
rate,
tool,
"lerp"
{type:"lerp"},
);
}
}
@ -378,7 +387,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
let deltaXY = lastPoint.distTo2D(point),
deltaZ = point.z - lastPoint.z,
absDeltaZ = Math.abs(deltaZ),
isMove = !cut;
isMove = !(cut || isArc);
// drop points too close together
if (!isLathe && deltaXY < 0.001 && point.z === lastPoint.z) {
@ -460,15 +469,32 @@ function prepEach(widget, settings, print, firstPoint, update) {
}
}
// todo synthesize move speed from feed / plunge accordingly
layerOut.mode = currentOp;
layerOut.spindle = spindle;
lastPoint = layerPush(
point,
cut ? 1 : 0,
rate,
tool
);
if(isArc) {
console.log("arc recieved");
layerPush(
point,
clockwise ? 2 : 3,
rate,
tool,
{
radius,
arcPoints
}
);
}else{
// for g1 moves
// TODO: synthesize move speed from feed / plunge accordingly
layerOut.mode = currentOp;
layerOut.spindle = spindle;
lastPoint = layerPush(
point,
cut ? 1 : 0,
rate,
tool
);
}
}
/**
@ -768,7 +794,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
// if (deem || depm || desp || dc > arcDist || cc.r < arcMin || cc.r > arcMax || dist > cc.r) {
if ( desp || dc * arcQ.center.length / arcQ.rSum > arcDist || dist > cc.r || cc.r > arcMax || radFault ) {
// let debug = [deem, depm, desp, dc * arcQ.center.length / arcQ.rSum > arcDist, dist > cc.r, cc.r > arcMax, radFault];
console.log("point off the arc,",structuredClone(arcQ));
// console.log("point off the arc,",structuredClone(arcQ));
if (arcQ.length === 4) {
// not enough points for an arc, drop first point and recalc center
camOut(arcQ.shift(),1);
@ -856,10 +882,9 @@ function prepEach(widget, settings, print, firstPoint, update) {
// XYR form
// let pre = `${clockwise? 'G2' : 'G3'} X${to.x.toFixed(decimals)} Y${to.y.toFixed(decimals)} R${cc.r.toFixed(decimals)} `;
camOut(to,1,{radius:cc.r, clockwise});
camOut(to,1,{radius:cc.r, clockwise, arcPoints:[...arcQ]});
// XYIJ form
// let pre = `${clockwise? 'G2' : 'G3'} X${to.x.toFixed(decimals)} Y${to.y.toFixed(decimals)} I${(cc.x - pos.x).toFixed(decimals)} J${(cc.y - pos.y).toFixed(decimals)} E${emit.toFixed(decimals)}`;
// let add = pos.f !== from.speedMMM ? ` E${from.speedMMM}` : '';
// append(`${pre}${add} ; merged=${cl-1} len=${dist.toFixed(decimals)} cp=${cc.x.round(2)},${cc.y.round(2)}`);
} else {

10
src/kiri-mode/fdm/prepare.js
View file

@ -739,7 +739,7 @@ FDM.prepare = async function(widgets, settings, update) {
// outside brim
if (firstLayerBrim && !brimHalf) {
print.addOutput(tmpout, newPoint(maxx + b, y, z), 0, outputSeekrate, tool);
print.addOutput(tmpout, newPoint(maxx + g, y, z), emit, firstLayerRate, tool).retract = true;
print.addOutput(tmpout, newPoint(maxx + g, y, z), emit, firstLayerRate, tool,{retract: true})
}
// inside brim
if (firstLayerBrimIn && pads.length > 1) {
@ -752,20 +752,20 @@ FDM.prepare = async function(widgets, settings, update) {
if (x1 - x0 > bi * 2) {
// over 2x brim so emit two segments
print.addOutput(tmpout, newPoint(x1 - g, y, z), 0, outputSeekrate, tool);
print.addOutput(tmpout, newPoint(x1 - bi, y, z), emit, firstLayerRate, tool).retract = true;
print.addOutput(tmpout, newPoint(x1 - bi, y, z), emit, firstLayerRate, tool, {retract: true});
print.addOutput(tmpout, newPoint(x0 + bi, y, z), 0, outputSeekrate, tool);
print.addOutput(tmpout, newPoint(x0 + g, y, z), emit, firstLayerRate, tool).retract = true;
print.addOutput(tmpout, newPoint(x0 + g, y, z), emit, firstLayerRate, tool, {retract: true});
} else if (x1 - x0 > bi / 3) {
// over 1/3rd brim length emit single segment
print.addOutput(tmpout, newPoint(x1 - g, y, z), 0, outputSeekrate, tool);
print.addOutput(tmpout, newPoint(x0 + g, y, z), emit, firstLayerRate, tool).retract = true;
print.addOutput(tmpout, newPoint(x0 + g, y, z), emit, firstLayerRate, tool, {retract: true});
}
}
}
// outside brim
if (firstLayerBrim) {
print.addOutput(tmpout, newPoint(minx - b, y, z), 0, outputSeekrate, tool);
print.addOutput(tmpout, newPoint(minx - g, y, z), emit, firstLayerRate, tool).retract = false;
print.addOutput(tmpout, newPoint(minx - g, y, z), emit, firstLayerRate, tool, {retract: true});
}
// when there is a printing move between layers
// inject non-printing move to after brim to prevent erroneous extrusion