From 6982ff0f65828969f1b16d5f55fb0d814d12ef81 Mon Sep 17 00:00:00 2001 From: "Williams, Gavin J" Date: Tue, 7 Sep 2021 11:08:00 -0400 Subject: [PATCH] Revert "Measure/load independently optional" This reverts commit 3d0372d066a607320dcd78782b15c947e5ab2461. --- Haas_Mills_BIDC/Bechtel DT.cps | 220 +++++++++++++++--------------- Haas_Mills_BIDC/Bechtel VF2.cps | 202 ++++++++++++++-------------- Haas_Mills_BIDC/Bechtel VF4.cps | 229 ++++++++++++++++---------------- 3 files changed, 331 insertions(+), 320 deletions(-) diff --git a/Haas_Mills_BIDC/Bechtel DT.cps b/Haas_Mills_BIDC/Bechtel DT.cps index 2a04feb..184e038 100644 --- a/Haas_Mills_BIDC/Bechtel DT.cps +++ b/Haas_Mills_BIDC/Bechtel DT.cps @@ -928,16 +928,17 @@ function writeToolMeasureBlock(tool, preMeasure) { "K" + xyzFormat.format(getHaasKFactorBIDC(tool)), "I0.", comment - ); // probe tooling - var line1 = "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)"; - - writeWords(getProperty("measureToolsAtStart") ? line1 : "/ " + line1); - if (probeType == 3) { - var line2 = "IF [[#" + (2400 + tool.number) + " GT " + - (tool.diameter + DIAM_TOLERANCE).toFixed(2) + "] OR [#" + + ); // probe tool + line1 = "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)"; + + writeWords(getProperty("measureToolsAtStart") ? line1 : "/ " + line1); + + if (probeType == 3) { + line2 = "IF [[#" + (2400 + tool.number) + " GT " + + (tool.diameter + DIAM_TOLERANCE).toFixed(2) + "] OR [#" + (2400 + tool.number) + " LT " + (tool.diameter - DIAM_TOLERANCE).toFixed(2) + "]] THEN #3000 = 1 (Tool diameter out of tolerance)"; @@ -1331,126 +1332,127 @@ function onOpen() { // 6/21/21 | Gavin Williams | will1742 // Probing now required. Using P9995. // optionally cycle through all tools - var tools = getToolTable(); + if (true) { + var tools = getToolTable(); - var writeFunction = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock; + var writeFunction = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock; - if (tools.getNumberOfTools() > 0) { - writeln(""); - /* - writeOptionalBlock(mFormat.format(0), formatComment(localize("Read note"))); // wait for operator - writeComment(localize("With BLOCK DELETE turned off each tool will cycle through")); - writeComment(localize("the spindle to verify that the correct tool is in the tool magazine")); - if (getProperty("optionallyMeasureToolsAtStart")) { - writeComment(localize("and to automatically measure it")); - } - writeComment(localize("Once the tools are verified turn BLOCK DELETE on to skip verification")); - */ + if (tools.getNumberOfTools() > 0) { + writeln(""); + /* + writeOptionalBlock(mFormat.format(0), formatComment(localize("Read note"))); // wait for operator + writeComment(localize("With BLOCK DELETE turned off each tool will cycle through")); + writeComment(localize("the spindle to verify that the correct tool is in the tool magazine")); + if (getProperty("optionallyMeasureToolsAtStart")) { + writeComment(localize("and to automatically measure it")); + } + writeComment(localize("Once the tools are verified turn BLOCK DELETE on to skip verification")); + */ - // 6/21/21 | Gavin Williams | will1742 - writeComment("Load and probe tools"); + // 6/21/21 | Gavin Williams | will1742 + writeComment("Load and probe tools"); - // Display general tool probe info - displayMedia("toolProbeReminder.jpg", !getProperty("loadToolsAtStart")); - writeFunction(mFormat.format(0)); + // Display general tool probe info + displayMedia("toolProbeReminder.jpg", !getProperty("loadToolsAtStart")); + writeFunction(mFormat.format(0)); - let parsedTools = []; + let parsedTools = []; - // Maybe should be anonymous function?? - function defaultFill() { - parsedTools = [] - for (var i = 0; i < tools.getNumberOfTools(); i++){ - parsedTools[i] = tools.getTool(i).number; + // Maybe should be anonymous function?? + function defaultFill() { + parsedTools = [] + for (var i = 0; i < tools.getNumberOfTools(); i++){ + parsedTools[i] = tools.getTool(i).number; + } } - } - // also maybe anonymous - // TODO: tool.getNumberOfTools needs to be machine-specific constant - function invalidToolNum(toolNum) { - return (toolNum < 1 || toolNum > tools.getNumberOfTools() || tools.getTool(toolNum) == undefined); - } - - // parse string for specific tools to load - if (getProperty("toolsToLoad") != "") { - // get list of numbers - let toolNumArray = getProperty("toolsToLoad").split(','); - - // iterate through and fill ranges - for (var i = 0; i < toolNumArray.length; i++){ - toolNumArray[i] = toolNumArray[i].trim(); + // also maybe anonymous + // TODO: tool.getNumberOfTools needs to be machine-specific constant + function invalidToolNum(toolNum) { + return (toolNum < 1 || toolNum > tools.getNumberOfTools() || tools.getTool(toolNum) == undefined); + } - // fill range - if (toolNumArray[i].indexOf("-") >= 0) { - let numRange = toolNumArray[i].split("-"); - if (invalidToolNum(parseInt(numRange[0])) || invalidToolNum(parseInt(numRange[1]))) { + // parse string for specific tools to load + if (getProperty("toolsToLoad") != "") { + // get list of numbers + let toolNumArray = getProperty("toolsToLoad").split(','); + + // iterate through and fill ranges + for (var i = 0; i < toolNumArray.length; i++){ + toolNumArray[i] = toolNumArray[i].trim(); + + // fill range + if (toolNumArray[i].indexOf("-") >= 0) { + let numRange = toolNumArray[i].split("-"); + if (invalidToolNum(parseInt(numRange[0])) || invalidToolNum(parseInt(numRange[1]))) { + defaultFill(); + break; + } + for(var j = numRange[0]; j <= numRange[1]; j++){ + parsedTools.push(parseInt(j)); + } + continue; + } + // check if valid num + if (invalidToolNum(parseInt(toolNumArray[i]))) { defaultFill(); break; } - for(var j = numRange[0]; j <= numRange[1]; j++){ - parsedTools.push(parseInt(j)); - } - continue; - } - // check if valid num - if (invalidToolNum(parseInt(toolNumArray[i]))) { - defaultFill(); - break; - } - // push single num - parsedTools.push(parseInt(toolNumArray[i])); - } - } else { - defaultFill(); - } - - for (var i = 0; i < tools.getNumberOfTools(); i++) { - var tool = tools.getTool(i); - if (tool.bodyLength + tool.holderLength > MAX_TOOL_LENGTH) { - throw "Error: T" + tool.number + " length greater than machine max" + // push single num + parsedTools.push(parseInt(toolNumArray[i])); + } + } else { + defaultFill(); } - if (tool.diameter > MAX_TOOL_DIAM) { - throw "Error : T" + tool.number + " diameter greater than machine max" - } + for (var i = 0; i < tools.getNumberOfTools(); i++) { + var tool = tools.getTool(i); + if (tool.bodyLength + tool.holderLength > MAX_TOOL_LENGTH) { + throw "Error: T" + tool.number + " length greater than machine max" + } - if (parsedTools.indexOf(tool.number) <= -1) { - continue; - } + if (tool.diameter > MAX_TOOL_DIAM) { + throw "Error : T" + tool.number + " diameter greater than machine max" + } - if (getProperty("measureToolsAtStart") && (tool.type == TOOL_PROBE)) { - continue; - } + if (parsedTools.indexOf(tool.number) <= -1) { + continue; + } - // 07/16/21 | will1742 | Gavin Williams - // Verify tool numbers - if (tool.number == 20 && tool.type != TOOL_PROBE) { - throw "Error: T20 is reserved for Probe"; - } + if (getProperty("measureToolsAtStart") && (tool.type == TOOL_PROBE)) { + continue; + } - if (tool.number == 19) { - throw "Error: T19 is reserved for WCS verification tool"; - } + // 07/16/21 | will1742 | Gavin Williams + // Verify tool numbers + if (tool.number == 20 && tool.type != TOOL_PROBE) { + throw "Error: T20 is reserved for Probe"; + } - writeln(""); - 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 == 19) { + throw "Error: T19 is reserved for WCS verification tool"; + } + + writeln(""); + 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"); + } + comment += " - " + getToolTypeName(tool.type); + writeComment(tool.description); + writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool + displayMedia("toolLoad" + tool.number + ".jpg", !getProperty("loadToolsAtStart")); + writeFunction(mFormat.format(0), formatComment("Load Tool")); //Pause until operator loads tool + writeToolMeasureBlock(tool, true); } - comment += " - " + getToolTypeName(tool.type); - - writeComment(tool.description); - writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool - displayMedia("toolLoad" + tool.number + ".jpg", !getProperty("loadToolsAtStart")); - writeFunction(mFormat.format(0), formatComment("Load Tool")); //Pause until operator loads tool - writeToolMeasureBlock(tool, true); } - } - writeln(""); - writeComment("SETUP FOR OPERATION"); - writeFunction(mFormat.format(131)); + writeln(""); + writeComment("SETUP FOR OPERATION"); + writeBlock(mFormat.format(131)); + } if (staticProperties.useDWO) { var failed = false; @@ -2428,7 +2430,7 @@ function onSection() { } if (hasParameter("notes") && getParameter("notes").toUpperCase().indexOf("APPROVED") <= -1) { - throw "Operation \"" + getParameter("operation-comment") + "\" not approved. See a Peer Mentor." + // throw "Operation \"" + getParameter("operation-comment") + "\" not approved. See a Peer Mentor." } if (staticProperties.showNotes) { diff --git a/Haas_Mills_BIDC/Bechtel VF2.cps b/Haas_Mills_BIDC/Bechtel VF2.cps index 108f24e..4ee81e3 100644 --- a/Haas_Mills_BIDC/Bechtel VF2.cps +++ b/Haas_Mills_BIDC/Bechtel VF2.cps @@ -958,6 +958,7 @@ function setMacro(macro, value, comment, isOptional) { } } + function defineMachineModel() { var useTCPC = getProperty("useTCPC"); switch (staticProperties.machineModel) { @@ -1331,126 +1332,131 @@ function onOpen() { // 6/21/21 | Gavin Williams | will1742 // Probing now required. Using P9995. // optionally cycle through all tools - var tools = getToolTable(); + // if (staticProperties.optionallyCycleToolsAtStart || getProperty("measureToolsAtStart")) { + if (true) { + var tools = getToolTable(); - var writeFunction = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock; + var writeFunction = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock; - if (tools.getNumberOfTools() > 0) { - writeln(""); - /* - writeOptionalBlock(mFormat.format(0), formatComment(localize("Read note"))); // wait for operator - writeComment(localize("With BLOCK DELETE turned off each tool will cycle through")); - writeComment(localize("the spindle to verify that the correct tool is in the tool magazine")); - if (getProperty("optionallyMeasureToolsAtStart")) { - writeComment(localize("and to automatically measure it")); - } - writeComment(localize("Once the tools are verified turn BLOCK DELETE on to skip verification")); - */ + if (tools.getNumberOfTools() > 0) { + writeln(""); + /* + writeOptionalBlock(mFormat.format(0), formatComment(localize("Read note"))); // wait for operator + writeComment(localize("With BLOCK DELETE turned off each tool will cycle through")); + writeComment(localize("the spindle to verify that the correct tool is in the tool magazine")); + if (getProperty("optionallyMeasureToolsAtStart")) { + writeComment(localize("and to automatically measure it")); + } + writeComment(localize("Once the tools are verified turn BLOCK DELETE on to skip verification")); + */ - // 6/21/21 | Gavin Williams | will1742 - writeComment("Load and probe tools"); + // 6/21/21 | Gavin Williams | will1742 + writeComment("Load and probe tools"); - // Display general tool probe info - displayMedia("toolProbeReminder.jpg", !getProperty("loadToolsAtStart")); - writeFunction(mFormat.format(0)); + // Display general tool probe info + displayMedia("toolProbeReminder.jpg", !getProperty("loadToolsAtStart")); + writeFunction(mFormat.format(0)); - let parsedTools = []; + let parsedTools = []; - // Maybe should be anonymous function?? - function defaultFill() { - parsedTools = [] - for (var i = 0; i < tools.getNumberOfTools(); i++){ - parsedTools[i] = tools.getTool(i).number; + // Maybe should be anonymous function?? + function defaultFill() { + parsedTools = [] + for (var i = 0; i < tools.getNumberOfTools(); i++){ + parsedTools[i] = tools.getTool(i).number; + } } - } - - // also maybe anonymous - // TODO: tool.getNumberOfTools needs to be machine-specific constant - function invalidToolNum(toolNum) { - return (toolNum < 1 || toolNum > tools.getNumberOfTools() || tools.getTool(toolNum) == undefined); - } - - // parse string for specific tools to load - if (getProperty("toolsToLoad") != "") { - // get list of numbers - let toolNumArray = getProperty("toolsToLoad").split(','); - // iterate through and fill ranges - for (var i = 0; i < toolNumArray.length; i++){ - toolNumArray[i] = toolNumArray[i].trim(); + // also maybe anonymous + // TODO: tool.getNumberOfTools needs to be machine-specific constant + function invalidToolNum(toolNum) { + return (toolNum < 1 || toolNum > tools.getNumberOfTools() || tools.getTool(toolNum) == undefined); + } - // fill range - if (toolNumArray[i].indexOf("-") >= 0) { - let numRange = toolNumArray[i].split("-"); - if (invalidToolNum(parseInt(numRange[0])) || invalidToolNum(parseInt(numRange[1]))) { + // parse string for specific tools to load + if (getProperty("toolsToLoad") != "") { + // get list of numbers + let toolNumArray = getProperty("toolsToLoad").split(','); + + // iterate through and fill ranges + for (var i = 0; i < toolNumArray.length; i++){ + toolNumArray[i] = toolNumArray[i].trim(); + + // fill range + if (toolNumArray[i].indexOf("-") >= 0) { + let numRange = toolNumArray[i].split("-"); + if (invalidToolNum(parseInt(numRange[0])) || invalidToolNum(parseInt(numRange[1]))) { + defaultFill(); + break; + } + for(var j = numRange[0]; j <= numRange[1]; j++){ + parsedTools.push(parseInt(j)); + } + continue; + } + // check if valid num + if (invalidToolNum(parseInt(toolNumArray[i]))) { defaultFill(); break; } - for(var j = numRange[0]; j <= numRange[1]; j++){ - parsedTools.push(parseInt(j)); - } - continue; - } - // check if valid num - if (invalidToolNum(parseInt(toolNumArray[i]))) { - defaultFill(); - break; + // push single num + parsedTools.push(parseInt(toolNumArray[i])); + } + } else { + defaultFill(); + } + + for (var i = 0; i < tools.getNumberOfTools(); i++) { + var tool = tools.getTool(i); + if (tool.bodyLength + tool.holderLength > MAX_TOOL_LENGTH) { + throw "Error: T" + tool.number + " length greater than machine max" } - // push single num - parsedTools.push(parseInt(toolNumArray[i])); - } - } else { - defaultFill(); - } - for (var i = 0; i < tools.getNumberOfTools(); i++) { - var tool = tools.getTool(i); - if (tool.bodyLength + tool.holderLength > MAX_TOOL_LENGTH) { - throw "Error: T" + tool.number + " length greater than machine max" - } + if (tool.diameter > MAX_TOOL_DIAM) { + throw "Error : T" + tool.number + " diameter greater than machine max" + } - if (tool.diameter > MAX_TOOL_DIAM) { - throw "Error : T" + tool.number + " diameter greater than machine max" - } + if (parsedTools.indexOf(tool.number) <= -1) { + continue; + } - if (parsedTools.indexOf(tool.number) <= -1) { - continue; - } + if (getProperty("measureToolsAtStart") && (tool.type == TOOL_PROBE)) { + continue; + } - if (getProperty("measureToolsAtStart") && (tool.type == TOOL_PROBE)) { - continue; - } + // 07/16/21 | will1742 | Gavin Williams + // Verify tool numbers + if (tool.number == 20 && tool.type != TOOL_PROBE) { + throw "Error: T20 is reserved for Probe"; + } - // 07/16/21 | will1742 | Gavin Williams - // Verify tool numbers - if (tool.number == 20 && tool.type != TOOL_PROBE) { - throw "Error: T20 is reserved for Probe"; - } + if (tool.number == 19) { + throw "Error: T19 is reserved for WCS verification tool"; + } - if (tool.number == 19) { - throw "Error: T19 is reserved for WCS verification tool"; - } + writeln(""); + 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"); + } + comment += " - " + getToolTypeName(tool.type); - writeln(""); - 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"); + writeComment(tool.description); + writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool + displayMedia("toolLoad" + tool.number + ".jpg", !getProperty("loadToolsAtStart")); + writeFunction(mFormat.format(0), formatComment("Load Tool")); //Pause until operator loads tool + writeToolMeasureBlock(tool, true); } - comment += " - " + getToolTypeName(tool.type); - - writeComment(tool.description); - writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool - displayMedia("toolLoad" + tool.number + ".jpg", !getProperty("loadToolsAtStart")); - writeFunction(mFormat.format(0), formatComment("Load Tool")); //Pause until operator loads tool - writeToolMeasureBlock(tool, true); } - } - writeln(""); - writeComment("SETUP FOR OPERATION"); - writeFunction(mFormat.format(131)); + writeln(""); + writeComment("SETUP FOR OPERATION"); + writeBlock(mFormat.format(131)); + } else { + writeComment("SETUP FOR OPERATION"); + } if (staticProperties.useDWO) { var failed = false; @@ -2428,7 +2434,7 @@ function onSection() { } if (hasParameter("notes") && getParameter("notes").toUpperCase().indexOf("APPROVED") <= -1) { - throw "Operation \"" + getParameter("operation-comment") + "\" not approved. See a Peer Mentor." + // throw "Operation \"" + getParameter("operation-comment") + "\" not approved. See a Peer Mentor." } if (staticProperties.showNotes) { diff --git a/Haas_Mills_BIDC/Bechtel VF4.cps b/Haas_Mills_BIDC/Bechtel VF4.cps index 882c1c2..c37b6a3 100644 --- a/Haas_Mills_BIDC/Bechtel VF4.cps +++ b/Haas_Mills_BIDC/Bechtel VF4.cps @@ -928,15 +928,16 @@ function writeToolMeasureBlock(tool, preMeasure) { "K" + xyzFormat.format(getHaasKFactorBIDC(tool)), "I0.", comment - ); // probe tooling - var line1 = "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)"; - - writeWords(getProperty("measureToolsAtStart") ? line1 : "/ " + line1); - if (probeType == 3) { - var line2 = "IF [[#" + (2400 + tool.number) + " GT " + + ); // probe tool + line1 = "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)"; + + writeWords(getProperty("measureToolsAtStart") ? line1 : "/ " + line1); + + if (probeType == 3) { + line2 = "IF [[#" + (2400 + tool.number) + " GT " + (tool.diameter + DIAM_TOLERANCE).toFixed(2) + "] OR [#" + (2400 + tool.number) + " LT " + (tool.diameter - DIAM_TOLERANCE).toFixed(2) + "]] THEN #3000 = 1 (Tool diameter out of tolerance)"; @@ -1331,126 +1332,128 @@ function onOpen() { // 6/21/21 | Gavin Williams | will1742 // Probing now required. Using P9995. // optionally cycle through all tools - var tools = getToolTable(); + if (true) { + var tools = getToolTable(); - var writeFunction = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock; + var writeFunction = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock; - if (tools.getNumberOfTools() > 0) { - writeln(""); - /* - writeOptionalBlock(mFormat.format(0), formatComment(localize("Read note"))); // wait for operator - writeComment(localize("With BLOCK DELETE turned off each tool will cycle through")); - writeComment(localize("the spindle to verify that the correct tool is in the tool magazine")); - if (getProperty("optionallyMeasureToolsAtStart")) { - writeComment(localize("and to automatically measure it")); - } - writeComment(localize("Once the tools are verified turn BLOCK DELETE on to skip verification")); - */ + if (tools.getNumberOfTools() > 0) { + writeln(""); + /* + writeOptionalBlock(mFormat.format(0), formatComment(localize("Read note"))); // wait for operator + writeComment(localize("With BLOCK DELETE turned off each tool will cycle through")); + writeComment(localize("the spindle to verify that the correct tool is in the tool magazine")); + if (getProperty("optionallyMeasureToolsAtStart")) { + writeComment(localize("and to automatically measure it")); + } + writeComment(localize("Once the tools are verified turn BLOCK DELETE on to skip verification")); + */ - // 6/21/21 | Gavin Williams | will1742 - writeComment("Load and probe tools"); + // 6/21/21 | Gavin Williams | will1742 + writeComment("Load and probe tools"); - // Display general tool probe info - displayMedia("toolProbeReminder.jpg", !getProperty("loadToolsAtStart")); - writeFunction(mFormat.format(0)); + // Display general tool probe info + displayMedia("toolProbeReminder.jpg", !getProperty("loadToolsAtStart")); + writeFunction(mFormat.format(0)); - let parsedTools = []; + let parsedTools = []; - // Maybe should be anonymous function?? - function defaultFill() { - parsedTools = [] - for (var i = 0; i < tools.getNumberOfTools(); i++){ - parsedTools[i] = tools.getTool(i).number; + // Maybe should be anonymous function?? + function defaultFill() { + parsedTools = [] + for (var i = 0; i < tools.getNumberOfTools(); i++){ + parsedTools[i] = tools.getTool(i).number; + } } - } - // also maybe anonymous - // TODO: tool.getNumberOfTools needs to be machine-specific constant - function invalidToolNum(toolNum) { - return (toolNum < 1 || toolNum > tools.getNumberOfTools() || tools.getTool(toolNum) == undefined); - } - - // parse string for specific tools to load - if (getProperty("toolsToLoad") != "") { - // get list of numbers - let toolNumArray = getProperty("toolsToLoad").split(','); - - // iterate through and fill ranges - for (var i = 0; i < toolNumArray.length; i++){ - toolNumArray[i] = toolNumArray[i].trim(); - - // fill range - if (toolNumArray[i].indexOf("-") >= 0) { - let numRange = toolNumArray[i].split("-"); - if (invalidToolNum(parseInt(numRange[0])) || invalidToolNum(parseInt(numRange[1]))) { + // also maybe anonymous + // TODO: tool.getNumberOfTools needs to be machine-specific constant + function invalidToolNum(toolNum) { + return (toolNum < 1 || toolNum > tools.getNumberOfTools() || tools.getTool(toolNum) == undefined); + } + + // parse string for specific tools to load + if (getProperty("toolsToLoad") != "") { + // get list of numbers + let toolNumArray = getProperty("toolsToLoad").split(','); + + // iterate through and fill ranges + for (var i = 0; i < toolNumArray.length; i++){ + toolNumArray[i] = toolNumArray[i].trim(); + + // fill range + if (toolNumArray[i].indexOf("-") >= 0) { + let numRange = toolNumArray[i].split("-"); + if (invalidToolNum(parseInt(numRange[0])) || invalidToolNum(parseInt(numRange[1]))) { + defaultFill(); + break; + } + for(var j = numRange[0]; j <= numRange[1]; j++){ + parsedTools.push(parseInt(j)); + } + continue; + } + // check if valid num + if (invalidToolNum(parseInt(toolNumArray[i]))) { defaultFill(); break; } - for(var j = numRange[0]; j <= numRange[1]; j++){ - parsedTools.push(parseInt(j)); - } - continue; - } - // check if valid num - if (invalidToolNum(parseInt(toolNumArray[i]))) { - defaultFill(); - break; - } - // push single num - parsedTools.push(parseInt(toolNumArray[i])); - } - } else { - defaultFill(); - } - - for (var i = 0; i < tools.getNumberOfTools(); i++) { - var tool = tools.getTool(i); - if (tool.bodyLength + tool.holderLength > MAX_TOOL_LENGTH) { - throw "Error: T" + tool.number + " length greater than machine max" + // push single num + parsedTools.push(parseInt(toolNumArray[i])); + } + } else { + defaultFill(); } - if (tool.diameter > MAX_TOOL_DIAM) { - throw "Error : T" + tool.number + " diameter greater than machine max" - } + for (var i = 0; i < tools.getNumberOfTools(); i++) { + var tool = tools.getTool(i); + if (tool.bodyLength + tool.holderLength > MAX_TOOL_LENGTH) { + throw "Error: T" + tool.number + " length greater than machine max" + } - if (parsedTools.indexOf(tool.number) <= -1) { - continue; - } + if (tool.diameter > MAX_TOOL_DIAM) { + throw "Error : T" + tool.number + " diameter greater than machine max" + } - if (getProperty("measureToolsAtStart") && (tool.type == TOOL_PROBE)) { - continue; - } + if (parsedTools.indexOf(tool.number) <= -1) { + continue; + } - // 07/16/21 | will1742 | Gavin Williams - // Verify tool numbers - if (tool.number == 20 && tool.type != TOOL_PROBE) { - throw "Error: T20 is reserved for Probe"; - } + if (getProperty("measureToolsAtStart") && (tool.type == TOOL_PROBE)) { + continue; + } - if (tool.number == 19) { - throw "Error: T19 is reserved for WCS verification tool"; - } + // 07/16/21 | will1742 | Gavin Williams + // Verify tool numbers + if (tool.number == 20 && tool.type != TOOL_PROBE) { + throw "Error: T20 is reserved for Probe"; + } - writeln(""); - 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 == 19) { + throw "Error: T19 is reserved for WCS verification tool"; + } + + writeln(""); + 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"); + } + comment += " - " + getToolTypeName(tool.type); + writeComment(tool.description); + writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool + displayMedia("toolLoad" + tool.number + ".jpg", !getProperty("loadToolsAtStart")); + writeFunction(mFormat.format(0), formatComment("Load Tool")); //Pause until operator loads tool + writeToolMeasureBlock(tool, true); } - comment += " - " + getToolTypeName(tool.type); - writeComment(tool.description); - writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool - displayMedia("toolLoad" + tool.number + ".jpg", !getProperty("loadToolsAtStart")); - writeFunction(mFormat.format(0), formatComment("Load Tool")); //Pause until operator loads tool - writeToolMeasureBlock(tool, true); } + + writeln(""); + writeComment("SETUP FOR OPERATION"); + writeBlock(mFormat.format(131)); } - - writeln(""); - writeComment("SETUP FOR OPERATION"); - writeFunction(mFormat.format(131)); - + if (staticProperties.useDWO) { var failed = false; var dynamicWCSs = {}; @@ -2339,7 +2342,7 @@ function onSection() { } else if (getProperty("hasAAxis") != "false") { writeBlock(gFormat.format(0), aOutput.format(0)); } - displayMedia("xyWCSCheck.jpg", false); + displayMedia("xyWCSCheck.jpg"); writeBlock(mFormat.format(0), formatComment("Open door")); /* displayMedia("Net Share/Media/checkPrompt.jpg"); @@ -2351,7 +2354,7 @@ function onSection() { writeWords("N" + nFormat.format(gotoRef['Y']), mFormat.format(131), formatComment("End Multimedia")); */ writeBlock(gFormat.format(55), gFormat.format(43), hFormat.format(19), zOutput.format(stockTopZ)); - displayMedia("zWCSCheck.jpg", false); + displayMedia("zWCSCheck.jpg"); writeBlock(mFormat.format(0), formatComment("Open door")); writeBlock(mFormat.format(131), formatComment("End Multimedia")); @@ -2413,7 +2416,7 @@ function onSection() { } if (!isFirstSection()) { - displayMedia("checkPartTool.jpg", false); + displayMedia("checkPartTool.jpg"); writeBlock(mFormat.format(0)); writeBlock(mFormat.format(131)); } @@ -2432,7 +2435,7 @@ function onSection() { } if (hasParameter("notes") && getParameter("notes").toUpperCase().indexOf("APPROVED") <= -1) { - throw "Operation \"" + getParameter("operation-comment") + "\" not approved. See a Peer Mentor." + // throw "Operation \"" + getParameter("operation-comment") + "\" not approved. See a Peer Mentor." } if (staticProperties.showNotes) { @@ -2790,7 +2793,7 @@ function onSection() { var toolDistance = initialPosition.z - stockTopZ; // Prompt user to check stock-tool distance - displayMedia("checkDistance" + toolDistance.toPrecision(2).toString().replace(".", "_") + ".jpg", false); + displayMedia("checkDistance" + toolDistance.toPrecision(2).toString().replace(".", "_") + ".jpg"); writeBlock(mFormat.format(0)); writeComment("OPEN DOOR"); //displayMedia("Net Share/Media/checkPrompt.jpg");