From 4d19171d70e0ae9b77db7eb2422ec5504b44ad76 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 9 Nov 2021 22:17:18 -0500 Subject: [PATCH] add filament source persistence, palette3 boolean in preview/export --- src/kiri/init.js | 12 +++++++++++- src/mode/fdm/export.js | 3 ++- src/mode/fdm/prepare.js | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index f19e06ef..5b926bd6 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -109,6 +109,14 @@ } } + function filamentSourceSave() { + const sel = UI.filamentSource.options[UI.filamentSource.selectedIndex]; + if (sel) { + settings().device.filamentSource = sel.value; + API.conf.save(); + } + } + function detailSave() { let level = UI.detail.options[UI.detail.selectedIndex]; if (level) { @@ -745,6 +753,7 @@ UI.deviceRound.checked = dev.bedRound; UI.deviceOrigin.checked = dev.outputOriginCenter || dev.originCenter || dev.bedRound; UI.fwRetract.checked = dev.fwRetract; + if (!dev.filamentSource) UI.filamentSource.selectedIndex = 0; // add extruder selection buttons if (dev.extruders) { @@ -791,6 +800,7 @@ UI.deviceRound, UI.deviceBelt, UI.fwRetract, + UI.filamentSource, UI.deviceZMax, UI.gcodeFan, UI.gcodeTrack, @@ -1619,7 +1629,7 @@ spindleMax: UC.newInput(LANG.dv_spmx_s, {title:LANG.dv_spmx_l, convert:UC.toInt, size: 6, modes:CAM}), deviceZMax: UC.newInput(LANG.dv_zmax_s, {title:LANG.dv_zmax_l, convert:UC.toInt, size: 6, modes:FDM}), fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}), - filamentSource: UC.newSelect(LANG.dv_fsrc_s, {title: LANG.dv_fsrc_l, action: lineTypeSave, modes:FDM}, "filasrc"), + filamentSource: UC.newSelect(LANG.dv_fsrc_s, {title: LANG.dv_fsrc_l, action: filamentSourceSave, modes:FDM}, "filasrc"), fwRetract: UC.newBoolean(LANG.dv_retr_s, onBooleanClick, {title:LANG.dv_retr_l, modes:FDM}), deviceOrigin: UC.newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:FDM_LASER, show:() => !UI.deviceRound.checked}), deviceRound: UC.newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, modes:FDM, trigger:true, show:isNotBelt}), diff --git a/src/mode/fdm/export.js b/src/mode/fdm/export.js index b4f3b45f..0376a028 100644 --- a/src/mode/fdm/export.js +++ b/src/mode/fdm/export.js @@ -119,7 +119,8 @@ icos = 1 / bcos, inloops = 0, arcQ = [], - minz = { x: Infinity, y: Infinity, z: Infinity }; + minz = { x: Infinity, y: Infinity, z: Infinity }, + isPalette = device.filamentSource === 'palette3'; // smallish band-aid. refactor above to remove redundancy function updateParams(layer) { diff --git a/src/mode/fdm/prepare.js b/src/mode/fdm/prepare.js index 1572762a..c3063362 100644 --- a/src/mode/fdm/prepare.js +++ b/src/mode/fdm/prepare.js @@ -34,6 +34,7 @@ isThin = controller.lineType === "line", isFlat = controller.lineType === "flat", isDanger = controller.danger || false, + isPalette = device.filamentSource === 'palette3', firstLayerHeight = isBelt ? process.sliceHeight : process.firstSliceHeight || process.sliceHeight, firstLayerSeek = process.outputSeekrate, firstLayerRate = process.firstLayerRate,