fix hasStock check. default to GridLocal for OctoPrint

2020-07-22 13:13:00 -04:00 · 2020-07-22 13:13:00 -04:00 · d2bac2f858
commit d2bac2f858
parent 931a14dc81
2 changed files with 3 additions and 3 deletions
--- a/src/kiri/conf.js
+++ b/src/kiri/conf.js
@ -603,9 +603,9 @@
                autoLayout: true,
                alignTop: true,
                units: "mm",
-                exportOcto: true,
+                exportOcto: false,
                exportGhost: false,
-                exportLocal: false
+                exportLocal: true
            },
            // for passing temporary slice hints (topo currently)
            synth: {},
--- a/src/mode/cam/driver.js
+++ b/src/mode/cam/driver.js
@ -1806,7 +1806,7 @@
            mode = 0,
            point,
            points = 0,
-            hasStock = spro.camStockZ && spro.camStockX && spro.camStockY,
+            hasStock = spro.camStockOffset || (spro.camStockZ && spro.camStockX && spro.camStockY),
            zmax = hasStock ? settings.stock.z : bounds.max.z,
            runbox = {
                max: { x:-Infinity, y:-Infinity, z:-Infinity},