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

properly handle tool macro and selection with multiple extruders

Browse source
This commit is contained in:
Stewart Allen 2021-10-28 19:48:50 -04:00
commit 8352b89624
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@
getRangeParameters = FDM.getRangeParameters, getRangeParameters = FDM.getRangeParameters,
device = settings.device, device = settings.device,
extruders = device.extruders, extruders = device.extruders,
extused = Object.keys(print.extruders).map(v => parseInt(v)),
gcodeFan = device.gcodeFan, gcodeFan = device.gcodeFan,
gcodeLayer = device.gcodeLayer, gcodeLayer = device.gcodeLayer,
gcodeTrack = device.gcodeTrack, gcodeTrack = device.gcodeTrack,
@ -265,8 +266,8 @@
} }
}); });
} }
if (line.indexOf("{tool}") > 0 && extruders.length > 1) { if (line.indexOf("{tool}") > 0 && extused.length > 0) {
for (let i=0; i<extruders.length; i++) { for (let i of extused) {
subst.tool = i; subst.tool = i;
appendSubPad(line); appendSubPad(line);
} }

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

@ -228,7 +228,7 @@
let lastPoly; let lastPoly;
let lastLayer; let lastLayer;
let extruders = []; let extruders = print.extruders = [];
let extcount = 0; let extcount = 0;
// find max layers (for updates) // find max layers (for updates)