diff --git a/Haas_Next_Generation/haas vf2.cps b/Haas_Next_Generation/haas vf2.cps index b677cc3..1079b77 100644 --- a/Haas_Next_Generation/haas vf2.cps +++ b/Haas_Next_Generation/haas vf2.cps @@ -865,13 +865,13 @@ function writeToolMeasureBlock(tool, preMeasure) { "I0.", comment ); // probe tool - writeFunction("IF [[#" + (2000 + tool.number) + " GT " + + writeWords("IF [[#" + (2000 + tool.number) + " GT " + (tool.bodyLength + tool.holderLength + LENGTH_TOLERANCE).toFixed(2) + "] OR [#" + (2000 + tool.number) + " LT " + (tool.bodyLength + tool.holderLength - LENGTH_TOLERANCE).toFixed(2) + "]] THEN #3000 = 1 (Tool length out of tolerance)"); if (probeType == 3) { - writeFunction("IF [[#" + (2000 + tool.number) + " GT " + + writeWords("IF [[#" + (2000 + tool.number) + " GT " + (tool.diameter + DIAM_TOLERANCE).toFixed(2) + "] OR [#" + (2000 + tool.number) + " LT " + (tool.diameter - DIAM_TOLERANCE).toFixed(2) + "]] THEN #3000 = 1 (Tool diameter out of tolerance)");