Merge pull request #95 from OpenAstroTech/fix-gps-headless

V1.8.38 - Updates

Author: ClutchplateDude

Software/Arduino code/OpenAstroTracker/Version.h

@@ -1 +1 @@
-#define VERSION "V1.8.37"
+#define VERSION "V1.8.38"

Software/Arduino code/OpenAstroTracker/src/MeadeCommandProcessor.cpp

@@ -6,7 +6,7 @@
 #include "Gyro.hpp"
 
 #if USE_GPS == 1
-bool gpsAqcuisitionComplete(); // defined in c72_menuHA_GPS.hpp
+bool gpsAqcuisitionComplete(int & indicator); // defined in c72_menuHA_GPS.hpp
 #endif
 /////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -537,8 +537,9 @@ String MeadeCommandProcessor::handleMeadeGPSCommands(String inCmd) {
     }
     // Wait at most 2 minutes
     unsigned long timeoutTime = millis() + timeoutLen;
+    int indicator = 0;
     while (millis() < timeoutTime) {
-      if (gpsAqcuisitionComplete()) {
+      if (gpsAqcuisitionComplete(indicator)) {
         LOGV1(DEBUG_MEADE, F("MEADE: GPS startup, GPS acquired"));
         return "1";
       }

Software/Arduino code/OpenAstroTracker/src/Mount.cpp

@@ -4,7 +4,6 @@
 #include "Mount.hpp"
 #include "Utility.hpp"
 #include "EPROMStore.hpp"
-#include "Sidereal.hpp"
 #include "../Configuration_adv.hpp"
 #include "../Configuration_pins.hpp"
 #include "inc/Globals.hpp"
@@ -652,7 +651,7 @@ void Mount::setSpeedCalibration(float val, bool saveToStorage) {
   // The tracker simply needs to rotate at 15degrees/hour, adjusted for sidereal
   // time (i.e. the 15degrees is per 23h56m04s. 86164s/86400 = 0.99726852. 3590/3600 is the same ratio) So we only go 15 x 0.99726852 in an hour.
   #if RA_DRIVER_TYPE == DRIVER_TYPE_TMC2209_UART
-  _trackingSpeed = _trackingSpeedCalibration * ((_stepsPerRADegree / SET_MICROSTEPPING) * TRACKING_MICROSTEPPING) * siderealDegreesInHour / 3600.0f;
+  _trackingSpeed = _trackingSpeedCalibration * _stepsPerRADegree * TRACKING_MICROSTEPPING * siderealDegreesInHour / (3600.0f * SET_MICROSTEPPING);
   #else
   _trackingSpeed = _trackingSpeedCalibration * _stepsPerRADegree * siderealDegreesInHour / 3600.0f;
   #endif
@@ -1123,10 +1122,9 @@ void Mount::guidePulse(byte direction, int duration) {
   #if RA_STEPPER_TYPE == STEPPER_TYPE_28BYJ48
   float raTrackingSpeed = _stepsPerRADegree * siderealDegreesInHour / 3600.0f;
   #else
-  float raTrackingSpeed = ((_stepsPerRADegree / SET_MICROSTEPPING) * TRACKING_MICROSTEPPING) * siderealDegreesInHour / 3600.0f;
+  float raTrackingSpeed = 1.0 * _stepsPerRADegree * TRACKING_MICROSTEPPING * siderealDegreesInHour / (3600.0f * SET_MICROSTEPPING);
   #endif
 
-
   // TODO: Do we need to track how many steps the steppers took and add them to the GoHome calculation?
   // If so, we need to remember where we were when we started the guide pulse. Then at the end,
   // we can calculate the difference.

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

@@ -1,11 +1,13 @@
 #pragma once
 #include "../Configuration_adv.hpp"
 
+#if USE_GPS == 1
+#include "Sidereal.hpp"
+#endif
+
 #if HEADLESS_CLIENT == 0
 #if SUPPORT_GUIDED_STARTUP == 1
 
-#include "Sidereal.hpp"
-
 //////////////////////////////////////////////////////////////
 // This file contains the Starup 'wizard' that guides you through initial setup
 

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

@@ -4,20 +4,9 @@
 #include "../Configuration_adv.hpp"
 #include "../Configuration_pins.hpp"
 
-#if HEADLESS_CLIENT == 0
 #if USE_GPS == 1
 
-// States that HA menu displays goes through
-#define SHOWING_HA_SYNC 1
-#define SHOWING_HA_SET 2
-#define ENTER_HA_MANUALLY 3
-#define STARTING_GPS 4
-#define SIGNAL_AQCUIRED 5
-
-int indicator = 0;
-int haState = STARTING_GPS;
-
-bool gpsAqcuisitionComplete()
+bool gpsAqcuisitionComplete(int & indicator)
 {
     while (GPS_SERIAL_PORT.available())
     {
@@ -55,14 +44,26 @@ bool gpsAqcuisitionComplete()
     return false;
 }
 
+#if HEADLESS_CLIENT == 0
+
+// States that HA menu displays goes through
+#define SHOWING_HA_SYNC 1
+#define SHOWING_HA_SET 2
+#define ENTER_HA_MANUALLY 3
+#define STARTING_GPS 4
+#define SIGNAL_AQCUIRED 5
+
+int indicator = 0;
+int haState = STARTING_GPS;
+
 bool processHAKeys()
 {
     byte key;
     bool waitForRelease = false;
 
     if (haState == STARTING_GPS)
     {
-        if (gpsAqcuisitionComplete())
+        if (gpsAqcuisitionComplete(indicator))
         {
             LOGV1(DEBUG_INFO, F("HA: GPS acquired"));
             GPS_SERIAL_PORT.end();
@@ -193,5 +194,6 @@ void printHASubmenu()
     }
     lcdMenu.printMenu(satBuffer);
 }
+
 #endif
 #endif

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

@@ -486,7 +486,7 @@ bool processCalibrationKeys()
       {
         calState = ROLL_OFFSET_CONFIRM;
         lcdMenu.setCursor(0, 0);
-        lcdMenu.printMenu("Set level?");
+        lcdMenu.printMenu(F("Set as level?"));
       }
       else if (key == btnLEFT)
       {
@@ -526,7 +526,7 @@ bool processCalibrationKeys()
       {
         calState = PITCH_OFFSET_CONFIRM;
         lcdMenu.setCursor(0, 0);
-        lcdMenu.printMenu("Set level?");
+        lcdMenu.printMenu(F("Set as level?"));
       }
       else if (key == btnLEFT)
       {

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

@@ -74,7 +74,7 @@ void printStatusSubmenu() {
 
       case 2: {
         if (subIndex == 0) {
-          lcdMenu.printMenu("TRK Stepr:" + String(mount.getCurrentStepperPosition(TRACKING)));
+          lcdMenu.printMenu("TRK Stpr:" + String(mount.getCurrentStepperPosition(TRACKING)));
         }
         else {
           sprintf(scratchBuffer, "TRK Spd:");