diff --git a/Haas_Mills_BIDC/Bechtel DT.cps b/Haas_Mills_BIDC/Bechtel DT.cps index 184e038..d5352a4 100644 --- a/Haas_Mills_BIDC/Bechtel DT.cps +++ b/Haas_Mills_BIDC/Bechtel DT.cps @@ -436,15 +436,7 @@ properties = {/* description: "Tool Probing. By turning this off, you accept responsibility for any resulting crashes.", group: 99, type: "boolean", - value: true, - scope: "post" - }, - loadToolsAtStart: { - title: "Tool Loading", - description: "Tool Loading. By turning this off, you accept responsibility for any resulting crashes.", - group: 99, - type: "boolean", - value: true, + value: false, scope: "post" } }; @@ -894,8 +886,8 @@ function prepareForToolCheck() { } function writeToolMeasureBlock(tool, preMeasure) { - var writeFunction = getProperty("measureToolsAtStart") ? writeBlock : writeOptionalBlock; - // var writeFunction = writeBlock; + // var writeFunction = measureTool ? writeBlock : writeOptionalBlock; + var writeFunction = writeBlock; var comment = measureTool ? formatComment("MEASURE TOOL") : ""; if (!preMeasure) { prepareForToolCheck(); @@ -913,8 +905,8 @@ function writeToolMeasureBlock(tool, preMeasure) { ); } else { // use Macro P9995 to measure tools // writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); // get tool - setMacro(1600 + tool.number, tool.numberOfFlutes, "Number of Flutes", !getProperty("measureToolsAtStart")); - setMacro(2400 + tool.number, xyzFormat.format(tool.diameter), "Tool Diameter", !getProperty("measureToolsAtStart")); + setMacro(1600 + tool.number, tool.numberOfFlutes, "Number of Flutes"); + setMacro(2400 + tool.number, xyzFormat.format(tool.diameter), "Tool Diameter"); var probeType = getHaasProbingTypeBIDC(tool, false); writeFunction( gFormat.format(65), @@ -929,20 +921,16 @@ function writeToolMeasureBlock(tool, preMeasure) { "I0.", comment ); // probe tool - line1 = "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)"; - - writeWords(getProperty("measureToolsAtStart") ? line1 : "/ " + line1); + (tool.bodyLength + tool.holderLength - LENGTH_TOLERANCE).toFixed(2) + "]] THEN #3000 = 1 (Tool length out of tolerance)"); if (probeType == 3) { - line2 = "IF [[#" + (2400 + tool.number) + " GT " + + writeWords("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)"; - - writeWords(getProperty("measureToolsAtStart") ? line2 : "/ " + line2); + (tool.diameter - DIAM_TOLERANCE).toFixed(2) + "]] THEN #3000 = 1 (Tool diameter out of tolerance)"); } } measureTool = false; @@ -951,12 +939,8 @@ function writeToolMeasureBlock(tool, preMeasure) { // 6/28/21 | Gavin Williams | will1742 // 002 Improved Probing // sets specified macro number with value -function setMacro(macro, value, comment, isOptional) { - if (isOptional) { - writeWords("/ #" + macro + "=" + value, "(" + comment + ")"); - } else { - writeWords("#" + macro + "=" + value, "(" + comment + ")"); - } +function setMacro(macro, value, comment) { + writeWords("#" + macro + "=" + value, "(" + comment + ")"); } function defineMachineModel() { @@ -1332,11 +1316,8 @@ function onOpen() { // 6/21/21 | Gavin Williams | will1742 // Probing now required. Using P9995. // optionally cycle through all tools - if (true) { + if (staticProperties.optionallyCycleToolsAtStart || getProperty("measureToolsAtStart")) { var tools = getToolTable(); - - var writeFunction = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock; - if (tools.getNumberOfTools() > 0) { writeln(""); /* @@ -1352,13 +1333,11 @@ function onOpen() { // 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)); + displayMedia("toolProbeReminder.jpg"); + writeBlock(mFormat.format(0)); let parsedTools = []; - // Maybe should be anonymous function?? function defaultFill() { parsedTools = [] for (var i = 0; i < tools.getNumberOfTools(); i++){ @@ -1366,25 +1345,19 @@ function onOpen() { } } - // also maybe anonymous - // TODO: tool.getNumberOfTools needs to be machine-specific constant - function invalidToolNum(toolNum) { + function validateToolNum(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]))) { + if (validateToolNum(parseInt(numRange[0])) || validateToolNum(parseInt(numRange[1]))) { defaultFill(); break; } @@ -1393,12 +1366,10 @@ function onOpen() { } continue; } - // check if valid num - if (invalidToolNum(parseInt(toolNumArray[i]))) { + if (validateToolNum(parseInt(toolNumArray[i]))) { defaultFill(); break; } - // push single num parsedTools.push(parseInt(toolNumArray[i])); } } else { @@ -1442,10 +1413,14 @@ function onOpen() { } 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); + if (getProperty("measureToolsAtStart")) { + writeBlock("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool + displayMedia("toolLoad" + tool.number + ".jpg"); + writeBlock(mFormat.format(0), formatComment("Load Tool")); //Pause until operator loads tool + writeToolMeasureBlock(tool, true); + } else { + writeToolCycleBlock(tool); + } } } @@ -2321,7 +2296,7 @@ function onSection() { // writeBlock(gFormat.format(53), "X" + macroFormat.format(100), yOutput.format(0)); writeBlock(gFormat.format(55), gFormat.format(0), xOutput.format(Stock_X_55)); writeBlock(gFormat.format(53), gFormat.format(0), yOutput.format(0)); - displayMedia("loadStock.jpg", false); + displayMedia("loadStock.jpg"); writeBlock(mFormat.format(0)); } @@ -2337,7 +2312,7 @@ function onSection() { writeBlock("T" + toolFormat.format(19), mFormat.format(6)); //Changes Tool writeBlock(gFormat.format(55), gFormat.format(0), forceX.format(stockMidX), forceY.format(stockMidY)); - displayMedia("xyWCSCheck.jpg", false); + displayMedia("xyWCSCheck.jpg"); writeBlock(mFormat.format(0), formatComment("Open door")); /* displayMedia("Net Share/Media/checkPrompt.jpg"); @@ -2349,7 +2324,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")); @@ -2411,7 +2386,7 @@ function onSection() { } if (!isFirstSection()) { - displayMedia("checkPartTool.jpg", false); + displayMedia("checkPartTool.jpg"); writeBlock(mFormat.format(0)); writeBlock(mFormat.format(131)); } @@ -2788,7 +2763,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"); @@ -2828,12 +2803,8 @@ function onSection() { // Issue 001 Input and Validation // Displays a file: MP4, MOV, PNG, JPEG. 1920x1080 // Input: Absolute path to file -function displayMedia(file, isOptional) { - if (isOptional) { - writeOptionalBlock(mFormat.format(130), formatComment("Net Share/Media/" + file)); - } else { - writeBlock(mFormat.format(130), formatComment("Net Share/Media/" + file)); - } +function displayMedia(file) { + writeBlock(mFormat.format(130), formatComment("Net Share/Media/" + file)); } // Added 6/14/21 | Gavin Williams | will1742 @@ -2851,7 +2822,7 @@ function takeInput(prompt, options) { if (macroNumber > 549) macroNumber = 500; // init macro var to 0 - setMacro(macroNumber, 0, "Initialize macro variable", false); + setMacro(macroNumber, 0, "Initialize macro variable"); // disply prompt and save response writeBlock(mFormat.format(109), "P" + nFormat.format(macroNumber), formatComment(prompt)); @@ -4533,7 +4504,7 @@ function onClose() { continue; } writeBlock("T" + toolFormat.format(tool.number), mFormat.format(6)); // get tool - displayMedia("removeTool" + tool.number + ".jpg", false); + displayMedia("removeTool" + tool.number + ".jpg"); writeBlock(mFormat.format(0)); } } @@ -4541,14 +4512,14 @@ function onClose() { function gotoWithMessage(xLoc, yLoc, fileName) { writeBlock(gFormat.format(53), xOutput.format(xLoc), yOutput.format(yLoc)); - displayMedia(fileName, false); + displayMedia(fileName); writeBlock(mFormat.format(0)); } writeln(""); writeComment("CLEAN MACHINE"); gotoWithMessage(X_TRAVEL_LIMIT/2, 0, "airGunClean.jpg"); - displayMedia("floodCoolantOff.jpg", false) + displayMedia("floodCoolantOff.jpg") writeBlock(mFormat.format(0)); setCoolant(COOLANT_FLOOD); gotoWithMessage(0, Y_TRAVEL_LIMIT, "sprayLowerRight.jpg"); diff --git a/Haas_Mills_BIDC/Bechtel VF4.cps b/Haas_Mills_BIDC/Bechtel VF4.cps index c37b6a3..29a6290 100644 --- a/Haas_Mills_BIDC/Bechtel VF4.cps +++ b/Haas_Mills_BIDC/Bechtel VF4.cps @@ -438,14 +438,6 @@ properties = {/* type: "boolean", value: true, scope: "post" - }, - loadToolsAtStart: { - title: "Tool Loading", - description: "Tool Loading. By turning this off, you accept responsibility for any resulting crashes.", - group: 99, - type: "boolean", - value: true, - scope: "post" } }; @@ -894,8 +886,8 @@ function prepareForToolCheck() { } function writeToolMeasureBlock(tool, preMeasure) { - var writeFunction = getProperty("measureToolsAtStart") ? writeBlock : writeOptionalBlock; - // var writeFunction = writeBlock; + // var writeFunction = measureTool ? writeBlock : writeOptionalBlock; + var writeFunction = writeBlock; var comment = measureTool ? formatComment("MEASURE TOOL") : ""; if (!preMeasure) { prepareForToolCheck(); @@ -913,8 +905,8 @@ function writeToolMeasureBlock(tool, preMeasure) { ); } else { // use Macro P9995 to measure tools // writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); // get tool - setMacro(1600 + tool.number, tool.numberOfFlutes, "Number of Flutes", !getProperty("measureToolsAtStart")); - setMacro(2400 + tool.number, xyzFormat.format(tool.diameter), "Tool Diameter", !getProperty("measureToolsAtStart")); + setMacro(1600 + tool.number, tool.numberOfFlutes, "Number of Flutes"); + setMacro(2400 + tool.number, xyzFormat.format(tool.diameter), "Tool Diameter"); var probeType = getHaasProbingTypeBIDC(tool, false); writeFunction( gFormat.format(65), @@ -929,20 +921,16 @@ function writeToolMeasureBlock(tool, preMeasure) { "I0.", comment ); // probe tool - line1 = "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)"; - - writeWords(getProperty("measureToolsAtStart") ? line1 : "/ " + line1); + (tool.bodyLength + tool.holderLength - LENGTH_TOLERANCE).toFixed(2) + "]] THEN #3000 = 1 (Tool length out of tolerance)"); if (probeType == 3) { - line2 = "IF [[#" + (2400 + tool.number) + " GT " + + writeWords("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)"; - - writeWords(getProperty("measureToolsAtStart") ? line2 : "/ " + line2); + (tool.diameter - DIAM_TOLERANCE).toFixed(2) + "]] THEN #3000 = 1 (Tool diameter out of tolerance)"); } } measureTool = false; @@ -951,12 +939,8 @@ function writeToolMeasureBlock(tool, preMeasure) { // 6/28/21 | Gavin Williams | will1742 // 002 Improved Probing // sets specified macro number with value -function setMacro(macro, value, comment, isOptional) { - if (isOptional) { - writeWords("/ #" + macro + "=" + value, "(" + comment + ")"); - } else { - writeWords("#" + macro + "=" + value, "(" + comment + ")"); - } +function setMacro(macro, value, comment) { + writeWords("#" + macro + "=" + value, "(" + comment + ")"); } function defineMachineModel() { @@ -1332,11 +1316,8 @@ function onOpen() { // 6/21/21 | Gavin Williams | will1742 // Probing now required. Using P9995. // optionally cycle through all tools - if (true) { + if (staticProperties.optionallyCycleToolsAtStart || getProperty("measureToolsAtStart")) { var tools = getToolTable(); - - var writeFunction = getProperty("loadToolsAtStart") ? writeBlock : writeOptionalBlock; - if (tools.getNumberOfTools() > 0) { writeln(""); /* @@ -1352,13 +1333,11 @@ function onOpen() { // 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)); + displayMedia("toolProbeReminder.jpg"); + writeBlock(mFormat.format(0)); let parsedTools = []; - // Maybe should be anonymous function?? function defaultFill() { parsedTools = [] for (var i = 0; i < tools.getNumberOfTools(); i++){ @@ -1366,25 +1345,19 @@ function onOpen() { } } - // also maybe anonymous - // TODO: tool.getNumberOfTools needs to be machine-specific constant - function invalidToolNum(toolNum) { + function validateToolNum(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]))) { + if (validateToolNum(parseInt(numRange[0])) || validateToolNum(parseInt(numRange[1]))) { defaultFill(); break; } @@ -1393,12 +1366,10 @@ function onOpen() { } continue; } - // check if valid num - if (invalidToolNum(parseInt(toolNumArray[i]))) { + if (validateToolNum(parseInt(toolNumArray[i]))) { defaultFill(); break; } - // push single num parsedTools.push(parseInt(toolNumArray[i])); } } else { @@ -1442,10 +1413,14 @@ function onOpen() { } 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); + if (getProperty("measureToolsAtStart")) { + writeBlock("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool + displayMedia("toolLoad" + tool.number + ".jpg"); + writeBlock(mFormat.format(0), formatComment("Load Tool")); //Pause until operator loads tool + writeToolMeasureBlock(tool, true); + } else { + writeToolCycleBlock(tool); + } } } @@ -2435,7 +2410,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) { @@ -2833,12 +2808,8 @@ function onSection() { // Issue 001 Input and Validation // Displays a file: MP4, MOV, PNG, JPEG. 1920x1080 // Input: Absolute path to file -function displayMedia(file, isOptional) { - if (isOptional) { - writeOptionalBlock(mFormat.format(130), formatComment("Net Share/Media/" + file)); - } else { - writeBlock(mFormat.format(130), formatComment("Net Share/Media/" + file)); - } +function displayMedia(file) { + writeBlock(mFormat.format(130), formatComment("Net Share/Media/" + file)); } // Added 6/14/21 | Gavin Williams | will1742 @@ -2856,7 +2827,7 @@ function takeInput(prompt, options) { if (macroNumber > 549) macroNumber = 500; // init macro var to 0 - setMacro(macroNumber, 0, "Initialize macro variable", false); + setMacro(macroNumber, 0, "Initialize macro variable"); // disply prompt and save response writeBlock(mFormat.format(109), "P" + nFormat.format(macroNumber), formatComment(prompt)); @@ -4538,7 +4509,7 @@ function onClose() { continue; } writeBlock("T" + toolFormat.format(tool.number), mFormat.format(6)); // get tool - displayMedia("removeTool" + tool.number + ".jpg", false); + displayMedia("removeTool" + tool.number + ".jpg"); writeBlock(mFormat.format(0)); } } @@ -4546,14 +4517,14 @@ function onClose() { function gotoWithMessage(xLoc, yLoc, fileName) { writeBlock(gFormat.format(53), xOutput.format(xLoc), yOutput.format(yLoc)); - displayMedia(fileName, false); + displayMedia(fileName); writeBlock(mFormat.format(0)); } writeln(""); writeComment("CLEAN MACHINE"); gotoWithMessage(X_TRAVEL_LIMIT/2, 0, "airGunClean.jpg"); - displayMedia("floodCoolantOff.jpg", false) + displayMedia("floodCoolantOff.jpg") writeBlock(mFormat.format(0)); setCoolant(COOLANT_FLOOD); gotoWithMessage(0, Y_TRAVEL_LIMIT, "sprayLowerRight.jpg");