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

re-add retract over

Browse source
This commit is contained in:
Stewart Allen 2017-12-08 20:27:08 -05:00
commit fed0a49256
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/kiri-driver-fdm.js
View file

@ -296,6 +296,7 @@ var gs_kiri_fdm = exports;
shortFact = process.outputShortFactor, shortFact = process.outputShortFactor,
maxPrintMMM = process.outputFeedrate * 60, maxPrintMMM = process.outputFeedrate * 60,
seekMMM = process.outputSeekrate * 60, seekMMM = process.outputSeekrate * 60,
retOver = process.outputRetractOver,
retDist = process.outputRetractDist, retDist = process.outputRetractDist,
retSpeed = process.outputRetractSpeed * 60, retSpeed = process.outputRetractSpeed * 60,
// ratio of nozzle area to filament area times // ratio of nozzle area to filament area times
@ -463,7 +464,7 @@ var gs_kiri_fdm = exports;
if (out.speed) { if (out.speed) {
moveMMM = out.speed * 60; moveMMM = out.speed * 60;
} }
if (out.retract) { if (!retracted && (out.retract || dist >= retOver)) {
retracted = retDist; retracted = retDist;
moveTo({e:-retracted}, retSpeed, "retract (ooze control)"); moveTo({e:-retracted}, retSpeed, "retract (ooze control)");
moveTo({x:x, y:y}, moveMMM); moveTo({x:x, y:y}, moveMMM);

3
js/kiri.js
View file

@ -72,6 +72,7 @@ self.kiri.license = exports.LICENSE;
outputShellMult: 1, outputShellMult: 1,
outputFillMult: 1, outputFillMult: 1,
outputSparseMult: 1, outputSparseMult: 1,
outputRetractOver: 1,
outputRetractDist: 1, outputRetractDist: 1,
outputRetractSpeed: 1, outputRetractSpeed: 1,
outputBrimCount: 1, outputBrimCount: 1,
@ -265,6 +266,7 @@ self.kiri.license = exports.LICENSE;
outputShellMult: 1.0, outputShellMult: 1.0,
outputFillMult: 1.25, outputFillMult: 1.25,
outputSparseMult: 1.5, outputSparseMult: 1.5,
outputRetractOver: 5.0,
outputRetractDist: 0.5, outputRetractDist: 0.5,
outputRetractSpeed: 20, outputRetractSpeed: 20,
outputWipeSpeed: 20, outputWipeSpeed: 20,
@ -2349,6 +2351,7 @@ self.kiri.license = exports.LICENSE;
outputBrimOffset: UC.newInput("skirt offset", {title:"millimeters", convert:UC.toFloat, modes:FDM}), outputBrimOffset: UC.newInput("skirt offset", {title:"millimeters", convert:UC.toFloat, modes:FDM}),
advanced: UC.newGroup("advanced", null, {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}), 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}), 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}), outputWipeSpeed: UC.newInput("wipe speed", {title:"speed while wiping\nnozzle in mm/s", convert:UC.toInt, modes:FDM}),

2
js/license.js
View file

@ -1,7 +1,7 @@
var exports = { var exports = {
COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved", COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved",
LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.", 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 = {}; if (!module) var module = {};
module.exports = exports; module.exports = exports;