Skip to content

Commit

Permalink
Typo Corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
will1742 committed Jun 24, 2021
1 parent d5c9ff3 commit 4023ab2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Haas_Next_Generation/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

11 changes: 5 additions & 6 deletions Haas_Next_Generation/haas vf2.cps
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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"));
Expand All @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -4181,15 +4180,15 @@ function onClose() {
writeln("%");
}

function verif(str) {1
function verif(str) {
var hash = 0;
if (str.length == 0) {
return hash;
}
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;
}
Expand Down

0 comments on commit 4023ab2

Please sign in to comment.