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