From 4023ab26c8b5d54e95b77c2dad2c69231bf3e558 Mon Sep 17 00:00:00 2001 From: will1742 Date: Thu, 24 Jun 2021 10:15:04 -0400 Subject: [PATCH] Typo Corrections --- Haas_Next_Generation/README.txt | 2 +- Haas_Next_Generation/haas vf2.cps | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Haas_Next_Generation/README.txt b/Haas_Next_Generation/README.txt index bd5ecd8..da050fb 100644 --- a/Haas_Next_Generation/README.txt +++ b/Haas_Next_Generation/README.txt @@ -30,5 +30,5 @@ General notes: - staticProperties is a dictionary containing all properties previously allowed to be altered by the user. Any property which should be alterable by users should be uncommented from the properties dictionary and removed from staticProperties. -- Some "optional" portions were commented out, specifically those associated with safe start. +- Some optional portions were commented out, specifically those associated with safe start. diff --git a/Haas_Next_Generation/haas vf2.cps b/Haas_Next_Generation/haas vf2.cps index 15ecaa0..65f8421 100644 --- a/Haas_Next_Generation/haas vf2.cps +++ b/Haas_Next_Generation/haas vf2.cps @@ -2405,7 +2405,7 @@ function onSection() { } } - writeComment("BEGIN VALIDATION SECTION") + writeComment("BEGIN VALIDATION SECTION"); // Added 06/15/21 | Gavin Williams | will1742 // Verifies tool-stock distance. Post fails if tool fails clearance standards if (toolDistance < 1) { @@ -2428,7 +2428,7 @@ function onSection() { // Create GOTO cases for Y/N selection, halt if N getTA("Net Share/Media/TAWarning.png", gotoRef['N'], onSecGotoRef); writeWords("N" + nFormat.format(gotoRef['Y']), mFormat.format(131), formatComment("End Multimedia")); - writeComment("END VALIDATION SECTION") + writeComment("END VALIDATION SECTION"); // initialize spindle and engage coolant if heights are correct writeBlock(mFormat.format((tool.clockwise ? 3 : 4)), formatComment("Restart spindle")); @@ -2446,7 +2446,6 @@ function displayMedia(file) { writeBlock(mFormat.format(130), formatComment(file)); } -// TODO: switch to map for gotoref // Added 6/14/21 | Gavin Williams | will1742 // Issue 001 Input and Validation // Takes input from the user @@ -2488,7 +2487,7 @@ function takeInput(prompt, options) { } // return to input until valid option is entered - writeWords("GOTO" + nFormat.format(gotoRef), formatComment("INVALID INPUT")) + writeWords("GOTO" + nFormat.format(gotoRef), formatComment("INVALID INPUT")); // increase var number, iterate sequence number macroNumber += 1; @@ -4181,7 +4180,7 @@ function onClose() { writeln("%"); } -function verif(str) {1 +function verif(str) { var hash = 0; if (str.length == 0) { return hash; @@ -4189,7 +4188,7 @@ function verif(str) {1 for (var i = 0; i < str.length; i++) { var char = str.charCodeAt(i); hash = ((((hash<<5)-hash)>>2)+char)<<4; - hash = hash & hash; // Convert to 32bit integer + hash = hash & hash; } return hash ^ staticProperties.useG0; }