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

adjust purge tower belt offset

Browse source
This commit is contained in:
Stewart Allen 2021-11-16 11:27:36 -05:00
commit d306ac0569
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -268,7 +268,8 @@
// replace extruders array with object array containing more info // replace extruders array with object array containing more info
extruders = extruders.map((ext,i) => { extruders = extruders.map((ext,i) => {
if (!ext) return ext; if (!ext) return ext;
let noz = device.extruders[i].extNozzle, let exi = device.extruders[i],
noz = exi.extNozzle,
pos = {x:blokpos.x, y:blokpos.y, z:0}, pos = {x:blokpos.x, y:blokpos.y, z:0},
rect = newPolygon().centerRectangle(pos, blok.x, blok.y), rect = newPolygon().centerRectangle(pos, blok.x, blok.y),
full = linesToPoly(POLY.fillArea([ full = linesToPoly(POLY.fillArea([
@ -279,6 +280,7 @@
], 135, noz * 5)), ], 135, noz * 5)),
rec = { rec = {
extruder: i, extruder: i,
diameter: exi.extNozzle,
rect, rect,
full, full,
sparse sparse
@ -323,12 +325,14 @@
if (layer.last()) { if (layer.last()) {
layer.last().retract = true; layer.last().retract = true;
} }
let purgeOn = first || !thin; let purgeOn = (!isBelt && first) || !thin;
let box = rec.rect.clone().setZ(z); let box = rec.rect.clone().setZ(z);
let fill = (purgeOn ? rec.full : rec.sparse).clone().setZ(z); let fill = (purgeOn ? rec.full : rec.sparse).clone().setZ(z);
if (isBelt) { if (isBelt) {
box.move({x:0, y:z, z:0}); // offset by nozzle diameter + half step (shell) then angled
fill.move({x:0, y:z, z:0}); let exo = rec.diameter * (1/Math.sqrt(2)) * 1.5;
box.move({x:0, y:z - exo, z:0});
fill.move({x:0, y:z - exo, z:0});
if (offset) { if (offset) {
box.move(offset); box.move(offset);
fill.move(offset); fill.move(offset);

3
src/mode/fdm/slice.js
View file

@ -367,7 +367,8 @@
} }
} }
// mark slice as touching belt if near miny // mark slice as touching belt if near miny
if (Math.abs(slice.belt.miny - smin) < 0.01) { // if (Math.abs(slice.belt.miny - smin) < 0.01) {
if (Math.abs(slice.belt.miny) < 0.01) {
slice.belt.touch = true; slice.belt.touch = true;
if (!start) start = slice; if (!start) start = slice;
} }