Revert "fixed bug with loadTools and measureTools are both 'false'"

This reverts commit 0c71dc7.
Bechtel-Innovation-Design-Center · Sep 7, 2021 · 55e1655 · 55e1655
1 parent d7f2ced
commit 55e1655
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/Haas_Lathes_BIDC/Bechtel ST-20.cps b/Haas_Lathes_BIDC/Bechtel ST-20.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: {
@@ -1363,20 +1363,22 @@ 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);
+      }
     }
   }