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

fix constatns and feedrate factor conversion

Browse source
This commit is contained in:
Stewart Allen 2020-11-04 16:11:45 -05:00
commit 1cc670a70d
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/mode/cam/driver.js
View file

@ -894,12 +894,12 @@
} }
} }
slice.tops[0].traces = offset;
slice.index = sliceIndex++;
if (addTabsOutline && slice.z <= zMin + tabHeight) { if (addTabsOutline && slice.z <= zMin + tabHeight) {
addCutoutTabs(slice, outlineToolDiam, tabWidth, proc.camTabsCount, proc.camTabsAngle); addCutoutTabs(slice, outlineToolDiam, tabWidth, proc.camTabsCount, proc.camTabsAngle);
} }
slice.tops[0].traces = offset;
slice.index = sliceIndex++;
}); });
sliceAll.appendAll(slices); sliceAll.appendAll(slices);
} }
@ -1688,6 +1688,10 @@
} }
if (line.indexOf('G20') === 0) { if (line.indexOf('G20') === 0) {
factor = 1/25.4; factor = 1/25.4;
consts.top = (offset ? dev.bedDepth : dev.bedDepth/2) * factor;
consts.left = (offset ? 0 : -dev.bedWidth/2) * factor;
consts.right = (offset ? dev.bedWidth : dev.bedWidth/2) * factor;
consts.bottom = (offset ? 0 : -dev.bedDepth/2) * factor;
} else if (line.indexOf('G21') === 0) { } else if (line.indexOf('G21') === 0) {
factor = 1; factor = 1;
} }
@ -1796,7 +1800,7 @@
} }
if (feed && feed !== pos.f) { if (feed && feed !== pos.f) {
pos.f = feed; pos.f = feed;
nl.append(space).append("F").append(feed); nl.append(space).append("F").append(feed * factor);
} }
// update time calculation // update time calculation