Merge branch 'Development' into Production

Haas_Next_Generation/README.txt

@@ -0,0 +1,34 @@
+Changelog
+06/09/21 Modified to begin coolant after initial positioning rather than after tool change
+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
+
+Function List:
+
+displayMedia(file)
+    Takes a file path as a string and displays the file at that path
+
+getTA(file, seqNum, gotoRef)
+    file = String, filepath
+        file at filepath will be displayed as error message
+    seqNum = int, sequenceNumber to start at
+    gotoRef = int, sequenceNumber to jump to after halting and prompting user
+
+takeInput(prompt, options)
+    prompt = String, prompt to offer operator during selection
+    options = char [], list of char options to accept as input
+
+    Returns dict char->int
+        char represents options, 
+        int represents sequenceNumber associated with the option
+
+    any number of options can be input, sequenceNumbers will be adjusted to compensate
+
+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.
+