Set number of flutes per tool

Bechtel-Innovation-Design-Center · Jun 28, 2021 · f4e956c · f4e956c
1 parent 9fa2a50
commit f4e956c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/Haas_Next_Generation/README.txt b/Haas_Next_Generation/README.txt
@@ -26,10 +26,15 @@ 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.
 
+- Macro references can be found on page 189 of the milling manual
diff --git a/Haas_Next_Generation/haas vf2.cps b/Haas_Next_Generation/haas vf2.cps
@@ -892,6 +892,7 @@ function writeToolMeasureBlock(tool, preMeasure) {
   } else { // use Macro P9995 to measure tools
     // writeFunction("T" + toolFormat.format(tool.number), mFormat.format(6)); // get tool
     // TODO: fix tool type
+    setMacro(1600 + tool.number, tool.numberOfFlutes, "Number of Flutes");
     writeFunction(
       gFormat.format(65),
       "P9995",
@@ -909,6 +910,13 @@ function writeToolMeasureBlock(tool, preMeasure) {
   measureTool = false;
 }
 
+// 6/28/21 | Gavin Williams | will1742
+// 002 Improved Probing
+// sets specified macro number with value
+function setMacro(macro, value, comment) {
+  writeWords("#" + macro + "=" + value, "(" + comment + ")");
+}
+
 function defineMachineModel() {
   var useTCPC = staticProperties.useTCPC;
   switch (staticProperties.machineModel) {