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

use G0 for moves. fix double slice on direct-prepare. thin wall improvements

Browse source
This commit is contained in:
Stewart Allen 2018-01-16 09:19:01 -05:00
commit b8c1e7dd67
4 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -468,6 +468,7 @@ var gs_kiri_fdm = exports;
function dwell(ms) {
append("G4 P" + ms);
time += timeDwell;
}
function retract() {
@ -480,7 +481,7 @@ var gs_kiri_fdm = exports;
if (comment) {
append(" ; " + comment);
}
var o = ['G1'];
var o = [!rate && !newpos.e ? 'G0' : 'G1'];
if (typeof newpos.x === 'number') {
pos.x = UTIL.round(newpos.x,decimals);
o.append(" X").append(pos.x.toFixed(decimals));
@ -579,7 +580,6 @@ var gs_kiri_fdm = exports;
time += (retDist / retSpeed) * 60 * 2; // retraction time
if (retDwell) {
dwell(retDwell);
time += timeDwell;
}
}
@ -588,7 +588,7 @@ var gs_kiri_fdm = exports;
moveTo({x:x, y:y, e:emitMM}, speedMMM);
emitted += emitMM;
} else {
moveTo({x:x, y:y}, speedMMM);
moveTo({x:x, y:y}, seekMMM);
}
// retract filament
@ -596,7 +596,7 @@ var gs_kiri_fdm = exports;
retract();
}
// update time and distance
// update time and distance (should calc in moveTo() instead)
time += (dist / speedMMM) * 60;
distance += dist;
progress = Math.round((distance / totaldistance) * 100);