updated DT to supress m130 calls

Haas_Mills_BIDC/Bechtel DT.cps

@@ -448,8 +448,8 @@ properties = {/*
     scope: "post"
   },
   displayMediaCalls: {
-    title: "M130 Media calls",
-    description: "Enable to include M130 part images with the NC file..",
+    title: "Display Media",
+    description: "Enable to include M130 part images with the NC file, disable to see the information in comments.",
     group: 4,
     value: false,
     scope: "post"
@@ -1363,7 +1363,6 @@ function onOpen() {
 
     // Display general tool probe info
     displayMedia("toolProbeReminder.jpg", !getProperty("loadToolsAtStart"));
-    writeFunction(mFormat.format(0));
 
     let parsedTools = [];
 
@@ -1452,8 +1451,8 @@ 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
+      displayMedia("toolLoad" + tool.number + ".jpg", !getProperty("loadToolsAtStart"), "Load Tool");
+      // writeFunction(formatComment("Load Tool")); //Pause until operator loads tool
       writeToolMeasureBlock(tool, true);
     }
   }
@@ -2333,7 +2332,6 @@ function onSection() {
     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);
-    writeBlock(mFormat.format(0));
   }
 
 
@@ -2348,8 +2346,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);
-    writeBlock(mFormat.format(0), formatComment("Open door"));
+    displayMedia("xyWCSCheck.jpg", false, "Open door");
     /*
     displayMedia("Net Share/Media/checkPrompt.jpg");
     var gotoRef = takeInput("Is the pencil centered above your stock? stock? [Y/N]", ['N', 'Y']);
@@ -2360,9 +2357,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);
-    writeBlock(mFormat.format(0), formatComment("Open door"));
-    writeBlock(mFormat.format(131), formatComment("End Multimedia"));
+    displayMedia("zWCSCheck.jpg", false, "Open door", "End Multimedia");
 
     /*
     displayMedia("Net Share/Media/checkPrompt.jpg");
@@ -2422,9 +2417,7 @@ function onSection() {
   }
 
   if (!isFirstSection() && getProperty("toolLengthValidation")) {
-    displayMedia("checkPartTool.jpg", false);
-    writeBlock(mFormat.format(0));
-    writeBlock(mFormat.format(131));
+    displayMedia("checkPartTool.jpg", false, "Check Part and Tool");
   } else if (!isFirstSection()) {
     writeBlock(mFormat.format(1));
     writeComment("Check Part and Tool");
@@ -2444,7 +2437,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) {
@@ -2806,10 +2799,8 @@ function onSection() {
 
     // Prompt user to check stock-tool distance
     displayMedia("checkDistance" + toolDistance.toPrecision(2).toString().replace(".", "_") + ".jpg", false);
-    writeBlock(mFormat.format(0));
     writeComment("OPEN DOOR");
     //displayMedia("Net Share/Media/checkPrompt.jpg");
-    writeBlock(mFormat.format(131));
 
     // asks user if measured height is accurate to displayed
     //var gotoRef = takeInput(("Is the tool " + toolDistance.toPrecision(3) + "in from the stock? [Y/N]"), ['N', 'Y']);
@@ -2846,11 +2837,23 @@ 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 || !getProperty("displayMediaCalls")) {
-    writeOptionalBlock(mFormat.format(130), formatComment("Net Share/Media/" + file));
+function displayMedia(file, isOptional, comment) {
+  var writeFunction = isOptional ? writeOptionalBlock : writeBlock;
+
+  if (!getProperty("displayMediaCalls")) {
+    writeFunction(mFormat.format(0));
+    comment ?
+      writeComment(comment)
+    :
+      null;
+    return;
   } else {
-    writeBlock(mFormat.format(130), formatComment("Net Share/Media/" + file));
+    writeFunction(mFormat.format(130), formatComment("Net Share/Media/" + file));
+    comment ?
+      writeFunction(mFormat.format(0), formatComment(comment))
+    :
+      writeFunction(mFormat.format(0));
+    writeFunction(mFormat.format(131));
   }
 }
 
@@ -4552,22 +4555,19 @@ function onClose() {
       }
       writeBlock("T" + toolFormat.format(tool.number), mFormat.format(6)); // get tool
       displayMedia("removeTool" + tool.number + ".jpg", false);
-      writeBlock(mFormat.format(0));
     }
   }
   writeBlock(mFormat.format(131));
 
   function gotoWithMessage(xLoc, yLoc, fileName) {
     writeBlock(gFormat.format(53), xOutput.format(xLoc), yOutput.format(yLoc));
     displayMedia(fileName, false);
-    writeBlock(mFormat.format(0));
   }
 
   writeln("");
   writeComment("CLEAN MACHINE");
   gotoWithMessage(X_TRAVEL_LIMIT/2, 0, "airGunClean.jpg");
   displayMedia("floodCoolantOff.jpg", false)
-  writeBlock(mFormat.format(0));
   setCoolant(COOLANT_FLOOD);
   gotoWithMessage(0, Y_TRAVEL_LIMIT, "sprayLowerRight.jpg");
   gotoWithMessage(X_TRAVEL_LIMIT, Y_TRAVEL_LIMIT, "sprayLowerLeft.jpg");