remove 'short segment' setting. clarify tool tips
This commit is contained in:
parent
4b45a31a84
commit
860febb1d0
3 changed files with 4 additions and 14 deletions
|
|
@ -416,7 +416,6 @@ var gs_kiri_fdm = exports;
|
||||||
left: offset ? 0 : -device.bedWidth/2,
|
left: offset ? 0 : -device.bedWidth/2,
|
||||||
right: offset ? device.bedWidth : device.bedWidth/2,
|
right: offset ? device.bedWidth : device.bedWidth/2,
|
||||||
bottom: offset ? 0 : -device.bedDepth/2,
|
bottom: offset ? 0 : -device.bedDepth/2,
|
||||||
kfactor: process.gcodeKFactor || 0,
|
|
||||||
nozzle: process.gcodeNozzle || 0,
|
nozzle: process.gcodeNozzle || 0,
|
||||||
tool: process.gcodeNozzle || 0,
|
tool: process.gcodeNozzle || 0,
|
||||||
z_max: device.maxHeight,
|
z_max: device.maxHeight,
|
||||||
|
|
@ -462,7 +461,7 @@ var gs_kiri_fdm = exports;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
append("; Generated by KIRI:MOTO");
|
append("; Generated by KIRI:MOTO " + exports.VERSION);
|
||||||
append("; "+new Date().toString());
|
append("; "+new Date().toString());
|
||||||
append(constReplace("; Bed left:{left} right:{right} top:{top} bottom:{bottom}", consts));
|
append(constReplace("; Bed left:{left} right:{right} top:{top} bottom:{bottom}", consts));
|
||||||
append("; --- process ---");
|
append("; --- process ---");
|
||||||
|
|
|
||||||
|
|
@ -450,10 +450,7 @@ var gs_kiri_print = exports;
|
||||||
if (options.shorten && dist > options.shorten && count === points.length) {
|
if (options.shorten && dist > options.shorten && count === points.length) {
|
||||||
point = last.offsetPointFrom(point, options.shorten);
|
point = last.offsetPointFrom(point, options.shorten);
|
||||||
}
|
}
|
||||||
if (shortDist && dist < shortDist) {
|
if (isShort) {
|
||||||
var shortRate = shortSpeed + (printSpeed - shortSpeed) * (dist / shortDist);
|
|
||||||
addOutput(output, point, shellMult, shortRate);
|
|
||||||
} else if (isShort) {
|
|
||||||
addOutput(output, point, shellMult, shortSpeed);
|
addOutput(output, point, shellMult, shortSpeed);
|
||||||
} else {
|
} else {
|
||||||
addOutput(output, point, shellMult, printSpeed);
|
addOutput(output, point, shellMult, printSpeed);
|
||||||
|
|
|
||||||
10
js/kiri.js
10
js/kiri.js
|
|
@ -96,7 +96,6 @@ self.kiri.license = exports.LICENSE;
|
||||||
outputBrimCount: 1,
|
outputBrimCount: 1,
|
||||||
outputBrimOffset: 1,
|
outputBrimOffset: 1,
|
||||||
outputShortPoly: 1,
|
outputShortPoly: 1,
|
||||||
outputShortDistance: 1,
|
|
||||||
outputShortFactor: 1,
|
outputShortFactor: 1,
|
||||||
outputFinishFactor: 1,
|
outputFinishFactor: 1,
|
||||||
sliceMinHeight: 1,
|
sliceMinHeight: 1,
|
||||||
|
|
@ -104,7 +103,6 @@ self.kiri.license = exports.LICENSE;
|
||||||
// detectThinWalls: 1,
|
// detectThinWalls: 1,
|
||||||
antiBacklash: 1,
|
antiBacklash: 1,
|
||||||
zHopDistance: 1,
|
zHopDistance: 1,
|
||||||
gcodeKFactor: 1,
|
|
||||||
gcodeNozzle: 1,
|
gcodeNozzle: 1,
|
||||||
gcodePauseLayers: 1,
|
gcodePauseLayers: 1,
|
||||||
outputClockwise: 1,
|
outputClockwise: 1,
|
||||||
|
|
@ -313,14 +311,12 @@ self.kiri.license = exports.LICENSE;
|
||||||
outputBrimCount: 2,
|
outputBrimCount: 2,
|
||||||
outputBrimOffset: 2,
|
outputBrimOffset: 2,
|
||||||
outputShortPoly: 30.0,
|
outputShortPoly: 30.0,
|
||||||
outputShortDistance: 0.0,
|
|
||||||
outputShortFactor: 0.2,
|
outputShortFactor: 0.2,
|
||||||
outputFinishFactor: 0,
|
outputFinishFactor: 0,
|
||||||
sliceMinHeight: 0,
|
sliceMinHeight: 0,
|
||||||
detectThinWalls: false,
|
detectThinWalls: false,
|
||||||
antiBacklash: 1,
|
antiBacklash: 1,
|
||||||
zHopDistance: 0.2,
|
zHopDistance: 0.2,
|
||||||
gcodeKFactor: 0,
|
|
||||||
gcodeNozzle: 0,
|
gcodeNozzle: 0,
|
||||||
gcodePauseLayers: "",
|
gcodePauseLayers: "",
|
||||||
outputCooling: true,
|
outputCooling: true,
|
||||||
|
|
@ -2577,20 +2573,18 @@ self.kiri.license = exports.LICENSE;
|
||||||
outputRaft: UC.newBoolean("enable", onBooleanClick, {title:"create a raft under the\nmodel for better adhesion\nuses skirt offset and\ndisables skirt output", modes:FDM}),
|
outputRaft: UC.newBoolean("enable", onBooleanClick, {title:"create a raft under the\nmodel for better adhesion\nuses skirt offset and\ndisables skirt output", modes:FDM}),
|
||||||
|
|
||||||
advanced: UC.newGroup("advanced", null, {modes:FDM}),
|
advanced: UC.newGroup("advanced", null, {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\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}),
|
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}),
|
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}),
|
outputShortPoly: UC.newInput("short outline", {title:"poly perimeter length\ntriggers short slowdown\nin millimeters", bound:UC.bound(0,200), convert:UC.toFloat, modes:FDM}),
|
||||||
outputShortDistance: UC.newInput("short segment", {title:"segment length cutoff\nfor short segments\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}),
|
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}),
|
||||||
outputFinishFactor: UC.newInput("finish factor", {title:"% of nozzle diameter to\nshorten finish path by\nvalues of 0-1", bound:UC.bound(0.0,1), convert:UC.toFloat, modes:FDM}),
|
outputFinishFactor: UC.newInput("short end", {title:"% of nozzle diameter to\nshorten finish path by\nvalues of 0-1", bound:UC.bound(0.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}),
|
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}),
|
||||||
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}),
|
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}),
|
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})
|
//detectThinWalls: UC.newBoolean("thin wall fill", onBooleanClick, {title: "detect and fill thin openings\nbetween shells walls", modes:FDM})
|
||||||
|
|
||||||
gcodeVars: UC.newGroup("gcode", null, {modes:FDM}),
|
gcodeVars: UC.newGroup("gcode", null, {modes:FDM}),
|
||||||
gcodeKFactor: UC.newInput("k-factor", {title: "aka linear advance\nuse {kfactor} in gcode", convert:UC.toInt, modes:FDM}),
|
|
||||||
gcodeNozzle: UC.newInput("nozzle", {title: "select output nozzle", convert:UC.toInt, modes:FDM}),
|
gcodeNozzle: UC.newInput("nozzle", {title: "select output nozzle", convert:UC.toInt, modes:FDM}),
|
||||||
gcodePauseLayers: UC.newInput("pause layers", {title: "comma-separated list of layers\nto inject pause commands before", modes:FDM})
|
gcodePauseLayers: UC.newInput("pause layers", {title: "comma-separated list of layers\nto inject pause commands before", modes:FDM})
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue