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

solve remaining object belt rotation and gcode generation issues

Browse source
This commit is contained in:
Stewart Allen 2021-01-10 22:22:36 -05:00
commit 80e57335a1
5 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/mode/fdm/export.js
View file

@ -182,20 +182,20 @@
append(";; " + comment);
}
let o = [!rate && !newpos.e ? 'G0' : 'G1'];
// put out x,y,z in belt mode if not engage/retract
let xyz = newpos.x || newpos.y || newpos.z;
let emit = { x: xyz && isBelt, y: xyz && isBelt, z: xyz && isBelt };
if (typeof newpos.x === 'number') {
let emit = { x: false, y: false, z: false };
if (typeof newpos.x === 'number' && newpos.x !== pos.x) {
pos.x = newpos.x;
emit.x = true;
}
if (typeof newpos.y === 'number') {
if (typeof newpos.y === 'number' && newpos.y !== pos.y) {
pos.y = newpos.y;
emit.y = true;
if (isBelt) emit.z = true;
}
if (typeof newpos.z === 'number') {
if (typeof newpos.z === 'number' && newpos.z !== pos.z) {
pos.z = newpos.z;
emit.z = true;
if (isBelt) emit.y = true;
}
let epos = isBelt ? { x: pos.x, y: pos.y, z: pos.z } : pos;
if (isBelt) {
@ -249,11 +249,14 @@
(process.firstSliceHeight || process.sliceHeight) : path.height);
subst.z = zpos = path.z;
// subst.z = (zpos + path.height).toFixed(3);
subst.Z = subst.z;
subst.layer = layer;
subst.height = path.height.toFixed(3);
if (isBelt) {
pos.z = zpos;
}
if (pauseCmd && pause.indexOf(layer) >= 0) {
appendAllSub(pauseCmd)
}