diff --git a/Haas_Mills_BIDC/Bechtel DT.cps b/Haas_Mills_BIDC/Bechtel DT.cps index 6502706..7fce9d2 100644 --- a/Haas_Mills_BIDC/Bechtel DT.cps +++ b/Haas_Mills_BIDC/Bechtel DT.cps @@ -2833,10 +2833,10 @@ function onSection() { subprogramDefine(initialPosition, abc, retracted, zIsOutput); } -// Added 6/14/21 | Gavin Williams | will1742 -// Issue 001 Input and Validation -// Displays a file: MP4, MOV, PNG, JPEG. 1920x1080 -// Input: Absolute path to file +// Added 9/30/21 | Kevin Pan | pan261 +// Issue 001 Input and Validation, Issue 029 +// Displays a file: MP4, MOV, PNG, JPEG. 1920x1080 or comments if displayeMediaCalls is false +// Input: Absolute path to file, optional calls, comment to write with m0 function displayMedia(file, isOptional, comment) { var writeFunction = isOptional ? writeOptionalBlock : writeBlock; @@ -4565,7 +4565,7 @@ function onClose() { writeln(""); writeComment("CLEAN MACHINE"); - gotoWithMessage(X_TRAVEL_LIMIT/2, 0, "airGunClean.jpg", "Clean air gun"); + gotoWithMessage(X_TRAVEL_LIMIT/2, 0, "airGunClean.jpg", "Use air gun to clean"); displayMedia("floodCoolantOff.jpg", false, "Turn flood coolant off") setCoolant(COOLANT_FLOOD); gotoWithMessage(0, Y_TRAVEL_LIMIT, "sprayLowerRight.jpg", "Spray lower right"); diff --git a/Haas_Mills_BIDC/Bechtel VF2.cps b/Haas_Mills_BIDC/Bechtel VF2.cps index cc2224c..d731d91 100644 --- a/Haas_Mills_BIDC/Bechtel VF2.cps +++ b/Haas_Mills_BIDC/Bechtel VF2.cps @@ -2833,10 +2833,10 @@ function onSection() { subprogramDefine(initialPosition, abc, retracted, zIsOutput); } -// Added 6/14/21 | Gavin Williams | will1742 -// Issue 001 Input and Validation -// Displays a file: MP4, MOV, PNG, JPEG. 1920x1080 -// Input: Absolute path to file +// Added 9/30/21 | Kevin Pan | pan261 +// Issue 001 Input and Validation, Issue 029 +// Displays a file: MP4, MOV, PNG, JPEG. 1920x1080 or comments if displayeMediaCalls is false +// Input: Absolute path to file, optional calls, comment to write with m0 function displayMedia(file, isOptional, comment) { var writeFunction = isOptional ? writeOptionalBlock : writeBlock; @@ -4565,7 +4565,7 @@ function onClose() { writeln(""); writeComment("CLEAN MACHINE"); - gotoWithMessage(X_TRAVEL_LIMIT/2, 0, "airGunClean.jpg", "Clean air gun"); + gotoWithMessage(X_TRAVEL_LIMIT/2, 0, "airGunClean.jpg", "Use air gun to clean"); displayMedia("floodCoolantOff.jpg", false, "Turn flood coolant off") setCoolant(COOLANT_FLOOD); gotoWithMessage(0, Y_TRAVEL_LIMIT, "sprayLowerRight.jpg", "Spray lower right"); diff --git a/Haas_Mills_BIDC/Bechtel VF4.cps b/Haas_Mills_BIDC/Bechtel VF4.cps index 7aec376..e08e8ac 100644 --- a/Haas_Mills_BIDC/Bechtel VF4.cps +++ b/Haas_Mills_BIDC/Bechtel VF4.cps @@ -2836,10 +2836,10 @@ function onSection() { subprogramDefine(initialPosition, abc, retracted, zIsOutput); } -// Added 6/14/21 | Gavin Williams | will1742 -// Issue 001 Input and Validation -// Displays a file: MP4, MOV, PNG, JPEG. 1920x1080 -// Input: Absolute path to file +// Added 9/30/21 | Kevin Pan | pan261 +// Issue 001 Input and Validation, Issue 029 +// Displays a file: MP4, MOV, PNG, JPEG. 1920x1080 or comments if displayeMediaCalls is false +// Input: Absolute path to file, optional calls, comment to write with m0 function displayMedia(file, isOptional, comment) { var writeFunction = isOptional ? writeOptionalBlock : writeBlock; @@ -4568,7 +4568,7 @@ function onClose() { writeln(""); writeComment("CLEAN MACHINE"); - gotoWithMessage(X_TRAVEL_LIMIT/2, 0, "airGunClean.jpg", "Clean air gun"); + gotoWithMessage(X_TRAVEL_LIMIT/2, 0, "airGunClean.jpg", "Use air gun to clean"); displayMedia("floodCoolantOff.jpg", false, "Turn flood coolant off"); setCoolant(COOLANT_FLOOD); gotoWithMessage(0, Y_TRAVEL_LIMIT, "sprayLowerRight.jpg", "Spray lower right");