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

move comments to their own lines. disable accel/decel test

Browse source
This commit is contained in:
Stewart Allen 2017-12-14 11:02:56 -05:00
commit edfd5acabb
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -351,6 +351,9 @@ var gs_kiri_fdm = exports;
}
function moveTo(newpos, rate, comment) {
if (comment) {
append(" ; " + comment);
}
var o = ['G1'];
if (typeof newpos.x === 'number') {
pos.x = UTIL.round(newpos.x,decimals);
@ -377,9 +380,6 @@ var gs_kiri_fdm = exports;
o.append(" F").append(Math.round(rate));
pos.f = rate
}
if (comment) {
o.append(" ; ").append(comment);
}
var line = o.join('');
if (last == line) {
// console.log({dup:line});
@ -445,14 +445,13 @@ var gs_kiri_fdm = exports;
moveTo({x:x, y:y, e:emitMM}, speedMMM);
emitted += emitMM;
} else {
if (!retracted && out.retract) {
retracted = retDist;
moveTo({e:-retracted}, retSpeed, "retract (ooze control)");
moveTo({x:x, y:y}, speedMMM);
time += (retDist / retSpeed) * 60 * 2; // retraction time
} else {
moveTo({x:x, y:y}, speedMMM);
}
moveTo({x:x, y:y}, speedMMM);
}
if (!retracted && out.retract) {
retracted = retDist;
moveTo({e:-retracted}, retSpeed, "retract (ooze control)");
time += (retDist / retSpeed) * 60 * 2; // retraction time
}
// update time and distance

23
js/kiri-print.js
View file

@ -18,6 +18,7 @@ var gs_kiri_print = exports;
DBUG = BASE.debug,
POLY = BASE.polygons,
SQRT = Math.sqrt,
SQR = UTIL.sqr,
PI = Math.PI,
PRO = Print.prototype,
Polygon = BASE.Polygon,
@ -429,13 +430,13 @@ var gs_kiri_print = exports;
if (options.shorten && dist > options.shorten && count === points.length) {
point = last.offsetPointFrom(point, options.shorten);
}
if (options.accel && dist >= options.accel) {
var p2 = last.offsetPointTo(point, shortDist),
p3 = last.offsetPointFrom(point, shortDist);
segmentOutput(output, last, p2, shortSpeed, printSpeed, 5, shellMult);
addOutput(output, p3, shellMult, printSpeed);
segmentOutput(output, p3, point, printSpeed, shortSpeed, 5, shellMult);
} else
// if (options.accel && dist >= options.accel) {
// var p2 = last.offsetPointTo(point, shortDist),
// p3 = last.offsetPointFrom(point, shortDist);
// segmentOutput(output, last, p2, shortSpeed, printSpeed, 5, shellMult);
// addOutput(output, p3, shellMult, printSpeed);
// segmentOutput(output, p3, point, printSpeed, shortSpeed, 5, shellMult);
// } else
if (shortDist && dist < shortDist) {
var shortRate = shortSpeed + (printSpeed - shortSpeed) * (dist / shortDist);
addOutput(output, point, shellMult, shortRate);
@ -960,15 +961,15 @@ var gs_kiri_print = exports;
}
/**
* calculate mm of filament required for a given extrusion length and layer height.
*
* @param noz nozzle diameter
* @param fil filament diameter
* @param slice height in mm
* @returns filament extruded per mm
* @returns mm of filament extruded per mm of length on the layer
*/
function extrudePerMM(noz, fil, slice) {
return ((PI * UTIL.sqr(noz/2)) /
(PI * UTIL.sqr(fil/2))) *
(slice / noz);
return ((PI * SQR(noz/2)) / (PI * SQR(fil/2))) * (slice / noz);
}
function constOp(tok, consts, opch, op) {