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

add separate first layer fill speed

Browse source
This commit is contained in:
Stewart Allen 2018-01-18 21:53:46 -05:00
commit e695cd658c
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/kiri-print.js
View file

@ -491,7 +491,10 @@ var gs_kiri_print = exports;
sparseMult = process.outputSparseMult, sparseMult = process.outputSparseMult,
finishFactor = process.outputFinishFactor || 0, finishFactor = process.outputFinishFactor || 0,
finishSpeed = opt.speed || process.outputFinishrate, finishSpeed = opt.speed || process.outputFinishrate,
printSpeed = opt.speed || (firstLayer ? process.firstLayerRate : process.outputFeedrate), firstShellSpeed = process.firstLayerRate,
firstFillSpeed = process.firstLayerFillRate,
printSpeed = opt.speed || (firstLayer ? firstShellSpeed : process.outputFeedrate),
fillSpeed = opt.speed || opt.fillSpeed || (firstLayer ? firstFillSpeed || firstShellSpeed : process.outputFeedrate),
moveSpeed = process.outputSeekrate, moveSpeed = process.outputSeekrate,
outerFirst = process.outputOuterFirst, outerFirst = process.outputOuterFirst,
origin = startPoint.add(offset), origin = startPoint.add(offset),
@ -594,7 +597,7 @@ var gs_kiri_print = exports;
// to avoid shaking the printer to death. // to avoid shaking the printer to death.
if (find.d <= thinWall && len <= thinWall) { if (find.d <= thinWall && len <= thinWall) {
p2 = p1.midPointTo(p2); p2 = p1.midPointTo(p2);
addOutput(preout, p2, fillMult * (find.d / thinWall), printSpeed); addOutput(preout, p2, fillMult * (find.d / thinWall), fillSpeed);
lastout = 1; lastout = 1;
} else { } else {
// retract if dist trigger and crosses a slice top polygon // retract if dist trigger and crosses a slice top polygon
@ -604,12 +607,12 @@ var gs_kiri_print = exports;
// bridge ends of fill when they're close together // bridge ends of fill when they're close together
if (dist < thinWall) { if (dist < thinWall) {
addOutput(preout, p1, fillMult, printSpeed); addOutput(preout, p1, fillMult, fillSpeed);
} else { } else {
addOutput(preout, p1, 0, moveSpeed); addOutput(preout, p1, 0, moveSpeed);
} }
addOutput(preout, p2, fillMult, printSpeed); addOutput(preout, p2, fillMult, fillSpeed);
lastout = 2; lastout = 2;
} }

5
js/kiri.js
View file

@ -73,6 +73,7 @@ self.kiri.license = exports.LICENSE;
sliceVase: 1, sliceVase: 1,
firstSliceHeight: 1, firstSliceHeight: 1,
firstLayerRate: 1, firstLayerRate: 1,
firstLayerFillRate: 1,
outputRaft: 1, outputRaft: 1,
outputTemp: 1, outputTemp: 1,
outputFanMax: 1, outputFanMax: 1,
@ -276,6 +277,7 @@ self.kiri.license = exports.LICENSE;
firstSliceHeight: 0.25, firstSliceHeight: 0.25,
firstLayerRate: 30, firstLayerRate: 30,
firstLayerFillRate: 40,
outputRaft: false, outputRaft: false,
outputTemp: 220, outputTemp: 220,
@ -2394,7 +2396,8 @@ self.kiri.license = exports.LICENSE;
firstLayer: UC.newGroup("first layer", null, {modes:FDM}), firstLayer: UC.newGroup("first layer", null, {modes:FDM}),
firstSliceHeight: UC.newInput("slice height", {title:"in millimeters\nshould be >= slice height", convert:UC.toFloat, modes:FDM}), firstSliceHeight: UC.newInput("slice height", {title:"in millimeters\nshould be >= slice height", convert:UC.toFloat, modes:FDM}),
firstLayerRate: UC.newInput("print speed", {title:"print move max speed\nmillimeters / minute", convert:UC.toFloat, modes:FDM}), firstLayerRate: UC.newInput("shell speed", {title:"print move max speed\nmillimeters / minute", convert:UC.toFloat, modes:FDM}),
firstLayerFillRate: UC.newInput("fill speed", {title:"fill move max speed\nmillimeters / minute", convert:UC.toFloat, modes:FDM}),
outputBrimCount: UC.newInput("skirt count", {title:"number of skirts", convert:UC.toInt, modes:FDM}), outputBrimCount: UC.newInput("skirt count", {title:"number of skirts", convert:UC.toInt, modes:FDM}),
outputBrimOffset: UC.newInput("skirt offset", {title:"millimeters", convert:UC.toFloat, modes:FDM}), outputBrimOffset: UC.newInput("skirt offset", {title:"millimeters", convert:UC.toFloat, modes:FDM}),