diff --git a/release.md b/release.md index 6eceff87..274d92fc 100644 --- a/release.md +++ b/release.md @@ -2,14 +2,14 @@ Full docs @ https://docs.grid.space/projects/kiri-moto -# Release 3.4 (tbd) +# Release 3.4 (in progress) ## `C` complete, `P` partial, `-` todo ## Kiri:moto * `-` refactor cnc to use new core slicer engine -* `-` improved vertex replacement and widget update matrix tracking +* `-` improve vertex replacement and widget update matrix tracking ## Mesh:Tool diff --git a/src/kiri-mode/fdm/export.js b/src/kiri-mode/fdm/export.js index 92eab23c..ae45f554 100644 --- a/src/kiri-mode/fdm/export.js +++ b/src/kiri-mode/fdm/export.js @@ -132,8 +132,8 @@ FDM.export = function(print, online, ondone, ondebug) { subst.tool_count = tools_used.length; // smallish band-aid. refactor above to remove redundancy - function updateParams(layer) { - let params = getRangeParameters(process, layer); + function updateParams(layer, params) { + // let params = getRangeParameters(process, layer); zhop = params.zHopDistance || 0; // range retDist = params.outputRetractDist || 0; // range retSpeed = params.outputRetractSpeed * 60 || 1; // range @@ -499,10 +499,9 @@ FDM.export = function(print, online, ondone, ondebug) { while (layer < layers.length) { path = layers[layer]; layerno = path.slice.index; - // range overrides if (path.layer >= 0) { - updateParams(path.layer); + updateParams(path.layer, path.params); } emitPerMM = print.extrudePerMM( diff --git a/src/kiri-mode/fdm/prepare.js b/src/kiri-mode/fdm/prepare.js index b6d02f1b..3310c60d 100644 --- a/src/kiri-mode/fdm/prepare.js +++ b/src/kiri-mode/fdm/prepare.js @@ -539,6 +539,7 @@ FDM.prepare = function(widgets, settings, update) { layerout.z = z + slice.height / 2; layerout.height = layerout.height || slice.height; layerout.slice = slice; + layerout.params = params; // mark layer as anchor if slice is belt and flag set layerout.anchor = slice.belt && slice.belt.anchor; // detect extruder change and print purge block