diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..785a209 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Haas_Next_Generation/Bechtel VF2HP.cps diff --git a/Haas_Gantry_BIDC/Bechtel SR.cps b/Haas_Gantry_BIDC/Bechtel SR.cps index 9d1cc96..d7117de 100644 --- a/Haas_Gantry_BIDC/Bechtel SR.cps +++ b/Haas_Gantry_BIDC/Bechtel SR.cps @@ -850,21 +850,26 @@ function onOpen() { var tools = getToolTable(); if (tools.getNumberOfTools() > 0) { for (var i = 0; i < tools.getNumberOfTools(); ++i) { - // if (tool.number == 1 || tool.number == 2) { - // throw "Tool numbers 1 and 2 are not available." - // } var tool = tools.getTool(i); - var comment = "T" + toolFormat.format(tool.number) + " " + - "D=" + xyzFormat.format(tool.diameter) + " " + - localize("CR") + "=" + xyzFormat.format(tool.cornerRadius); - if ((tool.taperAngle > 0) && (tool.taperAngle < Math.PI)) { - comment += " " + localize("TAPER") + "=" + taperFormat.format(tool.taperAngle) + localize("deg"); + if (tool.number == 1 || tool.number == 2) { + throw "Tool numbers 1 and 2 are not available for use." } - if (zRanges[tool.number]) { - comment += " - " + localize("ZMIN") + "=" + xyzFormat.format(zRanges[tool.number].getMinimum()); + if (getHaasToolTypeBIDC(tool.type) == HAAS_PROBE) { + continue; } - comment += " - " + getToolTypeName(tool.type); - //writeComment(comment); + writeComment("T" + toolFormat.format(tool.number) + ": " + tool.description); + // + // var comment = "T" + toolFormat.format(tool.number) + " " + + // "D=" + xyzFormat.format(tool.diameter) + " " + + // localize("CR") + "=" + xyzFormat.format(tool.cornerRadius); + // if ((tool.taperAngle > 0) && (tool.taperAngle < Math.PI)) { + // comment += " " + localize("TAPER") + "=" + taperFormat.format(tool.taperAngle) + localize("deg"); + // } + // if (zRanges[tool.number]) { + // comment += " - " + localize("ZMIN") + "=" + xyzFormat.format(zRanges[tool.number].getMinimum()); + // } + // comment += " - " + getToolTypeName(tool.type); + // writeComment(comment); } } } @@ -898,7 +903,7 @@ function onOpen() { } comment += " - " + getToolTypeName(tool.type); writeComment(tool.description); - writeComment(comment); + //writeComment(comment); if (staticProperties.optionallyMeasureToolsAtStart) { var probeType = getHaasProbingTypeBIDC(tool, false) if (!retracted) {