update arduino to 1.6.54a from /oatcontrol

Author: openastrotech

Software/Arduino code/OpenAstroTracker v1.4.5.rar

@@ -32,7 +32,7 @@ DayTime::DayTime(long ms) {
   ms = (ms - secs) / 60;
   mins = (int)(ms % 60);
   ms = (ms - mins) / 60;
-  hours = (int)ms ;
+  hours = (int)ms;
 }
 
 DayTime::DayTime(float timeInHours) {
@@ -43,31 +43,31 @@ DayTime::DayTime(float timeInHours) {
   secs = floor(timeInHours);
 }
 
-int DayTime::getHours() {
+int DayTime::getHours() const {
   return hours;
 }
 
-int DayTime::getMinutes() {
+int DayTime::getMinutes() const {
   return mins;
 }
 
-int DayTime::getSeconds() {
+int DayTime::getSeconds() const {
   return secs;
 }
 
-float DayTime::getTotalHours() {
+float DayTime::getTotalHours() const {
   return 1.0f * getHours() + ((float)getMinutes() / 60.0f) + ((float)getSeconds() / 3600.0f);
 }
 
-float DayTime::getTotalMinutes() {
+float DayTime::getTotalMinutes() const {
   return 60.0f * getHours() + (float)getMinutes() + ((float)getSeconds() / 60.0f);
 }
 
-float DayTime::getTotalSeconds() {
+float DayTime::getTotalSeconds() const {
   return 3600.0f * getHours() + (float)getMinutes() * 60.0f + (float)getSeconds();
 }
 
-int DayTime::getTime(int& h, int& m, int& s) {
+int DayTime::getTime(int& h, int& m, int& s) const {
   h = hours;
   m = mins;
   s = secs;
@@ -95,8 +95,9 @@ void DayTime::addHours(int deltaHours) {
 
 void DayTime::checkHours() {
   while (hours >= hourWrap) {
-    hours  -= hourWrap;
+    hours -= hourWrap;
   }
+
   while (hours < 0) {
     hours += hourWrap;
   }
@@ -106,11 +107,12 @@ void DayTime::checkHours() {
 void DayTime::addMinutes(int deltaMins) {
   mins += deltaMins;
   while (mins > 59) {
-    mins  -= 60;
+    mins -= 60;
     addHours(1);
   }
-  while (mins  < 0) {
-    mins  += 60;
+
+  while (mins < 0) {
+    mins += 60;
     addHours(-1);
   }
 }
@@ -122,6 +124,7 @@ void DayTime::addSeconds(long deltaSecs) {
     secs -= 60;
     addMinutes(1);
   }
+
   while (secs < 0) {
     secs += 60;
     addMinutes(-1);
@@ -156,39 +159,45 @@ void DayTime::subtractTime(const DayTime& other)
 String DayTime::ToString()
 {
   char achBuf[12];
-  char*p = achBuf;
+  char* p = achBuf;
 
   if (hours < 10) {
     *p++ = '0';
-  } else {
+  }
+  else {
     *p++ = '0' + (hours / 10);
   }
+
   *p++ = '0' + (hours % 10);
 
   *p++ = ':';
   if (mins < 10) {
     *p++ = '0';
-  } else {
+  }
+  else {
     *p++ = '0' + (mins / 10);
   }
+
   *p++ = '0' + (mins % 10);
   *p++ = ':';
   if (secs < 10) {
     *p++ = '0';
-  } else {
+  }
+  else {
     *p++ = '0' + (secs / 10);
   }
+
   *p++ = '0' + (secs % 10);
   *p++ = '\0';
   return String(achBuf);
 }
 
 
-DegreeTime::DegreeTime(): DayTime() {
+DegreeTime::DegreeTime() : DayTime() {
   hourWrap = 180;
 }
 
-DegreeTime::DegreeTime(const DegreeTime& other): DayTime(other) { }
+DegreeTime::DegreeTime(const DegreeTime& other) : DayTime(other) { }
 DegreeTime::DegreeTime(int h, int m, int s) : DayTime(h, m, s) { }
 DegreeTime::DegreeTime(float inDegrees) : DayTime(inDegrees) { }
 
@@ -204,15 +213,16 @@ int DegreeTime::getPrintDegrees() {
   return NORTHERN_HEMISPHERE ? hours + 90 : hours - 90;
 }
 
-float DegreeTime::getTotalDegrees() {
+float DegreeTime::getTotalDegrees() const {
   return getTotalHours();
 }
 
 void DegreeTime::checkHours() {
   if (NORTHERN_HEMISPHERE) {
     if (hours > 0) hours = 0;
     if (hours < -180) hours = -180;
-  } else {
+  }
+  else {
     if (hours > 180) hours = 180;
     if (hours < 0) hours = 0;
   }

Software/Arduino code/OpenAstroTracker/DayTime.cpp

@@ -8,82 +8,82 @@
 // addition of hours, minutes, seconds, other times and conversion to string.
 
 class DayTime {
-  protected:
-    int hours;
-    int mins;
-    int secs;
-    int hourWrap = 24;
+protected:
+  int hours;
+  int mins;
+  int secs;
+  int hourWrap = 24;
 
-  public:
-    DayTime();
+public:
+  DayTime();
 
-    DayTime(const DayTime& other);
-    DayTime(int h, int m, int s);
+  DayTime(const DayTime& other);
+  DayTime(int h, int m, int s);
 
-    // From milliseconds. Does not handle days!
-    DayTime(long ms);
+  // From milliseconds. Does not handle days!
+  DayTime(long ms);
 
-    // From hours
-    DayTime(float timeInHours);
+  // From hours
+  DayTime(float timeInHours);
 
-    int getHours();
-    int getMinutes();
-    int getSeconds();
-    float getTotalHours();
-    float getTotalMinutes();
-    float getTotalSeconds();
+  int getHours() const;
+  int getMinutes() const;
+  int getSeconds() const;
+  float getTotalHours() const;
+  float getTotalMinutes() const;
+  float getTotalSeconds() const;
 
-    int getTime(int& h, int& m, int& s);
-    void set(int h, int m, int s);
-    void set(const DayTime& other);
+  int getTime(int& h, int& m, int& s) const;
+  void set(int h, int m, int s);
+  void set(const DayTime& other);
 
-    // Add hours, wrapping days (which are not tracked). Negative or positive.
-    virtual void addHours(int deltaHours);
+  // Add hours, wrapping days (which are not tracked). Negative or positive.
+  virtual void addHours(int deltaHours);
 
-    // Add minutes, wrapping hours if needed
-    void addMinutes(int deltaMins);
+  // Add minutes, wrapping hours if needed
+  void addMinutes(int deltaMins);
 
-    // Add seconds, wrapping minutes and hours if needed
-    void addSeconds(long deltaSecs);
+  // Add seconds, wrapping minutes and hours if needed
+  void addSeconds(long deltaSecs);
 
-    // Add time components, wrapping seconds, minutes and hours if needed
-    void addTime(int deltaHours, int deltaMinutes, int deltaSeconds);
+  // Add time components, wrapping seconds, minutes and hours if needed
+  void addTime(int deltaHours, int deltaMinutes, int deltaSeconds);
 
-    // Add another time, wrapping seconds, minutes and hours if needed
-    void addTime(const DayTime& other);
-    // Subtract another time, wrapping seconds, minutes and hours if needed
+  // Add another time, wrapping seconds, minutes and hours if needed
+  void addTime(const DayTime& other);
+  // Subtract another time, wrapping seconds, minutes and hours if needed
 
-    void subtractTime(const DayTime& other);
+  void subtractTime(const DayTime& other);
 
-    // Convert to a standard string (like 14:45:06)
-    String ToString();
+  // Convert to a standard string (like 14:45:06)
+  String ToString();
   //protected:
-    virtual void checkHours();
+  virtual void checkHours();
 };
 
 class DegreeTime : public DayTime {
-  public:
-    DegreeTime();
-    DegreeTime(const DegreeTime& other);
-    DegreeTime(int h, int m, int s);
-    DegreeTime(float inDegrees);
+public:
+  DegreeTime();
+  DegreeTime(const DegreeTime& other);
+  DegreeTime(int h, int m, int s);
+  DegreeTime(float inDegrees);
 
-    // Add degrees, clamp at 90
-    void addDegrees(int deltaDegrees);
+  // Add degrees, clamp at 90
+  void addDegrees(int deltaDegrees);
 
-    // Get degrees component
-    int getDegrees();
+  // Get degrees component
+  int getDegrees();
 
-    // Get degrees for printing component
-    int getPrintDegrees();
+  // Get degrees for printing component
+  int getPrintDegrees();
 
-    // Get total degrees
-    float getTotalDegrees();
+  // Get total degrees
+  float getTotalDegrees() const;
   //protected:
-    virtual void checkHours() override;
+  virtual void checkHours() override;
 
-  private:
-    void clampDegrees();
+private:
+  void clampDegrees();
 };
 
 #endif

Software/Arduino code/OpenAstroTracker/DayTime.hpp

@@ -0,0 +1,10 @@
+#include "Globals.h"
+#include <EEPROM.h>
+
+void EEPROMupdate(int loc, byte val)
+{
+  if (EEPROM.read(loc)!=val)
+  {
+    EEPROM.write(loc,val);  
+  }
+}

Software/Arduino code/OpenAstroTracker/Globals.c

@@ -2,6 +2,9 @@
 #define _GLOBALS_H_
 
 #include <Arduino.h>
+#include <WString.h>
+
+void EEPROMupdate(int loc, byte val);
 
 // Set to 1 if you are in the northern hemisphere.
 #define NORTHERN_HEMISPHERE 1
@@ -11,7 +14,10 @@
 
 // Make some variables in the sketch files available to the C++ code.
 extern bool inSerialControl;
-
+extern String version;
+extern int PolarisRAHour;
+extern int PolarisRAMinute;
+extern int PolarisRASecond;
 // Comment this out to save some code space
 // #define DEBUG_MODE
 
@@ -42,27 +48,46 @@ extern bool inSerialControl;
 // useful if you are always going to run the mount from a laptop anyway.
 // #define HEADLESS_CLIENT
 
+#ifdef ESP8266
+    #define HEADLESS_CLIENT
+    #define WIFI_ENABLED 
+    #define INFRA_SSID "yourSSID"
+    #define INFRA_WPAKEY "yourWPAKey"
+    #define OAT_WPAKEY "superSecret"
+    #define HOSTNAME "OATerScope"
+    // 0 - Infrastructure Only - Connecting to a Router
+    // 1 - AP Mode Only        - Acting as a Router
+    // 2 - Attempt Infrastructure, Fail over to AP Mode.
+    #define WIFI_MODE 2 
+#endif
+
+
 // Uncomment this to enable the heating menu
 // NOTE: Heating is currently not supported!
 // #define SUPPORT_HEATING
 
-// Uncomment to support Guided Startup 
-#define SUPPORT_GUIDED_STARTUP
+#ifndef HEADLESS_CLIENT
 
-// Uncomment to support full GO (was POI) menu. 
-// If this is commented out you still have a GO menu that has Home and Park.
-#define SUPPORT_POINTS_OF_INTEREST
+    // Uncomment to support Guided Startup 
+    #define SUPPORT_GUIDED_STARTUP
 
-// Uncomment to support CTRL menu, allowing you to manually slew the mount with the buttons. 
-#define SUPPORT_MANUAL_CONTROL
+    // Uncomment to support full GO (was POI) menu. 
+    // If this is commented out you still have a GO menu that has Home and Park.
+    #define SUPPORT_POINTS_OF_INTEREST
 
+    // Uncomment to support CTRL menu, allowing you to manually slew the mount with the buttons. 
+    #define SUPPORT_MANUAL_CONTROL
+
+    // Uncomment to support CAL menu, allowing you to calibrate various things
+    #define SUPPORT_CALIBRATION
+
+#endif
 // Uncomment to support INFO menu that displays various pieces of information about the mount. 
 // #define SUPPORT_INFO_DISPLAY
 
 // Uncomment to support Serial Meade LX200 protocol support
 // #define SUPPORT_SERIAL_CONTROL
 
-
 // If we are making a headleass (no screen, no keyboard) client, always enable Serial.
 #ifdef HEADLESS_CLIENT
 #define SUPPORT_SERIAL_CONTROL