From 8200f2eb40ea617660459fb03cfed13dd55fa6ac Mon Sep 17 00:00:00 2001
From: will1742 <will1742@purdue.edu>
Date: Mon, 23 Aug 2021 16:00:20 -0400
Subject: [PATCH] Removed Thread Radius. Finished Mapping

---
 Haas_Lathes_BIDC/Bechtel ST-20Y.cps | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps
index 649885c..e42b214 100644
--- a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
+++ b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
@@ -610,7 +610,7 @@ function getCompleteTool(holder, tool) {
     }
 
     var defaultZ = function() {
-      return holder.z + tool.holderOverallLength;
+      return holder.z + tool.holderOverallLength + holder.sOffset;
     }
 
     if (getHaasToolTypeBIDC(tool.type) == HAAS_DRILL) {
@@ -640,8 +640,13 @@ function getCompleteTool(holder, tool) {
       this.probeX = function() {
         return holder.x - (tool.cuttingWidth - (.5*tool.shankWidth));
       }
+      this.probeZ = defaultZ;
+      return;
     }
 
+    this.probeX = defaultX;
+    this.probeZ = defaultZ;
+
   } else if (holder == KM40R) {
     this.probeX = function() {
       return holder.x + (tool.getBodyLength() + tool.getHolderLength())*2
@@ -1233,19 +1238,13 @@ function writeToolMeasureBlockBIDC(tool) {
     writeBlock(gFormat.format(10), "L10 P" + tool.number, rOffset.format(tool.cornerRadius != 0 ? tool.cornerRadius : tool.noseRadius));
   }
 
-  if (tool.type == TOOL_TURNING_THREADING) {
-    writeBlock(gFormat.format(10), "L10 P" + tool.number, rOffset.format(tool.threadPitch*2));
-  }
-
   writeBlock("T" + toolFormat.format(tool.number * 100 + compensationOffset % 100));
   writeComment("PROBE: " + measureTool.offsetType + ", " + probeType.name);
   writeBlock(mFormat.format(104));
   writeBlock(gFormat.format(212), "H" + probeType.num);
   writeBlock(mFormat.format(105));
-  if (tool.type == TOOL_TURNING_THREADING) {
-    writeBlock(gFormat.format(10), "L10 P" + tool.number, rOffset.format(0));
-  }
-  if (measureTool.offsetType == "Indexible Drill") {
+
+  if (typeof measureTool.machineX == 'function') {
     writeBlock(gFormat.format(10), "L10 P" + tool.number, xOffset.format(measureTool.machineX()));
   }
   writeln("");