From bdfa02d215fdcb8b1d671b09796f3f07eb92deeb Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 13 Feb 2021 20:07:48 -0500 Subject: [PATCH] allow print/bed temp to fall back to first layer settings if they are omitted --- notes.md | 2 -- src/kiri/init.js | 3 --- src/mode/fdm/export.js | 4 ++-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/notes.md b/notes.md index b31136c6..88f0f88a 100644 --- a/notes.md +++ b/notes.md @@ -55,7 +55,6 @@ * `B` multiple parts with one angled against origin "floats" in preview * `B` re-add progress calls for all work units -* `B` disable support layer (top/bottom) offsets in belt mode * `F` arrange should just align down Z. no side to side. # CAM @@ -71,7 +70,6 @@ * `B` climb vs conventional not fully consistent after refactor * `B` outside cutting direction in roughing mode inverted -* `F` add layout spacing preference * `F` import SVG into a path that can be overlaid onto a 3D mesh (laser?) * `F` intelligently turn circle hole pocket clear into spiral down * `F` trace follow hole that matches endmill should turn into a drill op diff --git a/src/kiri/init.js b/src/kiri/init.js index 963f3d1c..865a429d 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -46,7 +46,6 @@ platform = API.platform, selection = API.selection, proto = location.protocol, - root = "grid.space", ver = Date.now().toString(36); let currentDevice = null, @@ -1403,8 +1402,6 @@ function init_one() { API.event.emit('init.one'); - $('gsbox').src = `${proto}//${root}/kiri/gsbox.png?ver=${ver}`; - // ensure we have settings from last session API.conf.restore(); diff --git a/src/mode/fdm/export.js b/src/mode/fdm/export.js index 25ffd644..829b7c70 100644 --- a/src/mode/fdm/export.js +++ b/src/mode/fdm/export.js @@ -101,8 +101,8 @@ retSpeed = process.outputRetractSpeed * 60; // range retDwell = process.outputRetractDwell || 0; // range timeDwell = retDwell / 1000; - nozzleTemp = process.outputTemp; - bedTemp = process.outputBedTemp; + nozzleTemp = process.outputTemp || process.firstLayerNozzleTemp; + bedTemp = process.outputBedTemp || process.firstLayerBedTemp; fanSpeed = process.outputFanSpeed; Object.assign(subst, { temp_bed: bedTemp,