From 67f65d3f98388fdbadcbec852de0079506ef3592 Mon Sep 17 00:00:00 2001
From: curuvar <58759586+curuvar@users.noreply.github.com>
Date: Thu, 15 Dec 2022 22:34:30 -0500
Subject: [PATCH] Use G0 for rapid moves.

---
 api/js/cam.js                  | 4 ++--
 js/Cam.js                      | 4 ++--
 js/GcodeConversionViewModel.js | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/js/cam.js b/api/js/cam.js
index 5ac081d..889d28f 100644
--- a/api/js/cam.js
+++ b/api/js/cam.js
@@ -142,8 +142,8 @@ jscut.cam = jscut.cam || {};
         else
             gcode += "G21         ; Set units to mm\r\n";
         gcode += "G90         ; Absolute positioning\r\n";
-        gcode += "G1 Z" + (topZ + material.clearance * fromMatConv * toGcodeConv) +
-            " F" + tool.rapidRate * fromToolConv * toGcodeConv + "      ; Move to clearance level\r\n"
+        gcode += "G0 Z" + (topZ + material.clearance * fromMatConv * toGcodeConv) +
+            "      ; Move to clearance level\r\n"
         return gcode;
     }
 
diff --git a/js/Cam.js b/js/Cam.js
index fbd5ee2..b767663 100644
--- a/js/Cam.js
+++ b/js/Cam.js
@@ -419,8 +419,8 @@ jscut.priv.cam = jscut.priv.cam || {};
                     currentZ = Math.max(finishedZ, tabZ);
                 gcode +=
                     '; Rapid to initial position\r\n' +
-                    'G1' + convertPoint(origPath[0], false) + rapidFeedGcode + '\r\n' +
-                    'G1 Z' + currentZ.toFixed(decimal) + '\r\n';
+                    'G0' + convertPoint(origPath[0], false) + '\r\n' +
+                    'G0 Z' + currentZ.toFixed(decimal) + '\r\n';
 
                 var selectedPaths;
                 if (nextZ >= tabZ || useZ)
diff --git a/js/GcodeConversionViewModel.js b/js/GcodeConversionViewModel.js
index 0a5934b..34872c8 100644
--- a/js/GcodeConversionViewModel.js
+++ b/js/GcodeConversionViewModel.js
@@ -115,7 +115,7 @@ function GcodeConversionViewModel(options, miscViewModel, materialViewModel, too
         else
             gcode += "G21         ; Set units to mm\r\n";
         gcode += "G90         ; Absolute positioning\r\n";
-        gcode += "G1 Z" + safeZ + " F" + rapidRate + "      ; Move to clearance level\r\n"
+        gcode += "G0 Z" + safeZ + "      ; Move to clearance level\r\n"
 
         for (var opIndex = 0; opIndex < ops.length; ++opIndex) {
             var op = ops[opIndex];