diff --git a/release.md b/release.md index 7f56ef30..89bffd35 100644 --- a/release.md +++ b/release.md @@ -15,6 +15,8 @@ Full docs @ https://docs.grid.space/projects/kiri-moto * add CAM origin offset optional parameters * remove auto-decimation on object import * fix FDM raft line fill strategy +* slicing memory reduction from team lychee +* option to control first CAM output point order - refactor object/group storage model in Mesh:Tool diff --git a/src/kiri-mode/cam/export.js b/src/kiri-mode/cam/export.js index 5bdda797..10962578 100644 --- a/src/kiri-mode/cam/export.js +++ b/src/kiri-mode/cam/export.js @@ -211,7 +211,7 @@ CAM.export = function(print, online) { if (points === 0) { pos.x = pos.y = pos.z = 0; points++; - if (newpos.z > pos.z) { + if (spro.camFirstZMax) { moveTo({ // speed: Infinity, tool: out.tool, diff --git a/src/kiri/conf.js b/src/kiri/conf.js index 119a5b66..ef84e43a 100644 --- a/src/kiri/conf.js +++ b/src/kiri/conf.js @@ -581,6 +581,7 @@ const conf = exports({ camExpertFast: false, camTrueShadow: false, camForceZMax: false, + camFirstZMax: false, ops: [], // current ops op2: [] // flip ops } diff --git a/src/kiri/init.js b/src/kiri/init.js index 119c2d3c..d6f3478f 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1974,6 +1974,8 @@ 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}), + 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}), outputOriginBounds: uc.newBoolean(LANG.or_bnds_s, onBooleanClick, {title:LANG.or_bnds_l, modes:LASER}), outputOriginCenter: uc.newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l, modes:LASER}), diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index df7d6ffe..027f6608 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -678,6 +678,8 @@ self.kiri.lang['en-us'] = { ou_depf_l: ["optimize pocket cuts","with depth priority"], ou_forz_s: "force z max", ou_forz_l: "all moves between pockets will go to z max (above stock). this is usually required if you are not performing a roughing operation before pocketing operations.", + ou_z1st_s: "first z max", + ou_z1st_l: "first move in the job will be to Z max (travel distance above stock)", // CAM STOCK cs_menu: "stock",