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

better fan handling. fix range params with rafts

Browse source
This commit is contained in:
Stewart Allen 2021-03-14 15:16:30 -04:00
commit 8df9860aee
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,9 @@
} }
function getRangeParameters(settings, index) { function getRangeParameters(settings, index) {
if (index === undefined || index === null || index < 0) {
return settings.process;
}
let ranges = settings.process.ranges; let ranges = settings.process.ranges;
if (!(ranges && ranges.length)) { if (!(ranges && ranges.length)) {
return settings.process; return settings.process;

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

@ -67,7 +67,7 @@
}, },
nozzleTemp = process.firstLayerNozzleTemp || process.outputTemp, nozzleTemp = process.firstLayerNozzleTemp || process.outputTemp,
bedTemp = process.firstLayerBedTemp || process.outputBedTemp, bedTemp = process.firstLayerBedTemp || process.outputBedTemp,
fanSpeed = process.firstLayerFanSpeed, fanSpeed = undefined,
lastNozzleTemp = nozzleTemp, lastNozzleTemp = nozzleTemp,
lastBedTemp = bedTemp, lastBedTemp = bedTemp,
lastFanSpeed = fanSpeed, lastFanSpeed = fanSpeed,
@ -106,9 +106,15 @@
retSpeed = process.outputRetractSpeed * 60; // range retSpeed = process.outputRetractSpeed * 60; // range
retDwell = process.outputRetractDwell || 0; // range retDwell = process.outputRetractDwell || 0; // range
timeDwell = retDwell / 1000; timeDwell = retDwell / 1000;
nozzleTemp = process.outputTemp || process.firstLayerNozzleTemp; nozzleTemp = layer === 0 ?
bedTemp = process.outputBedTemp || process.firstLayerBedTemp; process.firstLayerNozzleTemp || process.outputTemp :
fanSpeed = process.outputFanSpeed; process.outputTemp || process.firstLayerNozzleTemp;
bedTemp = layer === 0 ?
process.firstLayerBedTemp || process.outputBedTemp :
process.outputBedTemp || process.firstLayerBedTemp;
fanSpeed = layer === 0 ?
process.firstLayerFanSpeed || 0 :
process.outputFanSpeed || 0;
Object.assign(subst, { Object.assign(subst, {
temp_bed: bedTemp, temp_bed: bedTemp,
bed_temp: bedTemp, bed_temp: bedTemp,
@ -327,8 +333,8 @@
while (layer < layers.length) { while (layer < layers.length) {
path = layers[layer]; path = layers[layer];
// allow range overrides past base // range overrides
if (path.layer > 0) { if (path.layer >= 0) {
updateParams(path.layer); updateParams(path.layer);
} }

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

@ -403,6 +403,7 @@
lastWidget = slice.widget; lastWidget = slice.widget;
layerout.z = z + slice.height / 2; layerout.z = z + slice.height / 2;
layerout.height = layerout.height || slice.height; layerout.height = layerout.height || slice.height;
layerout.slice = slice;
// mark layer as anchor if slice is belt and flag set // mark layer as anchor if slice is belt and flag set
layerout.anchor = slice.belt && slice.belt.anchor; layerout.anchor = slice.belt && slice.belt.anchor;
// detect extruder change and print purge block // detect extruder change and print purge block
@ -764,7 +765,7 @@
update(index / levels.length, output); update(index / levels.length, output);
}); });
console.log({retractz}); // console.log({retractz});
return layers; return layers;
} }