From 39abd5433ee9ce9ddefbede1040790d1b39c9201 Mon Sep 17 00:00:00 2001
From: Russell Johnson <47639332+Russ4262@users.noreply.github.com>
Date: Sat, 16 Apr 2022 12:12:23 -0500
Subject: [PATCH 1/2] Path: Fixes #6693 - Add Z and K values to arc commands

---
 src/Mod/Path/PathScripts/PathDressupLeadInOut.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py
index 9b980dfdb2..65d6e1f675 100644
--- a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py
+++ b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py
@@ -414,8 +414,10 @@ class ObjectDressup:
                 {
                     "X": p0.x,
                     "Y": p0.y,
+                    "Z": p0.z,
                     "I": offsetvector.x,
                     "J": offsetvector.y,
+                    "K": offsetvector.z,
                     "F": horizFeed,
                 },
             )  # add G2/G3 move
@@ -518,7 +520,15 @@ class ObjectDressup:
         if obj.StyleOff == "Arc":
             arcmove = Path.Command(
                 arcdir,
-                {"X": leadend.x, "Y": leadend.y, "I": IJ.x, "J": IJ.y, "F": horizFeed},
+                {
+                    "X": leadend.x,
+                    "Y": leadend.y,
+                    "Z": leadend.z,
+                    "I": IJ.x,
+                    "J": IJ.y,
+                    "K": IJ.z,
+                    "F": horizFeed,
+                },
             )  # add G2/G3 move
             results.append(arcmove)
             if obj.ExtendLeadOut != 0:

From 8edc9b142d1e60c01f8bc7615f6151060431d298 Mon Sep 17 00:00:00 2001
From: Russell Johnson <47639332+Russ4262@users.noreply.github.com>
Date: Sat, 18 Jun 2022 20:56:49 -0500
Subject: [PATCH 2/2] Path: Fixes #6693 - Add missing feed rate for G1 layer
 command

---
 src/Mod/Path/PathScripts/PathDressupLeadInOut.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py
index 65d6e1f675..e4e70395cb 100644
--- a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py
+++ b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py
@@ -387,13 +387,10 @@ class ObjectDressup:
             extendcommand = Path.Command("G0", {"X": extendstart.x, "Y": extendstart.y})
             results.append(extendcommand)
 
-        commandname = "G0" if obj.RapidPlunge else "G1"
-        extendcommand = Path.Command(
-            commandname,
-            {
-                "Z": p1.z,
-            },
-        )
+        if obj.RapidPlunge:
+            extendcommand = Path.Command("G0", {"Z": p1.z})
+        else:
+            extendcommand = Path.Command("G1", {"Z": p1.z, "F": vertFeed})
         results.append(extendcommand)
 
         if obj.UseMachineCRC: