Skip to content

Commit

Permalink
Labeled circular movements
Browse files Browse the repository at this point in the history
  • Loading branch information
will1742 committed Sep 6, 2021
1 parent 29ad5f8 commit d90fdc8
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions Flow_Waterjet_BIDC/Bechtel Waterjet.cps
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)), ",",
Expand Down

0 comments on commit d90fdc8

Please sign in to comment.