fix rapid plunge in Z
This commit is contained in:
parent
a205e9710d
commit
998603efe2
1 changed files with 10 additions and 8 deletions
|
|
@ -257,17 +257,18 @@ export function cam_export(print, online) {
|
||||||
points--;
|
points--;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let gn;
|
|
||||||
if (out.emit >= 0 && out.emit <= 3) gn = `G${out.emit}`;
|
let dx = opt.dx || newpos.x - pos.x,
|
||||||
let speed = out.speed,
|
|
||||||
arc = out.emit == 2 || out.emit == 3,
|
|
||||||
center = out.center,
|
|
||||||
nl = (compact_output && lastGn === gn) ? [] : [gn],
|
|
||||||
dx = opt.dx || newpos.x - pos.x,
|
|
||||||
dy = opt.dy || newpos.y - pos.y,
|
dy = opt.dy || newpos.y - pos.y,
|
||||||
dz = opt.dz || newpos.z - pos.z,
|
dz = opt.dz || newpos.z - pos.z,
|
||||||
da = newpos.a != pos.a,
|
da = newpos.a != pos.a,
|
||||||
maxf = dz ? maxZd : maxXYd,
|
gv = (dz >= 0 && out.emit >= 0 && out.emit <= 3) ? out.emit : 1,
|
||||||
|
gn = `G${gv}`,
|
||||||
|
speed = out.speed,
|
||||||
|
arc = out.emit == 2 || out.emit == 3,
|
||||||
|
center = out.center,
|
||||||
|
nl = (compact_output && lastGn === gn) ? [] : [gn],
|
||||||
|
maxf = dz < 0 ? maxZd : maxXYd,
|
||||||
feed = Math.min(speed || maxf, maxf),
|
feed = Math.min(speed || maxf, maxf),
|
||||||
dist = Math.sqrt(dx * dx + dy * dy + dz * dz),
|
dist = Math.sqrt(dx * dx + dy * dy + dz * dz),
|
||||||
newFeed = feed && feed !== pos.f;
|
newFeed = feed && feed !== pos.f;
|
||||||
|
|
@ -357,6 +358,7 @@ export function cam_export(print, online) {
|
||||||
// }
|
// }
|
||||||
append(nl.join(''));
|
append(nl.join(''));
|
||||||
points++;
|
points++;
|
||||||
|
if (dz < 0) console.log(nl);
|
||||||
}
|
}
|
||||||
|
|
||||||
// look for SCALE header directive
|
// look for SCALE header directive
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue