From 69711eb34df2b2a5dd53a8b792d49303d3aa08dd Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Wed, 21 Feb 2018 18:04:27 -0500
Subject: [PATCH] add code injection at pause layers

---
 js/kiri-driver-fdm.js | 27 ++++++++++++++++++++-------
 js/kiri.js            |  3 +++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/js/kiri-driver-fdm.js b/js/kiri-driver-fdm.js
index aff1edcb..5888189c 100644
--- a/js/kiri-driver-fdm.js
+++ b/js/kiri-driver-fdm.js
@@ -381,6 +381,8 @@ var gs_kiri_fdm = exports;
             trackProgress = device.gcodeTrack,
             time = 0,
             layer = 0,
+            pause = [],
+            pauseCmd = device.gcodePause,
             output = [],
             outputLength = 0,
             lastProgress = 0,
@@ -423,6 +425,11 @@ var gs_kiri_fdm = exports;
             lines = 0,
             bytes = 0;
 
+        (process.gcodePauseLayers || "").split(",").forEach(function(lv) {
+            var v = parseInt(lv);
+            if (v >= 0) pause.push(v);
+        });
+
         if (online) {
             append = function(line) {
                 if (line) {
@@ -533,15 +540,21 @@ var gs_kiri_fdm = exports;
                 device.filamentSize,
                 path.layer === 0 ? process.firstSliceHeight : path.height);
 
+            consts.layer = layer;
+            consts.height = path.height.toFixed(3);
+
+            if (pauseCmd && pause.indexOf(layer) >= 0) {
+                for (var i=0; i<pauseCmd.length; i++) {
+                    append(constReplace(pauseCmd[i], consts));
+                }
+            }
+
             if (trackLayers && trackLayers.length) {
                 trackLayers.forEach(function(line) {
-                    append(constReplace(line, {
-                        progress: progress,
-                        layer: layer,
-                        height: path.height.toFixed(3)}));
+                    append(constReplace(line, consts));
                 });
             } else {
-                append("; --- layer " + layer + " (" + path.height.toFixed(3) + " @ " + zpos.toFixed(3) + ") ---");
+                append("; --- layer " + layer + " (" + consts.height + " @ " + zpos.toFixed(3) + ") ---");
             }
 
             // second layer fan on
@@ -602,11 +615,11 @@ var gs_kiri_fdm = exports;
                 // update time and distance (should calc in moveTo() instead)
                 time += (dist / speedMMM) * 60 * 1.5;
                 distance += dist;
-                progress = Math.round((distance / totaldistance) * 100);
+                consts.progress = progress = Math.round((distance / totaldistance) * 100);
 
                 // emit tracked progress
                 if (trackProgress && progress != lastProgress) {
-                    append(constReplace(trackProgress, {progress:progress}));
+                    append(constReplace(trackProgress, consts));
                     lastProgress = progress;
                 }
 
diff --git a/js/kiri.js b/js/kiri.js
index 81df479f..03064416 100644
--- a/js/kiri.js
+++ b/js/kiri.js
@@ -102,6 +102,7 @@ self.kiri.license = exports.LICENSE;
                     // detectThinWalls: 1,
                     antiBacklash: 1,
                     gcodeKFactor: 1,
+                    gcodePauseLayers: 1,
                     outputClockwise: 1,
                     outputOriginCenter: 1,
                     outputInvertX: 1,
@@ -311,6 +312,7 @@ self.kiri.license = exports.LICENSE;
                 detectThinWalls: false,
                 antiBacklash: 2,
                 gcodeKFactor: 0,
+                gcodePauseLayers: "",
                 outputCooling: true,
 
                 // --- LASER ---
@@ -2510,6 +2512,7 @@ self.kiri.license = exports.LICENSE;
 
             gcodeVars: UC.newGroup("gcode", null, {modes:FDM}),
             gcodeKFactor: UC.newInput("k-factor", {title: "aka linear advance\nuse {kfactor} in gcode", convert:UC.toInt, modes:FDM}),
+            gcodePauseLayers: UC.newInput("pause layers", {title: "comma-separated list of layers\nto inject pause commands between", modes:FDM}),
 
         });