diff --git a/js/kiri-driver-fdm.js b/js/kiri-driver-fdm.js index 783f1d82..6a2b2cbe 100644 --- a/js/kiri-driver-fdm.js +++ b/js/kiri-driver-fdm.js @@ -296,6 +296,7 @@ var gs_kiri_fdm = exports; shortFact = process.outputShortFactor, maxPrintMMM = process.outputFeedrate * 60, seekMMM = process.outputSeekrate * 60, + retOver = process.outputRetractOver, retDist = process.outputRetractDist, retSpeed = process.outputRetractSpeed * 60, // ratio of nozzle area to filament area times @@ -463,7 +464,7 @@ var gs_kiri_fdm = exports; if (out.speed) { moveMMM = out.speed * 60; } - if (out.retract) { + if (!retracted && (out.retract || dist >= retOver)) { retracted = retDist; moveTo({e:-retracted}, retSpeed, "retract (ooze control)"); moveTo({x:x, y:y}, moveMMM); diff --git a/js/kiri.js b/js/kiri.js index 0261fbda..dd950bc5 100644 --- a/js/kiri.js +++ b/js/kiri.js @@ -72,6 +72,7 @@ self.kiri.license = exports.LICENSE; outputShellMult: 1, outputFillMult: 1, outputSparseMult: 1, + outputRetractOver: 1, outputRetractDist: 1, outputRetractSpeed: 1, outputBrimCount: 1, @@ -265,6 +266,7 @@ self.kiri.license = exports.LICENSE; outputShellMult: 1.0, outputFillMult: 1.25, outputSparseMult: 1.5, + outputRetractOver: 5.0, outputRetractDist: 0.5, outputRetractSpeed: 20, outputWipeSpeed: 20, @@ -2349,6 +2351,7 @@ self.kiri.license = exports.LICENSE; outputBrimOffset: UC.newInput("skirt offset", {title:"millimeters", convert:UC.toFloat, modes:FDM}), advanced: UC.newGroup("advanced", null, {modes:FDM}), + outputRetractOver: UC.newInput("retract over", {title:"move threshold that\ntriggers retraction\n0 to disable", convert:UC.toFloat, modes:FDM}), outputRetractDist: UC.newInput("retract dist", {title:"amount to retract filament", convert:UC.toFloat, modes:FDM}), outputRetractSpeed: UC.newInput("retract rate", {title:"speed of filament\nretraction in mm/s", convert:UC.toInt, modes:FDM}), outputWipeSpeed: UC.newInput("wipe speed", {title:"speed while wiping\nnozzle in mm/s", convert:UC.toInt, modes:FDM}), diff --git a/js/license.js b/js/license.js index 24e9081a..af635b4f 100644 --- a/js/license.js +++ b/js/license.js @@ -1,7 +1,7 @@ var exports = { COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen - All Rights Reserved", LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.", - VERSION:"1.0.70" + VERSION:"1.0.71" }; if (!module) var module = {}; module.exports = exports;