V1.7.12 - Updates

- Converted all logv() calls to LOGVn() calls that compile out, but don't need to enclosed in #if..#endif statements
- Fixed a bug introduced in 1.7.11 that prevented normal functioning of the OAT steppers.

Author: ClutchplateDude

Software/Arduino code/OpenAstroTracker/DayTime.cpp

@@ -228,16 +228,12 @@ float DegreeTime::getTotalDegrees() const {
 
 void DegreeTime::checkHours() {
   if (hours > 0) {
-#if DEBUG_LEVEL&DEBUG_GENERAL
-    logv("CheckHours: Degrees is more than 0, clamping");
-#endif
+    LOGV1(DEBUG_GENERAL, "CheckHours: Degrees is more than 0, clamping");
     hours = 0;
   }
   if (hours < -180) {
-#if DEBUG_LEVEL&DEBUG_GENERAL
-    logv("CheckHours: Degrees is less than -180, clamping");
-#endif
-      hours = -180;
+    LOGV1(DEBUG_GENERAL, "CheckHours: Degrees is less than -180, clamping");
+    hours = -180;
   }
 }
 

Software/Arduino code/OpenAstroTracker/Globals.hpp

@@ -32,6 +32,8 @@ extern byte PolarisRASecond;
 #define DEBUG_MOUNT          0x08
 #define DEBUG_MOUNT_VERBOSE  0x10
 #define DEBUG_GENERAL        0x20
+#define DEBUG_MEADE          0x40
+#define DEBUG_ANY            0x7F
 
 // Bit Name                 Output
 //  0  DEBUG_INFO           General output, like startup variables and status
@@ -40,12 +42,14 @@ extern byte PolarisRASecond;
 //  3  DEBUG_MOUNT          Mount processing output
 //  4  DEBUG_MOUNT_VERBOSE  Verbose mount processing (coordinates, etc)
 //  5  DEBUG_GENERAL        Other misc. output
+//  6  DEBUG_MEADE          Meade command handling output
 
 // Set this to specify the amount of debug output OAT should send to the serial port.
 // Note that if you use an app to control OAT, ANY debug output will likely confuse that app.
 // Debug output is useful if you are using Wifi to control the OAT or if you are issuing
 // manual commands via a terminal.
-// #define DEBUG_LEVEL (DEBUG_SERIAL|DEBUG_WIFI|DEBUG_INFO|DEBUG_MOUNT)
+// #define DEBUG_LEVEL (DEBUG_SERIAL|DEBUG_WIFI|DEBUG_INFO|DEBUG_MOUNT|DEBUG_GENERAL)
+// #define DEBUG_LEVEL (DEBUG_ANY)
 #define DEBUG_LEVEL (DEBUG_NONE)
 
 // Set this to 1 to run a key diagnostic. No tracker functions are on at all.

Software/Arduino code/OpenAstroTracker/InterruptCallback.cpp

@@ -87,26 +87,20 @@ bool InterruptCallback::setInterval(float intervalMs, interrupt_callback_p callb
     timerAlarmWrite(_timer, (uint64_t)(intervalMs * 1000.0f), true);
     timerAlarmEnable(_timer);
 
-#if DEBUG_LEVEL&DEBUG_INFO
-    Serial.println("Setup ESP32 Timer");
-#endif 
+    LOGV1(DEBUG_INFO, "Setup ESP32 Timer");
 
   return true;
 }
 
 void InterruptCallback::stop(){
-#if DEBUG_LEVEL&DEBUG_INFO
-    Serial.println("Stop ESP32 Timer");
-#endif 
+    LOGV1(DEBUG_INFO, "Stop ESP32 Timer");
     if (timerAlarmEnabled(_timer)) {
         timerAlarmDisable(_timer);
     }
 }
 
 void InterruptCallback::start(){
-#if DEBUG_LEVEL&DEBUG_INFO
-    Serial.println("Start ESP32 Timer");
-#endif 
+    LOGV1(DEBUG_INFO, "Start ESP32 Timer");
     if (!timerAlarmEnabled(_timer)){
         timerAlarmEnable(_timer);
     }

Software/Arduino code/OpenAstroTracker/MeadeCommandProcessor.cpp

@@ -474,9 +474,7 @@ String MeadeCommandProcessor::handleMeadeSetInfo(String inCmd) {
         deg = -90 - deg;
       }
       _mount->targetDEC().set(deg, inCmd.substring(5, 7).toInt(), inCmd.substring(8, 10).toInt());
-#if DEBUG_LEVEL&DEBUG_MEADE
-      logv("MeadeSetInfo: Received Target DEC: %s", _mount->targetDEC().ToString());
-#endif
+      LOGV2(DEBUG_MEADE, "MEADE: SetInfo: Received Target DEC: %s", _mount->targetDEC().ToString());
       return "1";
     }
     else {
@@ -492,9 +490,7 @@ String MeadeCommandProcessor::handleMeadeSetInfo(String inCmd) {
     if ((inCmd[3] == ':') && (inCmd[6] == ':'))
     {
       _mount->targetRA().set(inCmd.substring(1, 3).toInt(), inCmd.substring(4, 6).toInt(), inCmd.substring(7, 9).toInt());
-#if DEBUG_LEVEL&DEBUG_MEADE
-      logv("MeadeSetInfo: Received Target RA: %s", _mount->targetRA().ToString());
-#endif
+      LOGV2(DEBUG_MEADE, "MEADE: SetInfo: Received Target RA: %s", _mount->targetRA().ToString());
       return "1";
     }
     else {
@@ -513,9 +509,7 @@ String MeadeCommandProcessor::handleMeadeSetInfo(String inCmd) {
       }
 
       DayTime lst(hLST, minLST, secLST);
-#if DEBUG_LEVEL&DEBUG_MEADE
-      logv("MeadeSetInfo: Received LST: %d:%d:%d", hLST, minLST, secLST);
-#endif
+      LOGV4(DEBUG_MEADE, "MEADE: SetInfo: Received LST: %d:%d:%d", hLST, minLST, secLST);
       _mount->setLST(lst);
     }
     else if (inCmd[1] == 'P') {
@@ -527,9 +521,7 @@ String MeadeCommandProcessor::handleMeadeSetInfo(String inCmd) {
       // Set HA
       int hHA = inCmd.substring(1, 3).toInt();
       int minHA = inCmd.substring(4, 6).toInt();
-#if DEBUG_LEVEL&DEBUG_MEADE
-      logv("MeadeSetInfo: Received HA: %d:%d:%d", hHA, minHA, 0);
-#endif
+      LOGV4(DEBUG_MEADE, "MEADE: SetInfo: Received HA: %d:%d:%d", hHA, minHA, 0);
       _mount->setHA(DayTime(hHA, minHA, 0));
     }
 
@@ -807,9 +799,7 @@ String MeadeCommandProcessor::handleMeadeSetSlewRate(String inCmd) {
 
 String MeadeCommandProcessor::processCommand(String inCmd) {
   if (inCmd[0] == ':') {
-    #if DEBUG_LEVEL&DEBUG_MEADE
-    logv("MEADE: Received command '%s'", inCmd.c_str());
-    #endif
+    LOGV2(DEBUG_MEADE, "MEADE: Received command '%s'", inCmd.c_str());
     char command = inCmd[1];
     inCmd = inCmd.substring(2);
     switch (command) {
@@ -823,11 +813,7 @@ String MeadeCommandProcessor::processCommand(String inCmd) {
       case 'R': return handleMeadeSetSlewRate(inCmd);
       case 'X': return handleMeadeExtraCommands(inCmd);
       default:
-#if DEBUG_LEVEL&DEBUG_MEADE
-      logv("MEADE: Received unknown command '%s'", inCmd.c_str());
-      Serial.println("Unknown Command in MeadeCommandProcessor::processCommand " + inCmd);
-      return "";
-#endif
+        LOGV2(DEBUG_MEADE, "MEADE: Received unknown command '%s'", inCmd.c_str());
       break;
     }
   }