add timestamps for getlocation getweather synctime

Author: cehbz

src/GetLocation.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include <IPAddress.h>
-
+#include <time.h>
 namespace Watchy_GetLocation {
 
 typedef struct {
@@ -12,6 +11,8 @@ typedef struct {
 } location;
 
 extern location currentLocation;
+extern time_t lastGetLocationTS; // timestamp of last successful getLocation
 
+// returns nullptr on failure
 extern const location* getLocation();
 }  // namespace Watchy_GetLocation

src/GetWeather.cpp

@@ -10,11 +10,12 @@
 namespace Watchy_GetWeather {
 RTC_DATA_ATTR weatherData currentWeather = {.temperature = 22,
                                             .weatherConditionCode = 800};
-RTC_DATA_ATTR unsigned long lastWeatherTS = 0;
+RTC_DATA_ATTR time_t lastGetWeatherTS = 0;
 
 weatherData getWeather() {
   // only update if WEATHER_UPDATE_INTERVAL has elapsed i.e. 30 minutes
-  if (now() - lastWeatherTS < WEATHER_UPDATE_INTERVAL) {
+  if (lastGetWeatherTS &&
+      (now() - lastGetWeatherTS < WEATHER_UPDATE_INTERVAL)) {
     // too soon to update, just re-use existing values. Not an error
     Watchy::err = Watchy::RATE_LIMITED;
     return currentWeather;
@@ -48,22 +49,22 @@ weatherData getWeather() {
     Watchy::err = Watchy::REQUEST_FAILED;
     LOGE("http.begin failed");
   } else {
-  int httpResponseCode = http.GET();
-  if (httpResponseCode == 200) {
-    String payload = http.getString();
-    JSONVar responseObject = JSON.parse(payload);
-    currentWeather.temperature = int(responseObject["main"]["temp"]);
-    currentWeather.weatherConditionCode =
-        int(responseObject["weather"][0]["id"]);
+    int httpResponseCode = http.GET();
+    if (httpResponseCode == 200) {
+      String payload = http.getString();
+      JSONVar responseObject = JSON.parse(payload);
+      currentWeather.temperature = int(responseObject["main"]["temp"]);
+      currentWeather.weatherConditionCode =
+          int(responseObject["weather"][0]["id"]);
       strncpy(currentWeather.weatherCity, loc->city,
               sizeof(currentWeather.weatherCity));
       lastGetWeatherTS = now();
       Watchy::err = Watchy::OK;
-  } else {
+    } else {
       Watchy::err = Watchy::REQUEST_FAILED;
-    LOGE("http response %d", httpResponseCode);
-  }
-  http.end();
+      LOGE("http response %d", httpResponseCode);
+    }
+    http.end();
   }
   // turn off radios
   WiFi.mode(WIFI_OFF);

src/GetWeather.h

@@ -18,5 +18,6 @@ typedef struct weatherData {
 } weatherData;
 
 extern weatherData getWeather();
+extern time_t lastGetWeatherTS; // timestamp of last successful getWeather call
 
 }  // namespace Watchy_GetWeather

src/SyncTime.cpp

@@ -9,6 +9,7 @@
 namespace Watchy_SyncTime {
 
 RTC_DATA_ATTR const char *ntpServer = NTP_SERVER;
+RTC_DATA_ATTR time_t lastSyncTimeTS = 0;
 
 // RTC does not know about TZ
 // so DST has to be in app code
@@ -22,6 +23,8 @@ void timeSyncCallback(struct timeval *tv) {
   setTime(tv->tv_sec);          // set system time
   settimeofday(tv, nullptr);    // set posix
   sntp_set_sync_status(SNTP_SYNC_STATUS_COMPLETED);
+  lastSyncTimeTS = tv->tv_sec;
+  LOGD("lastSyncTimeTS %ld", lastSyncTimeTS);
 }
 
 void syncTime(const char* timezone) {

src/SyncTime.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <time.h>
+
 namespace Watchy_SyncTime {
 
 // ntpServer defaults to NTP_SERVER from config.h
@@ -8,16 +10,8 @@ extern const char* ntpServer;
 
 constexpr const char *DEFAULT_TIMEZONE = "UTC0"; // posix format
 
-typedef enum {
-  ready,
-  waiting,
-  wifiFailed,
-  timeout,
-  success,
-  numSyncStates
-} SyncResult;
-
+extern time_t lastSyncTimeTS; // timestamp of last successful syncTime
 // sets RTC, now() and time() to UTC
 // sets current timezone so that localtime works
-extern SyncResult syncTime(const char* timezone = DEFAULT_TIMEZONE);
+extern void syncTime(const char* timezone = DEFAULT_TIMEZONE);
 };  // namespace Watchy_SyncTime