V1.6.01 - Updates

- Fixed pin assignment on DEC
- Moved key handling to its own class
- Added target and current values for RA and DEC to INFO menu
- Enabled and fixed Serial code.
- Fixed some misnamed variables in the Mount class

Author: ClutchplateDude

Software/Arduino code/OpenAstroTracker/DayTime.cpp

@@ -28,7 +28,7 @@ DayTime::DayTime(long ms) {
   ms = (ms - secs) / 60;
   mins = (int)(ms % 60);
   ms = (ms - mins) / 60;
-  hours = (int)(ms % hourWrap);
+  hours = (int)ms ;
 }
 
 DayTime::DayTime(float timeInHours) {
@@ -73,23 +73,31 @@ void DayTime::set(int h, int m, int s) {
   hours = h;
   mins = m;
   secs = s;
+  checkHours();
 }
 
 void DayTime::set(const DayTime& other) {
   hours = other.hours;
   mins = other.mins;
   secs = other.secs;
+  checkHours();
 }
 
 // Add hours, wrapping days (which are not tracked)
 void DayTime::addHours(int deltaHours) {
   hours += deltaHours;
+  checkHours();
+}
+
+void DayTime::checkHours() {
+  Serial.println("DtIn: "+String(hours));
   while (hours >= hourWrap) {
     hours  -= hourWrap;
   }
   while (hours < 0) {
     hours += hourWrap;
   }
+  Serial.println("DtOut: "+String(hours));
 }
 
 // Add minutes, wrapping hours if needed
@@ -175,16 +183,12 @@ String DayTime::ToString()
 
 
 DegreeTime::DegreeTime(): DayTime() {
-  hourWrap = 90;
+  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) {}
-
-void DegreeTime::addHours(int deltaHours) {
-  hours = NORTHERN_HEMISPHERE ? adjustClamp(hours, deltaHours, -180, 0) : adjustClamp(hours, deltaHours, 0, 180);
-}
+DegreeTime::DegreeTime(float inDegrees) : DayTime(inDegrees) { }
 
 void DegreeTime::addDegrees(int deltaDegrees) {
   addHours(deltaDegrees);
@@ -201,3 +205,15 @@ int DegreeTime::getPrintDegrees() {
 float DegreeTime::getTotalDegrees() {
   return getTotalHours();
 }
+
+void DegreeTime::checkHours() {
+  if (NORTHERN_HEMISPHERE) {
+    Serial.println("DgIn: "+String(hours));
+    if (hours > 0) hours = 0;
+    if (hours < -180) hours = -180;
+    Serial.println("DgOut: "+String(hours));
+  } else {
+    if (hours > 180) hours = 180;
+    if (hours < 0) hours = 0;
+  }
+}

Software/Arduino code/OpenAstroTracker/DayTime.hpp

@@ -57,6 +57,8 @@ class DayTime {
 
     // Convert to a standard string (like 14:45:06)
     String ToString();
+  //protected:
+    virtual void checkHours();
 };
 
 class DegreeTime : public DayTime {
@@ -66,9 +68,6 @@ class DegreeTime : public DayTime {
     DegreeTime(int h, int m, int s);
     DegreeTime(float inDegrees);
 
-    // Override hours to not wrap, but clamp at +/- 90
-    virtual void addHours(int deltaHours);
-
     // Add degrees, clamp at 90
     void addDegrees(int deltaDegrees);
 
@@ -80,6 +79,11 @@ class DegreeTime : public DayTime {
 
     // Get total degrees
     float getTotalDegrees();
+  //protected:
+    virtual void checkHours() override;
+
+  private:
+    void clampDegrees();
 };
 
 #endif

Software/Arduino code/OpenAstroTracker/Globals.c

@@ -1,4 +1 @@
 #include "Globals.h"
-
-int lcd_key     = 0;         // The current key state
-int adc_key_in  = 0;         // The analog value of the keys

Software/Arduino code/OpenAstroTracker/Globals.h

@@ -3,20 +3,9 @@
 // Set to 1 if you are in the northern hemisphere.
 #define NORTHERN_HEMISPHERE 1
 
-// Time in ms between LCD screen updates during slewing operations
-#define DISPLAY_UPDATE_TIME 100
-
-
-// LCD shield buttons
-#define btnRIGHT  0
-#define btnUP     1
-#define btnDOWN   2
-#define btnLEFT   3
-#define btnSELECT 4
-#define btnNONE   5
+#define DEBUG_MODE
 
-
-extern int lcd_key;         // The current key state
-extern int adc_key_in;      // The analog value of the keys
+// Time in ms between LCD screen updates during slewing operations
+#define DISPLAY_UPDATE_TIME 200
 
 #endif

Software/Arduino code/OpenAstroTracker/LcdMenu.cpp

@@ -87,8 +87,8 @@ void LcdMenu::setNextActive() {
 // It also places the selector arrows around the active one.
 // It then sends the string to the LCD, keeping the selector arrows centered in the same place.
 void LcdMenu::updateDisplay() {
-  Serial.println("UD+");
-  Serial.flush();
+  //Serial.println("UD+");
+  //Serial.flush();
   _lcd.setCursor(0, 0);
   String menuString = "";
   byte offsetToActive = 0;
@@ -107,38 +107,38 @@ void LcdMenu::updateDisplay() {
     offset += strlen(scratchBuffer);
   }
 
-  Serial.println("UUD1: [" + menuString + "]");
-  Serial.flush();
+  //Serial.println("UUD1: [" + menuString + "]");
+  //Serial.flush();
 
   // Determine where to place the active menu item. (empty space around longest item divided by two).
   int margin = (_columns - (_longestDisplay)) / 2;
   int offsetIntoString = offsetToActive - margin;
 
-  Serial.println("UD1: " + String(margin) + " " + String(offsetToActive ) + " " + String(offsetIntoString ));;
-  Serial.flush();
+  //Serial.println("UD1: " + String(margin) + " " + String(offsetToActive ) + " " + String(offsetIntoString ));;
+  //Serial.flush();
 
   // Pad the front if we don't have enough to offset the string to the arrow locations (happens on first item(s))
   while (offsetIntoString < 0) {
     _lcd.print(" ");
     offsetIntoString++;
   }
 
-  Serial.println("UD2a: " + String(margin) + " " + String(offsetToActive ) + " " + String(offsetIntoString ));;
-  Serial.println("UD2b: [" + menuString + "]");
-  Serial.flush();
+  //Serial.println("UD2a: " + String(margin) + " " + String(offsetToActive ) + " " + String(offsetIntoString ));;
+  //Serial.println("UD2b: [" + menuString + "]");
+  //Serial.flush();
 
   // Display the actual menu string
   String displayString = menuString.substring(offsetIntoString, offsetIntoString + _columns);
-  Serial.println("UD3: [" + displayString + "]");
-  Serial.flush();
+  //Serial.println("UD3: [" + displayString + "]");
+  //Serial.flush();
 
   // Pad the end with spaces so the display is cleared when getting to the last item(s).
   while (displayString.length() < _columns) {
     displayString += " ";
   }
 
-  Serial.println("UD4: [" + displayString + "]");
-  Serial.flush();
+  //Serial.println("UD4: [" + displayString + "]");
+  //Serial.flush();
 
   printMenu(displayString);