Merge branch 'develop' of https://github.com/OpenAstroTech/OpenAstroTracker-Firmware into develop

# Conflicts:
#	Changelog.md
#	Version.h

Author: ClutchplateDude

.clang-format

@@ -29,7 +29,7 @@ BraceWrapping:
   AfterCaseLabel:  true
   AfterClass:      true
   AfterControlStatement: Always
-  AfterEnum:       false
+  AfterEnum:       true
   AfterFunction:   true
   AfterNamespace:  true
   AfterObjCDeclaration: true

Changelog.md

@@ -1,6 +1,9 @@
-**V1.11.3 - Updates**
+**V1.11.4 - Updates**
 - Allow disabling Points Of Interest in LCD menu
 
+**V1.11.3 - Updates**
+- Change logging macro LOGVx to LOG
+
 **V1.11.2 - Updates**
 - Cache build files by default
 

Version.h

@@ -3,4 +3,4 @@
 // Also, numbers are interpreted as simple numbers.                        _   __   _
 // So 1.8 is actually 1.08, meaning that 1.12 is a later version than 1.8.  \_(..)_/
 
-#define VERSION "V1.11.3"
+#define VERSION "V1.11.4"

src/DayTime.cpp

@@ -17,7 +17,7 @@ DayTime DayTime::ParseFromMeade(String const &s)
     DayTime result;
     int i    = 0;
     long sgn = 1;
-    LOGV2(DEBUG_MEADE, F("[DAYTIME]: Parse Coord from [%s]"), s.c_str());
+    LOG(DEBUG_MEADE, "[DAYTIME]: Parse Coord from [%s]", s.c_str());
     // Check whether we have a sign. This should be able to parse RA and DEC strings (RA never has a sign, and DEC should always have one).
     if ((s[i] == '-') || (s[i] == '+'))
     {
@@ -27,34 +27,34 @@ DayTime DayTime::ParseFromMeade(String const &s)
 
     // Degs can be 2 or 3 digits
     long degs = s[i++] - '0';
-    LOGV3(DEBUG_MEADE, F("[DAYTIME]: 1st digit [%c] -> degs=%l"), s[i - 1], degs);
+    LOG(DEBUG_MEADE, "[DAYTIME]: 1st digit [%c] -> degs=%l", s[i - 1], degs);
     degs = degs * 10 + s[i++] - '0';
-    LOGV3(DEBUG_MEADE, F("[DAYTIME]: 2nd digit [%c] -> degs=%l"), s[i - 1], degs);
+    LOG(DEBUG_MEADE, "[DAYTIME]: 2nd digit [%c] -> degs=%l", s[i - 1], degs);
 
     // Third digit?
     if ((s[i] >= '0') && (s[i] <= '9'))
     {
         degs = degs * 10 + s[i++] - '0';
-        LOGV3(DEBUG_MEADE, F("[DAYTIME]: 3rd digit [%c] -> degs=%d"), s[i - 1], degs);
+        LOG(DEBUG_MEADE, "[DAYTIME]: 3rd digit [%c] -> degs=%d", s[i - 1], degs);
     }
     i++;  // Skip seperator
 
     int mins = s.substring(i, i + 2).toInt();
-    LOGV3(DEBUG_MEADE, F("[DAYTIME]: Minutes are [%s] -> mins=%d"), s.substring(i, i + 2).c_str(), mins);
+    LOG(DEBUG_MEADE, "[DAYTIME]: Minutes are [%s] -> mins=%d", s.substring(i, i + 2).c_str(), mins);
     int secs = 0;
     if (int(s.length()) > i + 4)
     {
         secs = s.substring(i + 3, i + 5).toInt();
-        LOGV3(DEBUG_MEADE, F("[DAYTIME]: Seconds are [%s] -> secs=%d"), s.substring(i + 3, i + 5).c_str(), secs);
+        LOG(DEBUG_MEADE, "[DAYTIME]: Seconds are [%s] -> secs=%d", s.substring(i + 3, i + 5).c_str(), secs);
     }
     else
     {
-        LOGV3(DEBUG_MEADE, F("[DAYTIME]: No Seconds. slen %d is not > %d"), s.length(), i + 4);
+        LOG(DEBUG_MEADE, "[DAYTIME]: No Seconds. slen %d is not > %d", s.length(), i + 4);
     }
     // Get the signed total seconds specified....
     result.totalSeconds = sgn * (((degs * 60L + mins) * 60L) + secs);
 
-    LOGV5(DEBUG_MEADE, F("[DAYTIME]: TotalSeconds are %l from %lh %dm %ds"), result.totalSeconds, degs, mins, secs);
+    LOG(DEBUG_MEADE, "[DAYTIME]: TotalSeconds are %l from %lh %dm %ds", result.totalSeconds, degs, mins, secs);
 
     return result;
 }

src/Declination.cpp

@@ -59,12 +59,12 @@ void Declination::checkHours()
 {
     if (totalSeconds > arcSecondsPerHemisphere)
     {
-        LOGV1(DEBUG_GENERAL, F("[DECLINATION]: CheckHours: Degrees is more than 180, clamping"));
+        LOG(DEBUG_GENERAL, "[DECLINATION]: CheckHours: Degrees is more than 180, clamping");
         totalSeconds = arcSecondsPerHemisphere;
     }
     if (totalSeconds < -arcSecondsPerHemisphere)
     {
-        LOGV1(DEBUG_GENERAL, F("[DECLINATION]: CheckHours: Degrees is less than -180, clamping"));
+        LOG(DEBUG_GENERAL, "[DECLINATION]: CheckHours: Degrees is less than -180, clamping");
         totalSeconds = -arcSecondsPerHemisphere;
     }
 }
@@ -96,15 +96,15 @@ const char *Declination::ToString() const
 Declination Declination::ParseFromMeade(String const &s)
 {
     Declination result;
-    LOGV2(DEBUG_GENERAL, F("[DECLINATION]: Declination.Parse(%s)"), s.c_str());
+    LOG(DEBUG_GENERAL, "[DECLINATION]: Declination.Parse(%s)", s.c_str());
 
     // Use the DayTime code to parse it...
     DayTime dt = DayTime::ParseFromMeade(s);
 
     // ...and then correct for hemisphere
     result.totalSeconds = NORTHERN_HEMISPHERE ? (arcSecondsPerHemisphere / 2) - dt.getTotalSeconds()
                                               : -(arcSecondsPerHemisphere / 2) + dt.getTotalSeconds();
-    LOGV4(DEBUG_GENERAL, F("[DECLINATION]: Declination.Parse(%s) -> %s (%l)"), s.c_str(), result.ToString(), result.totalSeconds);
+    LOG(DEBUG_GENERAL, "[DECLINATION]: Declination.Parse(%s) -> %s (%l)", s.c_str(), result.ToString(), result.totalSeconds);
     return result;
 }