Merge branch 'oatcontrol' into oatcontrol

Author: ClutchplateDude

Software/Arduino code/OpenAstroTracker/DayTime.cpp

@@ -155,10 +155,11 @@ void DayTime::subtractTime(const DayTime& other)
   addHours(-other.getHours());
 }
 
+char achBuf[32];
+
 // Convert to a standard string (like 14:45:06)
-String DayTime::ToString()
+const char*  DayTime::ToString() const
 {
-  char achBuf[12];
   char* p = achBuf;
 
   if (hours < 10) {
@@ -188,8 +189,11 @@ String DayTime::ToString()
   }
 
   *p++ = '0' + (secs % 10);
-  *p++ = '\0';
-  return String(achBuf);
+  *p++ = ' ';
+  *p++ = '(';
+  strcpy(p, String(this->getTotalHours(), 4).c_str());
+  strcat(p, ")");
+  return achBuf;
 }
 
 
@@ -209,7 +213,7 @@ int DegreeTime::getDegrees() {
   return hours;
 }
 
-int DegreeTime::getPrintDegrees() {
+int DegreeTime::getPrintDegrees() const {
   return NORTHERN_HEMISPHERE ? hours + 90 : hours - 90;
 }
 
@@ -227,3 +231,52 @@ void DegreeTime::checkHours() {
     if (hours < 0) hours = 0;
   }
 }
+
+char achBufDeg[32];
+
+// Convert to a standard string (like 14:45:06)
+const char* DegreeTime::ToString() const
+{
+  char* p = achBufDeg;
+  int abshours = getPrintDegrees() < 0 ? -getPrintDegrees() : getPrintDegrees();
+
+  if (getPrintDegrees() < 0) {
+    *p++ = '-';
+  }
+  else {
+    *p++ = '+';
+  }
+
+  if (abshours < 10) {
+    *p++ = '0';
+  }
+  else {
+    *p++ = '0' + (abshours / 10);
+  }
+  *p++ = '0' + (abshours % 10);
+
+  *p++ = ':';
+  if (mins < 10) {
+    *p++ = '0';
+  }
+  else {
+    *p++ = '0' + (mins / 10);
+  }
+  *p++ = '0' + (mins % 10);
+  
+  *p++ = ':';
+  if (secs < 10) {
+    *p++ = '0';
+  }
+  else {
+    *p++ = '0' + (secs / 10);
+  }
+
+  *p++ = '0' + (secs % 10);
+  *p++ = ' ';
+  *p++ = '(';
+  strcpy(p, String(NORTHERN_HEMISPHERE ? getTotalHours() + 90 : getTotalHours() - 90, 4).c_str());
+  strcat(p, ")");
+
+  return achBufDeg;
+}

Software/Arduino code/OpenAstroTracker/DayTime.hpp

@@ -56,7 +56,8 @@ class DayTime {
   void subtractTime(const DayTime& other);
 
   // Convert to a standard string (like 14:45:06)
-  String ToString();
+  virtual const char* ToString() const;
+
   //protected:
   virtual void checkHours();
 };
@@ -75,13 +76,16 @@ class DegreeTime : public DayTime {
   int getDegrees();
 
   // Get degrees for printing component
-  int getPrintDegrees();
+  int getPrintDegrees() const;
 
   // Get total degrees
   float getTotalDegrees() const;
   //protected:
   virtual void checkHours() override;
 
+  // Convert to a standard string (like 14:45:06)
+  virtual const char* ToString() const override;
+
 private:
   void clampDegrees();
 };

Software/Arduino code/OpenAstroTracker/MeadeCommandProcessor.cpp

@@ -115,6 +115,12 @@
 //      Where HH is hours, MM is minutes.
 //      Returns: 1 if successfully set, otherwise 0
 //
+// :SHLHH:MM#
+//      Set LST Time 
+//      This sets the scopes LST (and HA).
+//      Where HH is hours, MM is minutes.
+//      Returns: 1 if successfully set, otherwise 0
+//
 // :SYsDD*MM:SS.HH:MM:SS#
 //      Synchronize Declination and Right Ascension.
 //      This tells the scope what it is currently pointing at.
@@ -197,6 +203,11 @@
 //      Where nnn is the number of seconds the entire alignment should take.
 //      Returns: nothing
 //
+// :XGB#
+//      Get Backlash correction steps 
+//      Get the number of steps the RA stepper motor needs to overshoot and backtrack when slewing east.
+//      Returns: integer
+//
 // :XGR#
 //      Get RA steps 
 //      Get the number of steps the RA stepper motor needs to take to rotate by one degree 
@@ -222,6 +233,11 @@
 //      Get the current LST of the mount.
 //      Returns: HHMMSS
 //
+// :XSBn#
+//      Set Backlash correction steps 
+//      Sets the number of steps the RA stepper motor needs to overshoot and backtrack when slewing east.
+//      Returns: nothing
+//
 // :XSRn#
 //      Set RA steps 
 //      Set the number of steps the RA stepper motor needs to take to rotate by one degree 
@@ -575,6 +591,9 @@ String MeadeCommandProcessor::handleMeadeExtraCommands(String inCmd) {
     else if (inCmd[1] == 'S') {
       return String(_mount->getSpeedCalibration(), 5) + "#";
     }
+    else if (inCmd[1] == 'B') {
+      return String(_mount->getBacklashCorrection()) + "#";
+    }
     else if (inCmd[1] == 'H') {
       char scratchBuffer[10];
       sprintf(scratchBuffer, "%02d%02d%02d#", _mount->HA().getHours(), _mount->HA().getMinutes(), _mount->HA().getSeconds());
@@ -605,6 +624,9 @@ String MeadeCommandProcessor::handleMeadeExtraCommands(String inCmd) {
     else if (inCmd[1] == 'Y') {
       _mount->setSpeed(DEC_STEPS, inCmd.substring(2).toFloat());
     }
+    else if (inCmd[1] == 'B') {
+      _mount->setBacklashCorrection(inCmd.substring(2).toInt());
+    }
   }
   return "";
 }