From d97e38b758013f2ac52bbde26b2fba11dd765cb4 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 24 Jun 2025 22:03:09 -0400 Subject: [PATCH 1/3] tweak to improve thru hole handling in roughing --- src/kiri-mode/cam/ops.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js index 555e469f..0a345ae4 100644 --- a/src/kiri-mode/cam/ops.js +++ b/src/kiri-mode/cam/ops.js @@ -302,7 +302,7 @@ class OpRough extends CamOp { thruHoles.forEach(hole => { shadow = shadow.map(p => { if (p.isEquivalent(hole)) { - let po = POLY.offset([p], -(toolDiam / 2 + roughLeave + 0.01)); + let po = POLY.offset([p], -(toolDiam / 2 + roughLeave + 0.05)); return po ? po[0] : undefined; } else { return p; From 9e6b2301339c03c28b39524356104405f29fc63d Mon Sep 17 00:00:00 2001 From: Josiah Hamm Date: Tue, 24 Jun 2025 21:44:51 -0600 Subject: [PATCH 2/3] Merge pull request #389 from GridSpace/cut-direction-bugfix Cut direction bugfix --- src/kiri-mode/cam/ops.js | 4 ---- src/kiri-mode/cam/prepare.js | 3 +++ src/kiri/conf.js | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js index 0a345ae4..8c843397 100644 --- a/src/kiri-mode/cam/ops.js +++ b/src/kiri-mode/cam/ops.js @@ -697,10 +697,6 @@ class OpOutline extends CamOp { setTool(op.tool, op.rate, op.plunge); setSpindle(op.spindle); - if (!process.camOutlinePocket) { - cutdir = !cutdir; - } - // printpoint becomes NaN in engine mode. not sure why but this fixes it if(Object.values(printPoint).some(v=>Number.isNaN(v))){ printPoint = newPoint(0,0,0); diff --git a/src/kiri-mode/cam/prepare.js b/src/kiri-mode/cam/prepare.js index 8e141aae..140eb625 100644 --- a/src/kiri-mode/cam/prepare.js +++ b/src/kiri-mode/cam/prepare.js @@ -491,6 +491,7 @@ function prepEach(widget, settings, print, firstPoint, update) { if (depthFirst) { depthData.push(polys); } else { + // if not depth first, output the polys in slice order printPoint = poly2polyEmit(polys, printPoint, function(poly, index, count) { poly.forEachPoint(function(point, pidx, points, offset) { // scale speed of first cutting poly since it engages the full bit @@ -508,10 +509,12 @@ function prepEach(widget, settings, print, firstPoint, update) { } if (depthFirst) { + // get inside vals (the positive ones) let ins = depthData.map(a => a.filter(p => !isNeg(p.depth))); let itops = ins.map(level => { return POLY.nest(level.filter(poly => poly.depth === 0).clone()); }); + // get outside vals (the negative ones) let outs = depthData.map(a => a.filter(p => isNeg(p.depth))); let otops = outs.map(level => { return POLY.nest(level.filter(poly => poly.depth === 0).clone()); diff --git a/src/kiri/conf.js b/src/kiri/conf.js index 8b351c97..181191cb 100644 --- a/src/kiri/conf.js +++ b/src/kiri/conf.js @@ -215,7 +215,6 @@ const renamed = { drillDwell: "camDrillDwell", drillLift: "camDrillLift", drillingOn: "camDrillingOn", - camPocketOnlyFinish: "camOutlinePocket", camWideCutout: "camOutlineWide", outputClockwise: "camConventional" }; From c639760cc7602a3c817e08b9d950c7bc354c6dae Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Fri, 27 Jun 2025 01:21:01 -0400 Subject: [PATCH 3/3] add TrueNAS install instructions in readme --- readme.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/readme.md b/readme.md index b810a2c8..9c7d2497 100644 --- a/readme.md +++ b/readme.md @@ -92,6 +92,22 @@ npm run setup npm run dev ``` +## TrueNAS Via YAML + +`Apps > Discover Apps > Install via YAML` + +``` +services: + kirimoto: + build: + context: https://github.com/GridSpace/grid-apps.git#refs/tags/latest + dockerfile: ./src/dock/Dockerfile + ports: + - "8080:8080" +``` + +## For any default install... + Then open a browser to [localhost:8080/kiri](http://localhost:8080/kiri) # Windows Developers