diff --git a/notes.md b/notes.md index 5e6e8912..6602e0ea 100644 --- a/notes.md +++ b/notes.md @@ -34,6 +34,7 @@ * `B` multi-extruder rendering of raft fails to offset the rest of the print * `B` multi-extruder purge blocks fail to generate properly for rafts +* `F` add 'random' and 'seam' start point options * `F` convert ranges to z offsets while continuing to show layer # * `F` support pillar top/bottom should conform to part * `F` more explicit line width control with ranges and min/max adaptive diff --git a/src/kiri-mode/cam/client.js b/src/kiri-mode/cam/client.js index 172c58b2..563373d3 100644 --- a/src/kiri-mode/cam/client.js +++ b/src/kiri-mode/cam/client.js @@ -1315,8 +1315,11 @@ CAM.init = function(kiri, api) { createPopOp('index', { degrees: 'camIndexAxis', + absolute: 'camIndexAbs' }).inputs = { - degrees: UC.newInput(LANG.ci_degr_s, {title:LANG.ci_degr_l, convert:UC.toFloat, bound:UC.bound(-360,360.0) }) + degrees: UC.newInput(LANG.ci_degr_s, {title:LANG.ci_degr_l, convert:UC.toFloat, bound:UC.bound(-360,360.0) }), + absolute: UC.newBoolean(LANG.ci_abso_s, undefined, {title:LANG.ci_abso_l}), + select: UC.newRow([ UC.newButton(LANG.ci_face_s, noop) ], {class:"ext-buttons f-row"}) }; const editEnable = gcodeEditor('Laser Enable Script', 'enable'); diff --git a/src/kiri/conf.js b/src/kiri/conf.js index 03a6b2a7..395d4120 100644 --- a/src/kiri/conf.js +++ b/src/kiri/conf.js @@ -566,6 +566,7 @@ const conf = exports({ camStockClipTo: false, camStockIndexed: false, camIndexAxis: 0, + camIndexAbs: true, camStockOn: true, camConventional: false, // outputClockwise outputOriginCenter: false, diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index dea2660d..88006056 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -559,6 +559,10 @@ self.kiri.lang['en-us'] = { // CNC INDEX AXIS ci_degr_s: "degrees", ci_degr_l: "degrees to rotate the A (indexed) axis", + ci_abso_s: "absolute", + ci_abso_l: "degree rotation is absolute", + ci_face_s: "face", + ci_face_l: "select face to rotate facing up", // CNC LASER cl_powr_s: "power",