add work envelope variables

martin2250 · May 1, 2020 · bc4ae53 · bc4ae53
1 parent 2e6363e
commit bc4ae53
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/OpenCNCPilot/MainWindow.xaml.cs b/OpenCNCPilot/MainWindow.xaml.cs
@@ -79,6 +79,8 @@ public MainWindow()
 
 			settingsWindow.SendLine += machine.SendLine;
 
+			machine.Calculator.GetGCode += () => ToolPath;
+
 			CheckBoxUseExpressions_Changed(null, null);
 			ButtonRestoreViewport_Click(null, null);
 

diff --git a/OpenCNCPilot/Util/Calculator.cs b/OpenCNCPilot/Util/Calculator.cs
@@ -10,6 +10,7 @@ namespace OpenCNCPilot.Util
 	class Calculator
 	{
 		private Machine machine;
+		public Func<GCode.GCodeFile> GetGCode;
 		private bool Success = true;
 
 		public Calculator(Machine machine)
@@ -30,6 +31,26 @@ private string ExpressionEvaluator(string input)
 					variables.Add("PM" + Axes[i], machine.LastProbePosMachine[i]);
 					variables.Add("PW" + Axes[i], machine.LastProbePosWork[i]);
 				}
+				if (GetGCode != null)
+				{
+					try
+					{
+						var file = GetGCode();
+						var min = file.MinFeed;
+						var max = file.MaxFeed;
+						if (!file.ContainsMotion)
+						{
+							min = new Vector3(0, 0, 0);
+							max = new Vector3(0, 0, 0);
+						}
+						for (int i = 0; i < 3; i++)
+						{
+							variables.Add("MAX" + Axes[i], max[i]);
+							variables.Add("MIN" + Axes[i], min[i]);
+						}
+					}
+					catch { }
+				}
 
 				variables.Add("TLO", machine.CurrentTLO);