Merge pull request #6 from crossplatformdev/custom

Custom

src/TimezonesGMT.h

@@ -1,6 +1,7 @@
 #ifndef TIMEZONES_GMT_H
 #define TIMEZONES_GMT_H
 
+// This file is used to set up GMT based timezones.
 
 // You don't need to change anything here to be able to set up GMT based time.
 // If you set TIMEZONES_NON_GMT_OVERRIDE to 1 (as for get summer time and leaps),
@@ -10,11 +11,14 @@
 // Visit the link below.
 
 #ifndef TIMEZONES_NON_GMT_OVERRIDE
-#define TIMEZONES_NON_GMT_OVERRIDE 0
+#define TIMEZONES_NON_GMT_OVERRIDE 0 // 0: GMT, 1: Location timezone.
 #endif
 
+#ifndef TIMEZONES_SELECTED
+#define TIMEZONES_SELECTED 0         // If above is 0, value is index of array below.
+#endif                               // Etc/GMT0
+
 #define TIMEZONES_LENGTH 28
-#define TIMEZONES_SELECTED 0
 
 typedef struct TZ {
   const char* location;
@@ -22,13 +26,11 @@ typedef struct TZ {
 } TZ;
 
 
-#ifdef TIMEZONES_NON_GMT_OVERRIDE
 // https://raw.githubusercontent.com/nayarsystems/posix_tz_db/master/zones.csv
 static TZ tz_override = {
   "Europe/Madrid",
   "CET-1CEST,M3.5.0,M10.5.0/3"
 }; 
-#endif
 
 
 static TZ timeZones[] = {
@@ -62,4 +64,9 @@ static TZ timeZones[] = {
   {"Etc/GMT-14","<+14>-14"},    // 27
 };
 
+static long OFFSETS_SEC[] = {
+  0, 3600, 7200, 10800, 14400, 18000, 21600, 25200, 28800, 32400, 36000, 39600, 43200, 0, -3600, -7200, -10800, -14400, -18000, -21600, -25200, -28800, -32400, -36000, -39600, -43200, -46800, -50400
+};
+
+static int8_t tzIndex = TIMEZONES_SELECTED;
 #endif //TIMEZONES_GMT_H

src/Watchy.cpp

@@ -37,6 +37,7 @@ void Watchy::init(String datetime) {
   #else
     Wire.begin(SDA, SCL);                         // init i2c
   #endif
+
   RTC.init();
   // Init the display since is almost sure we will use it
   display.epd2.initWatchy();
@@ -504,9 +505,10 @@ void Watchy::setTime() {
   int8_t month  = currentTime.Month;
   int8_t year   = tmYearToY2k(currentTime.Year);
   #endif
-  int8_t gmt    = gmtOffset / 3600;
+  // gmt variable defaults to TIMEZONES_SELECTED if defined
+  int8_t gmt    = OFFSETS_SEC[tzIndex] / 3600;
+
 
-  int8_t tzIndex = TIMEZONES_SELECTED;
 
   int8_t setIndex = SET_HOUR;
 
@@ -588,13 +590,8 @@ void Watchy::setTime() {
     }
 
  
-    if(tzIndex < 13){
-      gmt = (tzIndex);
-    }else if(tzIndex == 13){
-      gmt = 0;
-    }else{
-      gmt = - (tzIndex - 13);
-    }
+    gmt = OFFSETS_SEC[tzIndex] / 3600; 
+    gmtOffset = gmt * 3600;
 
     display.fillScreen(GxEPD_BLACK);
     display.setTextColor(GxEPD_WHITE);
@@ -678,14 +675,14 @@ void Watchy::setTime() {
   tm.Minute = minute;
   tm.Second = 0;
   
-  gmtOffset = gmt * 3600;
-  
   if(TIMEZONES_NON_GMT_OVERRIDE == 0){
     setenv("TZ", timeZones[tzIndex].timezone, 1);
-  } else if (TIMEZONES_NON_GMT_OVERRIDE == 1) {
-    setenv("TZ", tz_override.timezone, 1);
   } else{
+    #if TIMEZONES_NON_GMT_OVERRIDE == 1
+    setenv("TZ", tz_override.timezone, 1);
+    #else
     setenv("TZ", timeZones[TIMEZONES_SELECTED].timezone, 1);
+    #endif
   }
 
   tzset();
@@ -834,7 +831,7 @@ weatherData Watchy::_getWeatherData(String cityID, String lat, String lon, Strin
 		        breakTime((time_t)(int)responseObject["sys"]["sunset"], currentWeather.sunset);
         // sync NTP during weather API call and use timezone of lat & lon
         gmtOffset = int(responseObject["timezone"]);
-        syncNTP();
+        syncNTP(gmtOffset);
       } else {
         // http error
       }
@@ -1203,7 +1200,7 @@ void Watchy::showSyncNTP() {
   display.println(gmtOffset);
   display.display(true); // full refresh
   if (connectWiFi()) {
-    if (syncNTP()) {
+    if (syncNTP(gmtOffset)) {
       display.println("NTP Sync Success\n");
       display.println("Current Time Is:");
 

src/Watchy.h

@@ -59,7 +59,7 @@ typedef struct watchySettings {
   int8_t weatherUpdateInterval;
   // NTP Settings
   String ntpServer;
-  int gmtOffset;
+  long gmtOffset;
   //
   bool vibrateOClock;
 } watchySettings;

src/Watchy32KRTC.cpp

@@ -64,7 +64,6 @@ void Watchy32KRTC::set(tmElements_t tm) {
   timeInfo.tm_hour = tm.Hour;
   timeInfo.tm_min  = tm.Minute;
   timeInfo.tm_sec  = tm.Second;
-
   // Convert tm to timeval
   struct timeval tv;
   tv.tv_sec = mktime(&timeInfo);