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

temporary workaround for lack of 'rest' machining state. addresses issue #221

Browse source
This commit is contained in:
Stewart Allen 2022-10-01 11:38:57 -04:00
commit 3b7f1e298e
4 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri-mode/cam/prepare.js
View file

@ -71,6 +71,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
startCenter = process.outputOriginCenter, startCenter = process.outputOriginCenter,
alignTop = settings.controller.alignTop, alignTop = settings.controller.alignTop,
zclear = (process.camZClearance || 1), zclear = (process.camZClearance || 1),
zmax_force = process.camForceZMax || false,
zmax_outer = hasStock ? stock.z + zclear : outerz + zclear, zmax_outer = hasStock ? stock.z + zclear : outerz + zclear,
wztop = widget.track.top, wztop = widget.track.top,
ztOff = hasStock ? stock.z - wztop : 0, ztOff = hasStock ? stock.z - wztop : 0,
@ -305,6 +306,9 @@ function prepEach(widget, settings, print, firstPoint, update) {
), ),
mustGoUp = Math.max(maxz - point.z, maxz - lastPoint.z) >= tolerance, mustGoUp = Math.max(maxz - point.z, maxz - lastPoint.z) >= tolerance,
clearz = maxz; clearz = maxz;
if (zmax_force) {
clearz = maxz = zmax + zadd;
}
// up if any point between higher than start/outline, go up first // up if any point between higher than start/outline, go up first
if (mustGoUp) { if (mustGoUp) {
layerPush(lastPoint.clone().setZ(clearz + ztOff), 0, 0, tool.getNumber()); layerPush(lastPoint.clone().setZ(clearz + ztOff), 0, 0, tool.getNumber());

1
src/kiri/conf.js
View file

@ -546,6 +546,7 @@ const conf = exports({
outputInvertY: false, outputInvertY: false,
camExpertFast: false, camExpertFast: false,
camTrueShadow: false, camTrueShadow: false,
camForceZMax: false,
ops: [], // current ops ops: [], // current ops
op2: [] // flip ops op2: [] // flip ops
} }

1
src/kiri/init.js
View file

@ -1952,6 +1952,7 @@ gapp.register("kiri.init", [], (root, exports) => {
outputOriginBounds: uc.newBoolean(LANG.or_bnds_s, onBooleanClick, {title:LANG.or_bnds_l, modes:LASER}), outputOriginBounds: uc.newBoolean(LANG.or_bnds_s, onBooleanClick, {title:LANG.or_bnds_l, modes:LASER}),
outputOriginCenter: uc.newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l, modes:CAM_LZR}), outputOriginCenter: uc.newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l, modes:CAM_LZR}),
camOriginTop: uc.newBoolean(LANG.or_topp_s, onBooleanClick, {title:LANG.or_topp_l, modes:CAM}), camOriginTop: uc.newBoolean(LANG.or_topp_s, onBooleanClick, {title:LANG.or_topp_l, modes:CAM}),
camForceZMax: uc.newBoolean(LANG.ou_forz_s, onBooleanClick, {title:LANG.ou_forz_l, modes:CAM}),
camExpert: uc.newGroup(LANG.op_xprt_s, null, {group: "cam_expert", modes:CAM, marker: false}), camExpert: uc.newGroup(LANG.op_xprt_s, null, {group: "cam_expert", modes:CAM, marker: false}),
camExpertFast: uc.newBoolean(LANG.cx_fast_s, onBooleanClick, {title:LANG.cx_fast_l, modes:CAM, show: () => !ui.camTrueShadow.checked }), camExpertFast: uc.newBoolean(LANG.cx_fast_s, onBooleanClick, {title:LANG.cx_fast_l, modes:CAM, show: () => !ui.camTrueShadow.checked }),

2
web/kiri/lang/en.js
View file

@ -614,6 +614,8 @@ self.kiri.lang['en-us'] = {
ou_conv_l: ["milling direction","uncheck for 'climb'"], ou_conv_l: ["milling direction","uncheck for 'climb'"],
ou_depf_s: "depth first", ou_depf_s: "depth first",
ou_depf_l: ["optimize pocket cuts","with depth priority"], ou_depf_l: ["optimize pocket cuts","with depth priority"],
ou_forz_s: "force z max",
ou_forz_l: "all moves between pockets will go to z max (above stock). this is usually required if you are not performing a roughing operation before pocketing operations.",
// CAM STOCK // CAM STOCK
cs_menu: "stock", cs_menu: "stock",