From c2ea79586718705278f8c454d560301f35da1916 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart@neuron.com>
Date: Wed, 5 Feb 2020 16:19:36 -0500
Subject: [PATCH] add fast feed speed for G0 moves

---
 js/kiri-driver-cam.js | 5 +++--
 js/kiri.js            | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/js/kiri-driver-cam.js b/js/kiri-driver-cam.js
index 6069bf01..e0d635ea 100644
--- a/js/kiri-driver-cam.js
+++ b/js/kiri-driver-cam.js
@@ -1495,8 +1495,9 @@ var gs_kiri_cam = exports;
                 filterEmit(cmdToolChange, consts);
             }
 
-            var feed = out.speed,
-                nl = [feed ? 'G1' : 'G0'],
+            var speed = out.speed,
+                feed = speed || spro.camFastFeed,
+                nl = [speed ? 'G1' : 'G0'],
                 dx = newpos.x - pos.x,
                 dy = newpos.y - pos.y,
                 dz = newpos.z - pos.z,
diff --git a/js/kiri.js b/js/kiri.js
index d5948bc5..ee2b42ee 100644
--- a/js/kiri.js
+++ b/js/kiri.js
@@ -131,6 +131,7 @@ self.kiri.license = exports.LICENSE;
                 // fields permitted in CAM:Process
                 p:{
                     processName: 1,
+                    camFastFeed: 1,
                     roughingTool: 1,
                     roughingSpindle: 1,
                     roughingDown: 1,
@@ -346,6 +347,8 @@ self.kiri.license = exports.LICENSE;
 
                 // --- CAM ---
 
+                camFastFeed: 6000,
+
                 roughingTool: 1000,
                 roughingSpindle: 1000,
                 roughingDown: 2,
@@ -2632,6 +2635,9 @@ self.kiri.license = exports.LICENSE;
             laserSliceHeight: UC.newInput("height", {title:"millimeters\n0 = auto/detect", convert:UC.toFloat, modes:LASER}),
             laserSliceSingle: UC.newBoolean("single", onBooleanClick, {title:"perform one slice\nat specified height", modes:LASER}),
 
+            camCommon: UC.newGroup("common", null, {modes:CAM}),
+            camFastFeed: UC.newInput("rapid feed", {title:"rapid moves feedrate\nin millimeters / minute", convert:UC.toInt, modes:CAM}),
+
             roughing: UC.newGroup("roughing", null, {modes:CAM}),
             roughingTool: UC.newSelectField("tool", {modes:CAM}),
             roughingSpindle: UC.newInput("spindle rpm", {title:"spindle speed rpm", convert:UC.toInt, modes:CAM}),