fix feed/plung in lathe. update notes
This commit is contained in:
parent
614c049b2a
commit
50d4193d56
2 changed files with 4 additions and 3 deletions
1
notes.md
1
notes.md
|
|
@ -68,6 +68,7 @@
|
||||||
|
|
||||||
# CAM
|
# CAM
|
||||||
|
|
||||||
|
* `B` rapid moves should be max of terrain zmax and last cut layer height (roughing)
|
||||||
* `B` in indexed stock mode, stock should rotate with indexing
|
* `B` in indexed stock mode, stock should rotate with indexing
|
||||||
* `B` feed rate for next tool set before tool change (push/pop feed rates?)
|
* `B` feed rate for next tool set before tool change (push/pop feed rates?)
|
||||||
* `B` tab cuts cause loss of direction, parenting, depth, and it's hard to fix
|
* `B` tab cuts cause loss of direction, parenting, depth, and it's hard to fix
|
||||||
|
|
|
||||||
|
|
@ -168,7 +168,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
|
||||||
lastTool = toolID;
|
lastTool = toolID;
|
||||||
}
|
}
|
||||||
feedRate = feed || feedRate;
|
feedRate = feed || feedRate;
|
||||||
plungeRate = plunge || plungeRate || feedRate;
|
plungeRate = Math.min(feedRate, plunge || plungeRate || feedRate);
|
||||||
}
|
}
|
||||||
|
|
||||||
function setLasering(bool, power = 0) {
|
function setLasering(bool, power = 0) {
|
||||||
|
|
@ -392,14 +392,14 @@ function prepEach(widget, settings, print, firstPoint, update) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// set new plunge rate
|
// set new plunge rate
|
||||||
if (!lasering && deltaZ < -tolerance) {
|
if (!lasering && deltaZ < -tolerance && currentOp.type !== 'lathe') {
|
||||||
let threshold = Math.min(deltaXY / 2, absDeltaZ),
|
let threshold = Math.min(deltaXY / 2, absDeltaZ),
|
||||||
modifier = threshold / absDeltaZ;
|
modifier = threshold / absDeltaZ;
|
||||||
if (synthPlunge && threshold && modifier && deltaXY > tolerance) {
|
if (synthPlunge && threshold && modifier && deltaXY > tolerance) {
|
||||||
// use modifier to speed up long XY move plunge rates
|
// use modifier to speed up long XY move plunge rates
|
||||||
rate = Math.round(plungeRate + ((feedRate - plungeRate) * modifier));
|
rate = Math.round(plungeRate + ((feedRate - plungeRate) * modifier));
|
||||||
} else {
|
} else {
|
||||||
rate = plungeRate;
|
rate = Math.min(feedRate, plungeRate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue