Check for TinyG aam parameter at connect

Sometimes, TinyG changes this on its own (???). A cause for this has not been found; this is a problem hiding workaround, not a fix!
jkuusama · Nov 14, 2022 · 1d826ad · 1d826ad
1 parent 7d97082
commit 1d826ad
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/LitePlacer/TinyGControl.cs b/LitePlacer/TinyGControl.cs
@@ -40,6 +40,15 @@ public bool JustConnected()
             {
                 return false;
             }
+            // Checking aam parameter, and if not 1, force it
+            // TODO: Find out the real problem, don't hide it!
+            if (MainForm.TinyGBoard.Aam != "1")
+            {
+                if (!Write_m("{\"aam\":1}"))      // aam mode
+                {
+                    return false;
+                }
+            }
             MainForm.SetMotorPower_checkBox(true);
             return true;
         }
@@ -271,7 +280,6 @@ public bool Home_m(string axis)
                     "Homing operation mechanical step failed, CNC issue",
                     "Homing failed",
                     MessageBoxButtons.OK);
-                Cnc.Homing = false;
                 return false;
             }
             MainForm.DisplayText("Homing " + axis + " done.");
@@ -775,7 +783,7 @@ internal class Sr
                 set
                 {
                     _posx = value;
-                    CNC.setCurrX(_posx);
+                    CNC.SetCurrentX(_posx);
                     CNC.MainForm.ValueUpdater("posx", _posx.ToString("0.000", CultureInfo.InvariantCulture));
                 }
             }
@@ -787,7 +795,7 @@ internal class Sr
                 set
                 {
                     _posy = value;
-                    CNC.setCurrY(_posy);
+                    CNC.SetCurrentY(_posy);
                     CNC.MainForm.ValueUpdater("posy", _posy.ToString("0.000", CultureInfo.InvariantCulture));
                 }
             }
@@ -799,7 +807,7 @@ internal class Sr
                 set
                 {
                     _posz = value;
-                    CNC.setCurrZ(_posz);
+                    CNC.SetCurrentZ(_posz);
                     CNC.MainForm.ValueUpdater("posz", _posz.ToString("0.000", CultureInfo.InvariantCulture));
                 }
             }
@@ -811,7 +819,7 @@ internal class Sr
                 set
                 {
                     _posa = value;
-                    CNC.setCurrA(_posa);
+                    CNC.SetCurrentA(_posa);
                     CNC.MainForm.ValueUpdater("posa", _posa.ToString("0.000", CultureInfo.InvariantCulture));
                 }
             }