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

feat: change from first layer fan speed to a setting for layer to turn on fan. ranges handle the other cases

Browse source
This commit is contained in:
Stewart Allen 2024-05-12 08:21:02 -04:00
commit b3fc2d27a2
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/kiri-mode/fdm/export.js
View file

@ -80,8 +80,8 @@ FDM.export = function(print, online, ondone, ondebug) {
nozzleTemp = process.firstLayerNozzleTemp || process.outputTemp, nozzleTemp = process.firstLayerNozzleTemp || process.outputTemp,
bedTemp = process.firstLayerBedTemp || process.outputBedTemp, bedTemp = process.firstLayerBedTemp || process.outputBedTemp,
fanSpeedSave = undefined, fanSpeedSave = undefined,
fanSpeedBase = undefined, fanSpeedBase = 0,
fanSpeed = undefined, fanSpeed = 0,
lastType = undefined, lastType = undefined,
lastNozzleTemp = nozzleTemp, lastNozzleTemp = nozzleTemp,
lastBedTemp = bedTemp, lastBedTemp = bedTemp,
@ -167,9 +167,8 @@ FDM.export = function(print, online, ondone, ondebug) {
params.firstLayerBedTemp || params.outputBedTemp : params.firstLayerBedTemp || params.outputBedTemp :
params.outputBedTemp || params.firstLayerBedTemp; params.outputBedTemp || params.firstLayerBedTemp;
fanSpeedBase = params.firstLayerFanSpeed || 0; fanSpeedBase = params.firstLayerFanSpeed || 0;
fanSpeed = layer === 0 ? fanSpeed = layer >= (params.outputFanLayer ?? 1) ?
params.firstLayerFanSpeed || 0 : params.outputFanSpeed || 0 : fanSpeedBase;
params.outputFanSpeed || 0;
Object.assign(subst, { Object.assign(subst, {
temp_bed: bedTemp, temp_bed: bedTemp,
bed_temp: bedTemp, bed_temp: bedTemp,

1
src/kiri/conf.js
View file

@ -357,6 +357,7 @@ const conf = exports({
outputShellMult: 1.25, outputShellMult: 1.25,
outputFillMult: 1.25, outputFillMult: 1.25,
outputSparseMult: 1.25, outputSparseMult: 1.25,
outputFanLayer: 1,
outputFanSpeed: 255, outputFanSpeed: 255,
outputRetractDist: 1.5, outputRetractDist: 1.5,
outputRetractSpeed: 40, outputRetractSpeed: 40,

3
src/kiri/init.js
View file

@ -1833,6 +1833,7 @@ gapp.register("kiri.init", [], (root, exports) => {
fdmSep: uc.newBlank({class:"pop-sep", modes:FDM}), fdmSep: uc.newBlank({class:"pop-sep", modes:FDM}),
sliceShells: uc.newInput(LANG.sl_shel_s, {title:LANG.sl_shel_l, convert:uc.toFloat, modes:FDM}), sliceShells: uc.newInput(LANG.sl_shel_s, {title:LANG.sl_shel_l, convert:uc.toFloat, modes:FDM}),
sliceLineWidth: uc.newInput(LANG.sl_line_s, {title:LANG.sl_line_l, convert:uc.toFloat, bound:uc.bound(0,5), modes:FDM}), sliceLineWidth: uc.newInput(LANG.sl_line_s, {title:LANG.sl_line_l, convert:uc.toFloat, bound:uc.bound(0,5), modes:FDM}),
outputFanLayer: uc.newInput(LANG.ou_fanl_s, {title:LANG.ou_fanl_l, convert:uc.toInt, bound:uc.bound(0,255), modes:FDM}),
fdmSep: uc.newBlank({class:"pop-sep", modes:FDM}), fdmSep: uc.newBlank({class:"pop-sep", modes:FDM}),
sliceTopLayers: uc.newInput(LANG.sl_ltop_s, {title:LANG.sl_ltop_l, convert:uc.toInt, modes:FDM}), sliceTopLayers: uc.newInput(LANG.sl_ltop_s, {title:LANG.sl_ltop_l, convert:uc.toInt, modes:FDM}),
sliceBottomLayers: uc.newInput(LANG.sl_lbot_s, {title:LANG.sl_lbot_l, convert:uc.toInt, modes:FDM}), sliceBottomLayers: uc.newInput(LANG.sl_lbot_s, {title:LANG.sl_lbot_l, convert:uc.toInt, modes:FDM}),
@ -1851,7 +1852,7 @@ gapp.register("kiri.init", [], (root, exports) => {
fdmSep: uc.newBlank({class:"pop-sep", modes:FDM, show:isNotBelt}), fdmSep: uc.newBlank({class:"pop-sep", modes:FDM, show:isNotBelt}),
firstLayerNozzleTemp:uc.newInput(LANG.fl_nozl_s, {title:LANG.fl_nozl_l, convert:uc.toInt, modes:FDM, show:isNotBelt}), firstLayerNozzleTemp:uc.newInput(LANG.fl_nozl_s, {title:LANG.fl_nozl_l, convert:uc.toInt, modes:FDM, show:isNotBelt}),
firstLayerBedTemp: uc.newInput(LANG.fl_bedd_s, {title:LANG.fl_bedd_l, convert:uc.toInt, modes:FDM, show:isNotBelt}), firstLayerBedTemp: uc.newInput(LANG.fl_bedd_s, {title:LANG.fl_bedd_l, convert:uc.toInt, modes:FDM, show:isNotBelt}),
firstLayerFanSpeed: uc.newInput(LANG.ou_fans_s, {title:LANG.ou_fans_l, convert:uc.toInt, bound:uc.bound(0,255), modes:FDM}), firstLayerFanSpeed: uc.newInput(LANG.ou_fans_s, {title:LANG.ou_fans_l, convert:uc.toInt, bound:uc.bound(0,255), modes:FDM, show:isBelt}),
fdmSep: uc.newBlank({class:"pop-sep", modes:FDM, show:isNotBelt}), fdmSep: uc.newBlank({class:"pop-sep", modes:FDM, show:isNotBelt}),
firstLayerYOffset: uc.newInput(LANG.fl_zoff_s, {title:LANG.fl_zoff_l, convert:uc.toFloat, modes:FDM, show:isBelt}), firstLayerYOffset: uc.newInput(LANG.fl_zoff_s, {title:LANG.fl_zoff_l, convert:uc.toFloat, modes:FDM, show:isBelt}),
firstLayerFlatten: uc.newInput(LANG.fl_flat_s, {title:LANG.fl_flat_l, convert:uc.toFloat, modes:FDM, show:isBelt}), firstLayerFlatten: uc.newInput(LANG.fl_flat_s, {title:LANG.fl_flat_l, convert:uc.toFloat, modes:FDM, show:isBelt}),

2
web/kiri/lang/en.js
View file

@ -671,6 +671,8 @@ self.kiri.lang['en-us'] = {
ou_flml_s: "solid factor", ou_flml_s: "solid factor",
ou_spml_s: "infill factor", ou_spml_s: "infill factor",
ou_exml_l: ["extrusion multiplier","0.0 - 2.0"], ou_exml_l: ["extrusion multiplier","0.0 - 2.0"],
ou_fanl_s: "fan on",
ou_fanl_l: ["layer # to turn on fan","layers start at 0"],
ou_fans_s: "fan speed", ou_fans_s: "fan speed",
ou_fans_l: "0 - 255", ou_fans_l: "0 - 255",