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 relative support to gcode parsing

Browse source
This commit is contained in:
Stewart Allen 2020-11-11 16:33:56 -05:00
commit ef32999dfc
3 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/kiri/print.js
View file

@ -168,11 +168,14 @@
lines.forEach(function(line) {
if (line.indexOf('- LAYER ') > 0) {
seq.height = defh;
const hd = line.replace('(','').replace(')','').split(' ');
defh = parseFloat(hd[4]);
if (fdm) dz = -defh / 2;
}
line = line.split(";")[0].split(" ");
line = line.split(";")[0].split(" ").filter(v => v);
let cmd = line.shift();
if (!cmd) return;
if (cmd.charAt(0) === 'T') {
let ext = scope.settings.device.extruders;
let pos = parseInt(cmd.charAt(1));
@ -201,10 +204,21 @@
G0G1(true);
break;
case 'G1':
const mov = {};
line.forEach(function(tok) {
pos[tok.charAt(0)] = parseFloat(tok.substring(1));
if (abs) {
pos[tok.charAt(0)] = parseFloat(tok.substring(1));
} else {
mov[tok.charAt(0)] = parseFloat(tok.substring(1));
}
});
G0G1(fdm ? pos.E == 0 : false);
if (!abs) {
for (let [k,v] of Object.entries(mov)) {
console.log(k, v, line);
pos[k] += v;
}
}
G0G1(fdm ? pos.E <= 0 : false);
break;
case 'M6':
break;