From aa0ccdaab23c3386e047c2bc43974f499055e934 Mon Sep 17 00:00:00 2001
From: Stewart Allen <sa@grid.space>
Date: Mon, 10 May 2021 14:31:41 -0400
Subject: [PATCH] add range() function in gcode macro expressions

---
 src/kiri/print.js      | 3 ++-
 src/mode/fdm/export.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/kiri/print.js b/src/kiri/print.js
index c2e200df..0f36956d 100644
--- a/src/kiri/print.js
+++ b/src/kiri/print.js
@@ -1278,7 +1278,8 @@
             for (let [k,v] of Object.entries(consts)) {
                 eva.push(`let ${k} = "${v}";`);
             }
-            eva.push(`try {( ${tok} )} catch (e) {0}`);
+            eva.push(`function range(a,b) { return (a + (layer / layers) * (b-a)).round(3) }`)
+            eva.push(`try {( ${tok} )} catch (e) {console.log(e);0}`);
             let scr = eva.join('');
             let evl = eval(`{ ${scr} }`);
             nutok = evl;
diff --git a/src/mode/fdm/export.js b/src/mode/fdm/export.js
index ca2b1cc6..905c5348 100644
--- a/src/mode/fdm/export.js
+++ b/src/mode/fdm/export.js
@@ -92,6 +92,7 @@
                 bottom: offset ? 0 : -device.bedDepth/2,
                 z_max: device.maxHeight,
                 layers: layers.length,
+                progress: 0,
                 nozzle: 0,
                 tool: 0
             },