From 33039d00eadf1ee6374d89fab4dfdf08f5428c8e Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 2 Jan 2021 11:01:19 -0500 Subject: [PATCH] fix plunge rate for registration. update notes --- notes.md | 6 +++++- src/mode/cam/client.js | 4 ++-- src/mode/cam/ops.js | 2 +- web/kiri/engine.html | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/notes.md b/notes.md index 9f5880e0..791f2e5d 100644 --- a/notes.md +++ b/notes.md @@ -49,6 +49,8 @@ # CAM +* `B` need to force cut line at synthetic z bottom (midlines, etc) +* `B` non-clear-voids duplicates thru-holes * `B` z thru doesn't respect step down * `B` failure to go *up* when moving between parts? * `B` starting export during animation unleashes chaos @@ -56,6 +58,7 @@ * `B` outside cutting direction in roughing mode inverted * `B` on rotation, tabs dissociate from parts whose center changes with rotation +* `F` z thru should apply to any thru hole * `F` update analyzer to detect overhangs * `F` add linear clearing strategy option for roughing / pocket * `F` extend acute roughing on inside polys to clear small voids @@ -75,8 +78,9 @@ * `F` warn when part > stock or cuts go outside bed * `F` can animation clear the mesh in areas where the cuts go through the stock? * `F` support lathe mode / A-axis / rotary -* `F` gcode output option as zip for multiple or flip ops +* `F` gcode output option as zip for multiple or flip ops or tool change * `F` ease-down should be engaged in all descending cutting operations +* `F` new reg type based on https://youtu.be/BLD4dFoXC7o?t=360 * `P` common part pre-analyze to speed up 'slice' and improve shadow (overhangs) * `P` redo all path route / planning in prepare to account for terrain before camOut diff --git a/src/mode/cam/client.js b/src/mode/cam/client.js index 61565beb..be353645 100644 --- a/src/mode/cam/client.js +++ b/src/mode/cam/client.js @@ -885,7 +885,7 @@ sep: UC.newBlank({class:"pop-sep"}), spindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, show:hasSpindle}), down: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, units:true}), - rate: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, units:true}), + rate: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, units:true}), dwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat}), lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true}) }; @@ -904,7 +904,7 @@ sep: UC.newBlank({class:"pop-sep"}), spindle: UC.newInput(LANG.cc_spnd_s, {title:LANG.cc_spnd_l, convert:UC.toInt, show:hasSpindle}), down: UC.newInput(LANG.cc_sdwn_s, {title:LANG.cc_sdwn_l, convert:UC.toFloat, units:true}), - rate: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, units:true}), + rate: UC.newInput(LANG.cc_plng_s, {title:LANG.cc_plng_l, convert:UC.toInt, units:true}), dwell: UC.newInput(LANG.cd_dwll_s, {title:LANG.cd_dwll_l, convert:UC.toFloat}), lift: UC.newInput(LANG.cd_lift_s, {title:LANG.cd_lift_l, convert:UC.toFloat, units:true}) }; diff --git a/src/mode/cam/ops.js b/src/mode/cam/ops.js index 56900c7f..8e515dd8 100644 --- a/src/mode/cam/ops.js +++ b/src/mode/cam/ops.js @@ -883,7 +883,7 @@ let { settings, widget, sliceAll, tslices, updateToolDiams } = state; let { setTool, setSpindle, setDrill, emitDrills } = ops; - setTool(op.tool, op.rate, op.down); + setTool(op.tool, undefined, op.rate); setDrill(op.down, op.lift, op.dwell); setSpindle(op.spindle); emitDrills(this.sliceOut.map(slice => slice.camLines).flat()); diff --git a/web/kiri/engine.html b/web/kiri/engine.html index 8a6859fe..956b6000 100644 --- a/web/kiri/engine.html +++ b/web/kiri/engine.html @@ -111,7 +111,7 @@ .then(eng => eng.slice()) .then(eng => eng.prepare()) .then(eng => eng.export()) - .then(display_gcode) + .then(display_gcode); }