From ca0239d90b17b19f90539f61bb724ef2292d41d8 Mon Sep 17 00:00:00 2001
From: "Williams, Gavin J" <will1742@purdue.edu>
Date: Tue, 7 Sep 2021 11:08:00 -0400
Subject: [PATCH] Revert "Updated ST-20Y"

This reverts commit 9fba05017fe7a5a12158a9b227be1d709d372186.
---
 Haas_Lathes_BIDC/Bechtel ST-20Y.cps | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps
index 342db24..351da16 100644
--- a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
+++ b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
@@ -356,7 +356,7 @@ properties = {
     description: "Tool loading and probing. By turning this off, you accept responsibility for any resulting crashes.",
     group: 99,
     type: "boolean",
-    value: false,
+    value: true,
     scope: "post"
   },
   loadToolsAtStart: {
@@ -364,7 +364,7 @@ properties = {
     description: "Tool loading only. By turning this off, you accept responsibility for any resulting crashes.",
     group: 99,
     type: "boolean",
-    value: false,
+    value: true,
     scope: "post"
   }
 };
@@ -1418,25 +1418,25 @@ function onOpen() {
     writeln("");
   }
 
-
-  writeln("");
-  // will1742 | Gavin Williams | 8/10/21
-  // Auto probe tools
-  var tools = getToolTable();
-  if (tools.getNumberOfTools() > 0) {
-    for (var i = 0; i < tools.getNumberOfTools(); ++i) {
-      var tool = tools.getTool(i);
-      var compensationOffset = tool.isTurningTool() ? tool.compensationOffset : tool.lengthOffset;
-      var toolPosition = toolFormat.format(tool.number * 100 + compensationOffset % 100);
-      var writeLoad = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock;
-      writeLoad("T" + toolFormat.format((tool.number - 3) >= 1 ? tool.number - 3 : tool.number + 9), mFormat.format(6));
-      writeLoad(mFormat.format(0));
-      writeComment("LOAD T" + tool.number + ": " + tool.description);
-      writeToolMeasureBlockBIDC(tool);
+  if (getProperty("loadToolsAtStart") || getProperty("measureToolsAtStart")) {
+    writeln("");
+    // will1742 | Gavin Williams | 8/10/21
+    // Auto probe tools
+    var tools = getToolTable();
+    if (tools.getNumberOfTools() > 0) {
+      for (var i = 0; i < tools.getNumberOfTools(); ++i) {
+        var tool = tools.getTool(i);
+        var compensationOffset = tool.isTurningTool() ? tool.compensationOffset : tool.lengthOffset;
+        var toolPosition = toolFormat.format(tool.number * 100 + compensationOffset % 100);
+        var writeLoad = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock;
+        writeLoad("T" + toolFormat.format((tool.number - 3) >= 1 ? tool.number - 3 : tool.number + 9), mFormat.format(6));
+        writeLoad(mFormat.format(0));
+        writeComment("LOAD T" + tool.number + ": " + tool.description);
+        writeToolMeasureBlockBIDC(tool);
+      }
     }
   }
 
-
   if (false) {
     // check for duplicate tool number
     for (var i = 0; i < getNumberOfSections(); ++i) {