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

fix swapped y bounds that could affect belt offset. bump rev 2.9.D6

Browse source
This commit is contained in:
Stewart Allen 2021-05-01 00:43:01 -04:00
commit 6fb292705a
6 changed files with 25 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/mode/fdm/prepare.js
View file

@ -11,7 +11,8 @@
FDM = KIRI.driver.FDM,
newPoint = BASE.newPoint,
newPolygon = BASE.newPolygon,
getRangeParameters = FDM.getRangeParameters;
getRangeParameters = FDM.getRangeParameters,
debug = false;
/**
* DRIVER PRINT CONTRACT
@ -47,8 +48,7 @@
print = self.worker.print = KIRI.newPrint(settings, widgets),
beltYoff = device.bedDepth / 2,
beltfact = Math.cos(Math.PI/4),
invbfact = 1 / beltfact,
bfactor = invbfact * beltfact;
invbfact = 1 / beltfact;
// compute bounds if missing
if (!bounds) {
@ -308,20 +308,6 @@
y: o,
z: o
};
// offset = { x:0, y:0, z:0 };
// locate the lowest point in slices and widget overall
let minby = Infinity;
for (let slice of widget.slices) {
slice.minby = Infinity;
for (let top of slice.tops) {
let poly = top.poly;
for (let point of poly.points) {
let ypos = -point.y + point.z * bfactor;
slice.minby = Math.min(slice.minby, ypos);
minby = Math.min(minby, ypos);
}
}
}
} else {
// when rafts used this is non-zero
offset.z = zoff;
@ -472,26 +458,8 @@
// post-process for base extrusions (touching the bed)
if (isBelt) {
// find belt min y
let minby = Infinity;
let normout = output.filter(l => !l.anchor);
for (let layer of normout) {
for (let rec of layer) {
let point = rec.point;
if (rec.emit) {
minby = Math.min(minby, -point.y + point.z * bfactor);
}
}
}
// correct y offset to desired layer offset
// // correct y offset to desired layer offset
let miny = process.firstLayerYOffset || 0;
let poff = minby - miny;
for (let layer of output) {
for (let rec of layer) {
rec.point.y += poff;
}
}
let thresh = firstLayerHeight * 0.25;
let seqn = 0;
// iterate over layers, find extrusion on belt and
@ -511,7 +479,7 @@
for (let rec of layer) {
let point = rec.point;
let belty = rec.belty = -point.y + point.z * bfactor;
let belty = rec.belty = -point.y + point.z;
miny = Math.min(miny, belty);
if (rec.emit && belty <= thresh && lastout && Math.abs(lastout.belty - belty) < 0.005) {
// apply base speed to segments touching belt