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 CAM axes gcode scaling header directive

Browse source
This commit is contained in:
Stewart Allen 2022-11-05 19:52:38 -04:00
commit 338b5fc8be
2 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
release.md
View file

@ -4,6 +4,7 @@ Full docs @ https://docs.grid.space/projects/kiri-moto
# Release 3.7 # Release 3.7
* add CAM axes scaling gcode header directive
* add CAM 4th axis indexing support, timeline op, updated visuals * add CAM 4th axis indexing support, timeline op, updated visuals
* align FDM top/bottom layer options with convention * align FDM top/bottom layer options with convention
* add Mesh:Tool SVG import options for extrusion depth and boolean repair * add Mesh:Tool SVG import options for extrusion depth and boolean repair

30
src/kiri-mode/cam/export.js
View file

@ -68,6 +68,11 @@ CAM.export = function(print, online) {
x: -origin.x, x: -origin.x,
y: origin.y y: origin.y
}, },
scale = {
x: 1,
y: 1,
z: 1
},
consts = { consts = {
tool: 0, tool: 0,
tool_name: "unknown", tool_name: "unknown",
@ -319,6 +324,24 @@ CAM.export = function(print, online) {
} }
} }
// look for SCALE header directive
let gcodePre = [];
for (let line of device.gcodePre) {
if (line.indexOf(';; SCALE ') === 0) {
try {
let map = JSON.parse(line.substring(9));
if (map.X > 0) scale.x = map.X;
if (map.Y > 0) scale.y = map.Y;
if (map.Z > 0) scale.z = map.Z;
console.log('scaling axes', scale);
} catch (e) {
console.log('malformed scale directive', line);
}
} else {
gcodePre.push(line);
}
}
// collect tool info to add to header // collect tool info to add to header
let toolz = {}, ctool; let toolz = {}, ctool;
// remap points as necessary for origins, offsets, inversions // remap points as necessary for origins, offsets, inversions
@ -342,6 +365,11 @@ CAM.export = function(print, online) {
point.x += offset.x; point.x += offset.x;
point.y += offset.y; point.y += offset.y;
} }
if (scale) {
point.x *= scale.x;
point.y *= scale.y;
point.z *= scale.z;
}
if (spro.outputInvertX) point.x = -point.x; if (spro.outputInvertX) point.x = -point.x;
if (spro.outputInvertY) point.y = -point.y; if (spro.outputInvertY) point.y = -point.y;
if (spro.camOriginTop) point.z = point.z - zmax; if (spro.camOriginTop) point.z = point.z - zmax;
@ -358,7 +386,7 @@ CAM.export = function(print, online) {
} }
// emit gcode preamble // emit gcode preamble
filterEmit(device.gcodePre, consts); filterEmit(gcodePre, consts);
// emit all points in layer/point order // emit all points in layer/point order
for (let layerout of print.output) { for (let layerout of print.output) {