Merge pull request #113 from OpenAstroTech/roll-in-startup

V1.8.47 - Updates

Author: ClutchplateDude

Software/Arduino code/OpenAstroTracker/Configuration_pins.hpp

@@ -109,7 +109,7 @@
         #error GPS module not currently configured/supported in ESP32
     #endif
 
-    #if USE_GYRO == 1
+    #if USE_GYRO_LEVEL == 1
         #error Digital Level not currently configured/supported in ESP32
     #endif
 #endif

Software/Arduino code/OpenAstroTracker/Version.h

@@ -1 +1 @@
-#define VERSION "V1.8.46"
+#define VERSION "V1.8.47"

Software/Arduino code/OpenAstroTracker/src/c65_startup.hpp

@@ -4,6 +4,9 @@
 #if USE_GPS == 1
 #include "Sidereal.hpp"
 #endif
+#if USE_GYRO_LEVEL == 1
+#include "Gyro.hpp"
+#endif
 
 #if DISPLAY_TYPE > 0
 #if SUPPORT_GUIDED_STARTUP == 1
@@ -14,12 +17,15 @@
 void setControlMode(bool); // In CTRL menu
 
 #define StartupIsInHomePosition 1
-#define StartupSetHATime 4
-#define StartupWaitForHACompletion 6
-#define StartupHAConfirmed 7
-#define StartupWaitForPoleCompletion 9
-#define StartupPoleConfirmed 10
-#define StartupCompleted 20
+#define StartupSetRoll 2
+#define StartupWaitForRollCompletion 3
+#define StartupRollConfirmed 4
+#define StartupSetHATime 10
+#define StartupWaitForHACompletion 15
+#define StartupHAConfirmed 20
+#define StartupWaitForPoleCompletion 25
+#define StartupPoleConfirmed 30
+#define StartupCompleted 35
 
 #define YES 1
 #define NO 2
@@ -54,7 +60,12 @@ bool processStartupKeys() {
         }
         else if (key == btnSELECT) {
           if (isInHomePosition == YES) {
-            startupState = StartupSetHATime;
+            #if USE_GYRO_LEVEL == 1
+              startupState = StartupSetRoll;
+              LOGV1(DEBUG_INFO, F("STARTUP: State is set roll!"));
+            #else
+              startupState = StartupSetHATime;
+            #endif
           }
           else if (isInHomePosition == NO) {
             #if RA_DRIVER_TYPE == DRIVER_TYPE_TMC2209_UART && USE_AUTOHOME == 1
@@ -92,6 +103,26 @@ bool processStartupKeys() {
     }
     break;
 
+    #if USE_GYRO_LEVEL == 1
+    case StartupSetRoll : {
+      inStartup = false;
+      LOGV1(DEBUG_INFO, F("STARTUP: Switching to CAL menu!"));
+
+      lcdMenu.setCursor(0, 0);
+      lcdMenu.printMenu("Level front");
+      lcdMenu.setActive(Calibration_Menu);
+
+      startupState = StartupWaitForRollCompletion;
+    }
+    break;
+    
+    case StartupRollConfirmed : {
+      LOGV1(DEBUG_INFO, F("STARTUP: Roll confirmed!"));
+      startupState = StartupSetHATime;
+    }
+    break;
+    #endif
+
     case StartupSetHATime: {
       inStartup = false;
       LOGV1(DEBUG_INFO, F("STARTUP: Switching to HA menu!"));

Software/Arduino code/OpenAstroTracker/src/c76_menuCAL.hpp

@@ -204,9 +204,15 @@ bool processCalibrationKeys()
 #if USE_GYRO_LEVEL == 1
   if (!gyroStarted)
   {
+    LOGV1(DEBUG_INFO, F("CAL: Starting Gyro!"));
     Gyro::startup();
     gyroStarted = true;
   }
+  
+  if ((startupState == StartupWaitForRollCompletion) && (calState != ROLL_OFFSET_CALIBRATION)) {
+    LOGV1(DEBUG_INFO, F("CAL: In Startup, so going to Roll confirm!"));
+    calState = ROLL_OFFSET_CALIBRATION;
+  }
 #endif
 
   byte currentButtonState = lcdButtons.currentState();
@@ -484,18 +490,33 @@ bool processCalibrationKeys()
     {
       if (key == btnSELECT)
       {
-        calState = ROLL_OFFSET_CONFIRM;
-        lcdMenu.setCursor(0, 0);
-        lcdMenu.printMenu(F("Set as level?"));
+         if (startupState == StartupWaitForRollCompletion)
+         {
+           LOGV1(DEBUG_INFO, F("CAL: Confirmed roll. Going back to Startup, Roll confirmed!"));
+           gotoNextMenu(); // Turns of Gyro
+           inStartup = true;
+           startupState = StartupRollConfirmed;
+           calState = HIGHLIGHT_FIRST;
+         }
+         else
+         {
+            calState = ROLL_OFFSET_CONFIRM;
+            lcdMenu.setCursor(0, 0);
+            lcdMenu.printMenu(F("Set as level?"));
+        }
       }
       else if (key == btnLEFT)
       {
-        calState = HIGHLIGHT_ROLL_LEVEL;
+        if (startupState != StartupWaitForRollCompletion) {
+          calState = HIGHLIGHT_ROLL_LEVEL;
+        }
       }
       else if (key == btnRIGHT)
       {
-        gotoNextMenu();
-        calState = HIGHLIGHT_ROLL_LEVEL;
+        if (startupState != StartupWaitForRollCompletion) {
+          gotoNextMenu();
+          calState = HIGHLIGHT_ROLL_LEVEL;
+        }
       }
     }
     break;