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 bug where drill was using G0

Browse source
This commit is contained in:
Stewart Allen 2023-06-20 14:05:07 -04:00
commit 1b0ee2a953
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/kiri-mode/cam/ops.js
View file

@ -1474,7 +1474,6 @@ class OpDrill extends CamOp {
let { op, state } = this; let { op, state } = this;
let { settings, widget, addSlices, updateToolDiams } = state; let { settings, widget, addSlices, updateToolDiams } = state;
let { setTool, setSpindle, setDrill, emitDrills } = ops; let { setTool, setSpindle, setDrill, emitDrills } = ops;
setTool(op.tool, undefined, op.rate); setTool(op.tool, undefined, op.rate);
setDrill(op.down, op.lift, op.dwell); setDrill(op.down, op.lift, op.dwell);
setSpindle(op.spindle); setSpindle(op.spindle);

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

@ -169,8 +169,8 @@ function prepEach(widget, settings, print, firstPoint, update) {
toolDiamMove = toolType === 'endmill' ? toolDiam : tolerance * 2; toolDiamMove = toolType === 'endmill' ? toolDiam : tolerance * 2;
lastTool = toolID; lastTool = toolID;
} }
feedRate = feed || feedRate; feedRate = feed || feedRate || plunge;
plungeRate = Math.min(feedRate, plunge || plungeRate || feedRate); plungeRate = Math.min(feedRate || plunge, plunge || plungeRate || feedRate);
} }
function setLasering(bool, power = 0) { function setLasering(bool, power = 0) {
@ -253,7 +253,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
* @param {number} [tool] tool * @param {number} [tool] tool
*/ */
function layerPush(point, emit, speed, tool) { function layerPush(point, emit, speed, tool) {
const dz = lastPush ? point.z - lastPush.point.z : 0; const dz = (point && lastPush && lastPush.point) ? point.z - lastPush.point.z : 0;
if (dz < 0 && speed > plungeRate) { if (dz < 0 && speed > plungeRate) {
speed = plungeRate; speed = plungeRate;
} }