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

Merge branch 'master' into cam-topo-new

Browse source
This commit is contained in:
Stewart Allen 2023-01-11 22:19:12 -05:00
commit 52610655d0
7 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri-mode/cam/driver.js
View file

@ -88,7 +88,7 @@ kiri.load(api => {
CAM.surface_find = function(widget, faces) {
CAM.surface_prep(widget);
return widget.tool.findConnectedSurface(faces, 0.1, 0.1);
return widget.tool.findConnectedSurface(faces, 0.1, 0.0);
};
kiri.worker.cam_surfaces = function(data, send) {

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

@ -34,6 +34,7 @@ CAM.export = function(print, online) {
output = [],
spindle = 0,
newSpindle = 0,
toolChanges = 0,
spindleMax = device.spindleMax,
origin = settings.origin || { x: 0, y: 0, z: 0 },
space = device.gcodeSpace ? ' ' : '',
@ -188,9 +189,10 @@ CAM.export = function(print, online) {
pos.t = out.tool;
consts.tool = pos.t;
consts.tool_name = toolNameByNumber(out.tool);
if (!laserOp) {
if (!laserOp && (spro.camToolInit || toolChanges > 0)) {
filterEmit(cmdToolChange, { ...consts, spindle: newSpindle } );
}
toolChanges++;
}
// on spindle change (deferred from layer transition so it's post-toolchange)

3
src/kiri/conf.js
View file

@ -508,7 +508,7 @@ const conf = exports({
camTraceBottom: false,
camPocketSpindle: 1000,
camPocketTool: 1000,
camPocketOver: 0.5,
camPocketOver: 0.25,
camPocketDown: 1,
camPocketSpeed: 250,
camPocketPlunge: 200,
@ -582,6 +582,7 @@ const conf = exports({
camTrueShadow: false,
camForceZMax: false,
camFirstZMax: false,
camToolInit: true,
ops: [], // current ops
op2: [] // flip ops
}

1
src/kiri/init.js
View file

@ -1974,6 +1974,7 @@ gapp.register("kiri.init", [], (root, exports) => {
camConventional: uc.newBoolean(LANG.ou_conv_s, onBooleanClick, {title:LANG.ou_conv_l, modes:CAM}),
camEaseDown: uc.newBoolean(LANG.cr_ease_s, onBooleanClick, {title:LANG.cr_ease_l, modes:CAM}),
camDepthFirst: uc.newBoolean(LANG.ou_depf_s, onBooleanClick, {title:LANG.ou_depf_l, modes:CAM}),
camToolInit: uc.newBoolean(LANG.ou_toin_s, onBooleanClick, {title:LANG.ou_toin_l, modes:CAM}),
fdmSep: uc.newBlank({class:"pop-sep", modes:FDM_CAM}),
camFirstZMax: uc.newBoolean(LANG.ou_z1st_s, onBooleanClick, {title:LANG.ou_z1st_l, modes:CAM}),
camForceZMax: uc.newBoolean(LANG.ou_forz_s, onBooleanClick, {title:LANG.ou_forz_l, modes:CAM}),

2
src/mesh/tool.js
View file

@ -226,7 +226,7 @@ mesh.tool = class MeshTool {
// depends on index() being run first
findConnectedSurface(faces, radians, filterZ, found = {}) {
const norms = this.getIndex().faces;
if (filterZ) {
if (filterZ !== undefined) {
// optional filter to z normal >= value
faces = faces.filter(f => norms[f * 6 + 2] >= filterZ);
}