Merge branch 'Development' into Production

Bechtel-Innovation-Design-Center · Jul 13, 2021 · 10ac316 · 10ac316
2 parents 3e4b8c5 + ee851e2
commit 10ac316
Show file tree

Hide file tree

Showing 2 changed files with 295 additions and 84 deletions.
diff --git a/Haas_Next_Generation/README.txt b/Haas_Next_Generation/README.txt
@@ -3,6 +3,7 @@ Changelog
 06/14/21 Added media and QA
 06/15/21 Check tool distance from stock, finalized QA
 06/21/21 Tool probing required, tool probing now uses P9995
+06/28/21 Tool specific probing added, with cases for type of probing and k factor
 
 Function List:
 
@@ -25,11 +26,19 @@ takeInput(prompt, options)
 
     any number of options can be input, sequenceNumbers will be adjusted to compensate
 
+setMacro(macro, value, comment)
+    sets specified macro, adds inline comment
+
+
 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.
 
+<<<<<<< HEAD
 - Potential TODO is to remove as much halting from QA as possible
+=======
+- Macro references can be found on page 189 of the milling manual
+>>>>>>> Development