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

change from short factor to min speed

Browse source
This commit is contained in:
Stewart Allen 2019-05-04 09:56:21 -04:00
commit 6246f34e7a
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/kiri-print.js
View file

@ -426,11 +426,10 @@ var gs_kiri_print = exports;
var options = options || {},
process = this.settings.process,
shortDist = process.outputShortDistance,
shortFact = process.outputShortFactor,
shellMult = options.extrude || process.outputShellMult,
printSpeed = options.rate || process.outputFeedrate,
shortSpeed = printSpeed * shortFact,
moveSpeed = process.outputSeekrate,
minSpeed = process.outputMinSpeed,
closest = poly.findClosestPointTo(startPoint),
perimeter = poly.perimeter(),
first = true,
@ -440,7 +439,7 @@ var gs_kiri_print = exports;
// if short, use calculated print speed based on sliding scale
if (perimeter < process.outputShortPoly) {
printSpeed = shortSpeed + (printSpeed - shortSpeed) * (perimeter / process.outputShortPoly);
printSpeed = minSpeed + (printSpeed - minSpeed) * (perimeter / process.outputShortPoly);
}
poly.forEachPoint(function(point, pos, points, count) {

10
js/kiri.js
View file

@ -95,7 +95,7 @@ self.kiri.license = exports.LICENSE;
outputBrimCount: 1,
outputBrimOffset: 1,
outputShortPoly: 1,
outputShortFactor: 1,
outputMinSpeed: 1,
outputCoastDist: 1,
outputWipeDistance: 1,
sliceMinHeight: 1,
@ -317,8 +317,8 @@ self.kiri.license = exports.LICENSE;
outputRetractDwell: 30,
outputBrimCount: 2,
outputBrimOffset: 2,
outputShortPoly: 30.0,
outputShortFactor: 0.2,
outputShortPoly: 50.0,
outputMinSpeed: 15.0,
outputCoastDist: 0,
outputWipeDistance: 0,
sliceMinHeight: 0,
@ -2607,13 +2607,13 @@ self.kiri.license = exports.LICENSE;
outputRetractDist: UC.newInput("retract dist", {title:"amount to retract filament\nfor long moves. in millimeters", convert:UC.toFloat, modes:FDM}),
outputRetractSpeed: UC.newInput("retract rate", {title:"speed of filament\nretraction in mm/s", convert:UC.toInt, modes:FDM}),
outputRetractDwell: UC.newInput("engage dwell", {title:"time between re-engaging\nfilament and movement\nin milliseconds", convert:UC.toInt, modes:FDM}),
outputShortPoly: UC.newInput("short outline", {title:"poly perimeter length\ntriggers short slowdown\nin millimeters", bound:UC.bound(0,200), convert:UC.toFloat, modes:FDM}),
outputShortFactor: UC.newInput("short factor", {title:"max speed reduction factor\nfor short segments\nas % of print speed", bound:UC.bound(0.05,1), convert:UC.toFloat, modes:FDM}),
sliceShellSpacing: UC.newInput("shell spacing", {title:"as a percentage of nozzle width\n< 1.0 causes shell overlap\nrecommended 0.85 - 1.0", convert:UC.toFloat, bound:UC.bound(0.5,1.0), modes:FDM}),
outputCoastDist: UC.newInput("shell coast", {title:"non-printing end\nof perimeter shells\nin millimeters", bound:UC.bound(0.0,10), convert:UC.toFloat, modes:FDM}),
// outputWipeDistance: UC.newInput("wipe", {title:"non-printing move at\close of polygon\nin millimeters", bound:UC.bound(0.0,10), convert:UC.toFloat, modes:FDM}),
sliceSolidMinArea: UC.newInput("min solid", {title:"minimum area (mm^2)\nrequired to keep solid\nmust be > 0.1", convert:UC.toFloat, modes:FDM}),
sliceMinHeight: UC.newInput("min layer", {title: "enables adaptive slicing with\nthis as the min layer height\nin millimeters\n0 to disable", bound:UC.bound(0,3.0), convert:UC.toFloat, modes:FDM}),
outputMinSpeed: UC.newInput("min speed", {title:"minimum speed\nfor short segments", bound:UC.bound(5,200), convert:UC.toFloat, modes:FDM}),
outputShortPoly: UC.newInput("slow poly", {title:"polygons shorter than this\nwill have their print speed\nscaled down to min speed\nin millimeters", bound:UC.bound(0,200), convert:UC.toFloat, modes:FDM}),
zHopDistance: UC.newInput("z hop dist", {title: "amount to raise z\non retraction moves\nin millimeters\n0 to disable", bound:UC.bound(0,3.0), convert:UC.toFloat, modes:FDM}),
antiBacklash: UC.newInput("anti-backlash", {title: "use micro-movements to cancel\nbacklash during fills\nin millimeters", bound:UC.bound(0,3), convert:UC.toInt, modes:FDM}),
//detectThinWalls: UC.newBoolean("thin wall fill", onBooleanClick, {title: "detect and fill thin openings\nbetween shells walls", modes:FDM})