add pos_x, pos_y, pos_z, feed to macro vars

This commit is contained in:
Stewart Allen 2023-12-19 11:40:20 -05:00
commit e4b10623bb

View file

@ -258,27 +258,27 @@ CAM.export = function(print, online) {
pos.x = newpos.x; pos.x = newpos.x;
runbox.min.x = Math.min(runbox.min.x, pos.x); runbox.min.x = Math.min(runbox.min.x, pos.x);
runbox.max.x = Math.max(runbox.max.x, pos.x); runbox.max.x = Math.max(runbox.max.x, pos.x);
nl.append(space).append("X").append(add0(pos.x * factor)); nl.append(space).append("X").append(add0(consts.pos_x = pos.x * factor));
} }
if (dy || newpos.y !== pos.y) { if (dy || newpos.y !== pos.y) {
pos.y = newpos.y; pos.y = newpos.y;
runbox.min.y = Math.min(runbox.min.y, pos.y); runbox.min.y = Math.min(runbox.min.y, pos.y);
runbox.max.y = Math.max(runbox.max.y, pos.y); runbox.max.y = Math.max(runbox.max.y, pos.y);
nl.append(space).append("Y").append(add0(pos.y * factor)); nl.append(space).append("Y").append(add0(consts.pos_y = pos.y * factor));
} }
if (dz || newpos.z !== pos.z) { if (dz || newpos.z !== pos.z) {
pos.z = newpos.z; pos.z = newpos.z;
runbox.min.z = Math.min(runbox.min.z, pos.z); runbox.min.z = Math.min(runbox.min.z, pos.z);
runbox.max.z = Math.max(runbox.max.z, pos.z); runbox.max.z = Math.max(runbox.max.z, pos.z);
nl.append(space).append("Z").append(add0(pos.z * factor)); nl.append(space).append("Z").append(add0(consts.pos_z = pos.z * factor));
} }
if (da) { if (da) {
pos.a = newpos.a; pos.a = newpos.a;
nl.append(space).append("A").append(add0(pos.a * factor)); nl.append(space).append("A").append(add0(consts.pos_a = pos.a * factor));
} }
if (newFeed) { if (newFeed) {
pos.f = feed; pos.f = feed;
nl.append(space).append("F").append(add0(feed * factor, true)); nl.append(space).append("F").append(add0(consts.feed = feed * factor, true));
} }
// temp hack to support RML1 dialect from a file extensions trigger // temp hack to support RML1 dialect from a file extensions trigger