From d90fdc8a5c8ce776a3767c21f2cbee2cae995153 Mon Sep 17 00:00:00 2001
From: "Williams, Gavin J" <will1742@purdue.edu>
Date: Mon, 6 Sep 2021 15:15:49 -0400
Subject: [PATCH] Labeled circular movements

---
 Flow_Waterjet_BIDC/Bechtel Waterjet.cps | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Flow_Waterjet_BIDC/Bechtel Waterjet.cps b/Flow_Waterjet_BIDC/Bechtel Waterjet.cps
index 95755f7..13999a4 100644
--- a/Flow_Waterjet_BIDC/Bechtel Waterjet.cps	
+++ b/Flow_Waterjet_BIDC/Bechtel Waterjet.cps	
@@ -66,13 +66,13 @@ properties = {
       {title: "V5", id: "5"},
       {title: "V6", id: "6"}
     ],
-    value: "5",
+    value: "6",
     scope: "post"
   }
 };
 
 staticProperties = {
-  postVersion: "BIDC-FWJ.G8.A21"
+  postVersion: "BIDC-FWJ.G9.A21"
 };
 
 // use fixed width instead
@@ -342,7 +342,17 @@ function onCircular(clockwise, cx, cy, cz, x, y, z, feed) {
   var p = getCurrentPosition();
   if (useVersion6) {
     writeComment("Circular");
-
+    writeBlock(
+      commentf("X"), ",",
+      f("Y"), ",", 
+      f("Z"), ",", 
+      fi("CW", 2), ",", 
+      fi("Feed", 5), ",", 
+      fi("C", 2), ",",
+      fi("?", 2), ",",
+      f("CX"), ",",
+      f("CY"), ",",
+      f("CZ"));
     writeBlock(
       f(xyzFormat.format(p.x)), ",",
       f(xyzFormat.format(p.y)), ",",