Move default timezone (back) into config.h

Author: cehbz

src/GetLocation.cpp

@@ -19,7 +19,7 @@ RTC_DATA_ATTR time_t lastGetLocationTS = 0;  // can use this to throttle
 RTC_DATA_ATTR location currentLocation = {
     DEFAULT_LOCATION_LATITUDE,       // lat
     DEFAULT_LOCATION_LONGDITUDE,     // lon
-    "AEST-10AEDT,M10.1.0,M4.1.0/3",  // timezone
+    DEFAULT_TIMEZONE,  // timezone
     "Melbourne"                      // default location is in Melbourne
 };
 
@@ -757,7 +757,7 @@ uint32_t fnvHash(const char *str) {
 // hashed values. It assumes that the "olson" string is a valid timezone name
 // from the same version of the tzdb as it was compiled for. If passed an
 // invalid string the behaviour is undefined.
-const char *getPosixTZforOlson(const char *olson, char *buf, size_t buflen) {
+const char *getPosixTZforOlson(const char *olson) {
   static_assert(NumZones > 0, "zones should not be empty");
   auto olsonHash = fnvHash(olson) & mask;
   auto i = &zones[0];
@@ -771,9 +771,9 @@ const char *getPosixTZforOlson(const char *olson, char *buf, size_t buflen) {
     }
   }
   if (i->hash == olsonHash) {
-    return strncpy(buf, posix[i->posix], buflen);
+    return posix[i->posix];
   }
-  return nullptr;
+  return "UTC0"; // couldn't find it, use default
 }
 
 const location *getLocation() {
@@ -810,8 +810,9 @@ const location *getLocation() {
       loc.lon = double(responseObject["lon"]);
       strncpy(loc.city, responseObject["city"], sizeof(loc.city));
 
-      auto olsonTZ = (const char *)responseObject["timezone"];
-      if (getPosixTZforOlson(olsonTZ, loc.timezone, sizeof(loc.timezone))) {
+      const char* olsonTZ = static_cast<const char *>(responseObject["timezone"]);
+      loc.timezone = getPosixTZforOlson(olsonTZ);
+      if ( loc.timezone ) {
         currentLocation = loc;
         lastGetLocationTS = now();
         Watchy::err = Watchy::OK;

src/GetLocation.h

@@ -6,7 +6,7 @@ namespace Watchy_GetLocation {
 typedef struct {
   float lat;
   float lon;
-  char timezone[128]; // POSIX tz spec https://developer.ibm.com/articles/au-aix-posix/
+  const char *timezone; // POSIX tz spec https://developer.ibm.com/articles/au-aix-posix/
   char city[30]; // even if we get a longer name from the API, we'll truncate it to fit the sceen width
 } location;
 

src/SyncTime.h

@@ -8,10 +8,8 @@ namespace Watchy_SyncTime {
 // but can be set to a more specific ntp server if known
 extern const char* ntpServer;
 
-constexpr const char *DEFAULT_TIMEZONE = "UTC0"; // posix format
-
 extern time_t lastSyncTimeTS; // timestamp of last successful syncTime
 // sets RTC, now() and time() to UTC
 // sets current timezone so that localtime works
-extern void syncTime(const char* timezone = DEFAULT_TIMEZONE);
+extern void syncTime(const char* timezone);
 };  // namespace Watchy_SyncTime

src/config.h

@@ -29,6 +29,7 @@ constexpr const char * WIFI_AP_SSID = "Watchy AP";
 //set time
 const int YEAR_OFFSET = 1970;
 constexpr const char *NTP_SERVER = "pool.ntp.org";
+constexpr const char *DEFAULT_TIMEZONE = "AEST-10AEDT,M10.1.0,M4.1.0/3"; // posix format
 
 //BLE OTA
 constexpr const char * BLE_DEVICE_NAME = "Watchy BLE OTA";