From 87b251bedcf786b03be479561dd40d65d01789a8 Mon Sep 17 00:00:00 2001
From: Stewart Allen <so@a3z.co>
Date: Thu, 13 Jun 2024 23:42:28 -0400
Subject: [PATCH] add proper gcode on/off macros for each cutting tool

---
 src/kiri-mode/laser/driver.js |  8 ++++----
 src/kiri/conf.js              | 14 +++++++-------
 src/kiri/init.js              |  4 ++++
 web/kiri/lang/en.js           | 11 +++++++++++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/kiri-mode/laser/driver.js b/src/kiri-mode/laser/driver.js
index 6430b47c..b65ed5fc 100644
--- a/src/kiri-mode/laser/driver.js
+++ b/src/kiri-mode/laser/driver.js
@@ -558,8 +558,8 @@ function exportGCode(settings, data) {
     let proc = settings.process;
     let space = dev.gcodeSpace ? ' ' : '';
     let power = 255;
-    let laser_on = dev.gcodeLaserOn || [];
-    let laser_off = dev.gcodeLaserOff || [];
+    let cut_on = dev.gcodeLaserOn || dev.gcodeWaterOn || dev.gcodeKnifeDn || [];
+    let cut_off = dev.gcodeLaserOff || dev.gcodeWaterOff || dev.gcodeKnifeUp || [];
     let knifeOn = proc.knifeOn;
     let knifeDepth = proc.ctOutKnifeDepth;
     let passes = knifeOn ? proc.ctOutKnifePasses : 1;
@@ -597,7 +597,7 @@ function exportGCode(settings, data) {
                             lines.appendAll(['; drag-knife down', `G0${space}Z${-i * knifeDepth}`]);
                         }
                     } else if (index === 1) {
-                        laser_on.forEach(line => {
+                        cut_on.forEach(line => {
                             line = line.replace('{power}', power);
                             line = line.replace('{color}', color);
                             line = line.replace('{thick}', thick);
@@ -609,7 +609,7 @@ function exportGCode(settings, data) {
                         lines.push(`G1${space}${point}`);
                     }
                 });
-                laser_off.forEach(line => {
+                cut_off.forEach(line => {
                     lines.push(line);
                 });
             }
diff --git a/src/kiri/conf.js b/src/kiri/conf.js
index e645a4b8..13d9f7b8 100644
--- a/src/kiri/conf.js
+++ b/src/kiri/conf.js
@@ -613,9 +613,9 @@ const conf = exports({
                 imageURL: "",
                 internal: 0,
                 bedWidth: 300,
-                bedDepth: 175,
+                bedDepth: 200,
                 bedHeight: 2.5,
-                maxHeight: 300,
+                maxHeight: 100,
                 gcodePre: [],
                 gcodePost: [],
                 gcodeFExt: "",
@@ -663,6 +663,8 @@ const conf = exports({
                 gcodePost: [],
                 gcodeFExt: "",
                 gcodeSpace: true,
+                gcodeKnifeDn: [";; Z down"],
+                gcodeKnifeUp: [";; Z up"]
             },
             // process defaults Drag:Process
             p:{
@@ -704,8 +706,8 @@ const conf = exports({
                 gcodePost: [],
                 gcodeFExt: "",
                 gcodeSpace: true,
-                gcodeLaserOn: ["M106 S{power}"],
-                gcodeLaserOff: ["M107"]
+                gcodeWaterOn: ["M106 S{power}"],
+                gcodeWaterOff: ["M107"]
             },
             // process defaults WaterJet:Process
             p:{
@@ -746,9 +748,7 @@ const conf = exports({
                 gcodePre: [],
                 gcodePost: [],
                 gcodeFExt: "",
-                gcodeSpace: true,
-                gcodeLaserOn: ["M106 S{power}"],
-                gcodeLaserOff: ["M107"]
+                gcodeSpace: true
             },
             // process defaults WireEDM:Process
             p:{
diff --git a/src/kiri/init.js b/src/kiri/init.js
index f57ad951..5a8c2d6c 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -1731,6 +1731,10 @@ gapp.register("kiri.init", [], (root, exports) => {
                 (ui.gcodeFeature  = newGCode(LANG.dv_feat_s, {title:LANG.dv_feat_l, modes:FDM,   area:gcode})).button,
                 (ui.gcodeLaserOn  = newGCode(LANG.dv_lzon_s, {title:LANG.dv_lzon_l, modes:LASER, area:gcode})).button,
                 (ui.gcodeLaserOff = newGCode(LANG.dv_lzof_s, {title:LANG.dv_lzof_l, modes:LASER, area:gcode})).button,
+                (ui.gcodeWaterOn  = newGCode(LANG.dv_waon_s, {title:LANG.dv_waon_l, modes:WJET,  area:gcode})).button,
+                (ui.gcodeWaterOff = newGCode(LANG.dv_waof_s, {title:LANG.dv_waof_l, modes:WJET,  area:gcode})).button,
+                (ui.gcodeKnifeDn  = newGCode(LANG.dv_dkon_s, {title:LANG.dv_dkon_l, modes:DRAG,  area:gcode})).button,
+                (ui.gcodeKnifeUp  = newGCode(LANG.dv_dkof_s, {title:LANG.dv_dkof_l, modes:DRAG,  area:gcode})).button,
                 (ui.gcodeChange   = newGCode(LANG.dv_tool_s, {title:LANG.dv_tool_l, modes:CAM,   area:gcode})).button,
                 (ui.gcodeDwell    = newGCode(LANG.dv_dwll_s, {title:LANG.dv_dwll_l, modes:CAM,   area:gcode})).button,
                 (ui.gcodeSpindle  = newGCode(LANG.dv_sspd_s, {title:LANG.dv_sspd_l, modes:CAM,   area:gcode, show:() => ui.spindleMax.value > 0})).button
diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js
index 3d926a1d..df8cdd6a 100644
--- a/web/kiri/lang/en.js
+++ b/web/kiri/lang/en.js
@@ -175,6 +175,17 @@ self.kiri.lang['en-us'] = {
     dv_lzon_l:      "gcode laser on script",
     dv_lzof_s:      "laser off",
     dv_lzof_l:      "gcode laser off script",
+
+    dv_waon_s:      "water on",
+    dv_waon_l:      "gcode water pump on script",
+    dv_waof_s:      "water off",
+    dv_waof_l:      "gcode water pump off script",
+
+    dv_dkon_s:      "knife down",
+    dv_dkon_l:      "gcode knife down script",
+    dv_dkof_s:      "knife up",
+    dv_dkof_l:      "gcode knife up script",
+
     dv_exts_s:      "select",
     dv_exts_l:      "gcode run to enable this extruder",
     dv_dext_s:      "deselect",