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

output spindle at the start of every op. #237

Browse source
This commit is contained in:
Stewart Allen 2022-12-31 21:09:05 -05:00
commit 821e19ed03
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
notes.md
View file

@ -101,6 +101,8 @@
* `F` ease-in and ease-out especially on tab cut-out start/stop * `F` ease-in and ease-out especially on tab cut-out start/stop
* `F` maintain several part orientations + op chains in a single profile * `F` maintain several part orientations + op chains in a single profile
* `P` inner corner arc moves
* `P` log Z interpolation for contour XYZ moves
* `P` option to start with the smallest poly by area on layer change * `P` option to start with the smallest poly by area on layer change
* `P` refactor slicing engine to use common core in geo * `P` refactor slicing engine to use common core in geo
* `P` decrease cutting speed when entire tool is engaged (start of roughing, rest machining) * `P` decrease cutting speed when entire tool is engaged (start of roughing, rest machining)

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

@ -194,7 +194,7 @@ CAM.export = function(print, online) {
} }
// on spindle change (deferred from layer transition so it's post-toolchange) // on spindle change (deferred from layer transition so it's post-toolchange)
if ((changeTool && spindleMax) || (newSpindle && newSpindle !== spindle)) { if (spindleMax && newSpindle && (changeTool || newSpindle !== spindle || opt.newOp)) {
spindle = newSpindle; spindle = newSpindle;
if (!laserOp) { if (!laserOp) {
if (spindle > 0) { if (spindle > 0) {
@ -413,7 +413,8 @@ CAM.export = function(print, online) {
} }
} }
const firstOut = layerout[0]; const firstOut = layerout[0];
if (newmode && !newmode.silent && mode !== newmode) { const newOp = newmode && !newmode.silent && mode !== newmode;
if (newOp) {
if (mode && !stripComments) { if (mode && !stripComments) {
append("; ending " + mode.type + " op after " + Math.round(time/60) + " seconds"); append("; ending " + mode.type + " op after " + Math.round(time/60) + " seconds");
} }
@ -427,13 +428,13 @@ CAM.export = function(print, online) {
} }
newSpindle = layerout.spindle; newSpindle = layerout.spindle;
// iterate over layer output records // iterate over layer output records
for (let out of layerout) { layerout.forEach((out, ind) => {
if (out.gcode && Array.isArray(out.gcode)) { if (out.gcode && Array.isArray(out.gcode)) {
filterEmit(out.gcode, consts); filterEmit(out.gcode, consts);
} else { } else {
moveTo(out); moveTo(out, { newOp: ind === 0 ? newOp : false });
}
} }
});
if (lasering && laserOp) { if (lasering && laserOp) {
// disable laser // disable laser
filterEmit(laserOp.off, consts); filterEmit(laserOp.off, consts);

2
web/kiri/lang/en.js
View file

@ -338,7 +338,7 @@ self.kiri.lang['en-us'] = {
// FDM FILL // FDM FILL
fi_menu: "infill", fi_menu: "infill",
fi_type: "fill type", fi_type: "fill type",
fi_pcnt_s: "fill fraction", fi_pcnt_s: "fill amount",
fi_pcnt_l: ["fill density values","0.0 - 1.0"], fi_pcnt_l: ["fill density values","0.0 - 1.0"],
fi_rept_s: "fill repeat", fi_rept_s: "fill repeat",
fi_rept_l: ["number of times to repeat","unchanged fill layers"], fi_rept_l: ["number of times to repeat","unchanged fill layers"],