Added utc offset for half hours, fixed negative offset issue

Author: squix78

TimeClient.cpp

@@ -25,7 +25,7 @@ See more at http://blog.squix.ch
 
 #include "TimeClient.h"
 
-TimeClient::TimeClient(int utcOffset) {
+TimeClient::TimeClient(float utcOffset) {
   myUtcOffset = utcOffset;
 }
 
@@ -60,8 +60,11 @@ void TimeClient::updateTime() {
         int parsedHours = line.substring(23, 25).toInt();
         int parsedMinutes = line.substring(26, 28).toInt();
         int parsedSeconds = line.substring(29, 31).toInt();
+        Serial.println(String(parsedHours) + ":" + String(parsedMinutes) + ":" + String(parsedSeconds));
 
         localEpoc = (parsedHours * 60 * 60 + parsedMinutes * 60 + parsedSeconds);
+        Serial.println(localEpoc);
+        localMillisAtUpdate = millis();
       }
     }
   }
@@ -72,7 +75,7 @@ String TimeClient::getHours() {
     if (localEpoc == 0) {
       return "--";
     }
-    int hours = (getCurrentEpoch()  % 86400L) / 3600 + myUtcOffset;
+    int hours = ((getCurrentEpochWithUtcOffset()  % 86400L) / 3600) % 24;
     if (hours < 10) {
       return "0" + String(hours);
     }
@@ -83,7 +86,7 @@ String TimeClient::getMinutes() {
     if (localEpoc == 0) {
       return "--";
     }
-    int minutes = ((getCurrentEpoch() % 3600) / 60);
+    int minutes = ((getCurrentEpochWithUtcOffset() % 3600) / 60);
     if (minutes < 10 ) {
       // In the first 10 minutes of each hour, we'll want a leading '0'
       return "0" + String(minutes);
@@ -94,7 +97,7 @@ String TimeClient::getSeconds() {
     if (localEpoc == 0) {
       return "--";
     }
-    int seconds = getCurrentEpoch() % 60;
+    int seconds = getCurrentEpochWithUtcOffset() % 60;
     if ( seconds < 10 ) {
       // In the first 10 seconds of each minute, we'll want a leading '0'
       return "0" + String(seconds);
@@ -110,3 +113,8 @@ long TimeClient::getCurrentEpoch() {
   return localEpoc + ((millis() - localMillisAtUpdate) / 1000);
 }
 
+long TimeClient::getCurrentEpochWithUtcOffset() {
+  return round(getCurrentEpoch() + 3600 * myUtcOffset + 86400L) % 86400L;
+}
+
+

TimeClient.h

@@ -25,14 +25,13 @@ See more at http://blog.squix.ch
 #pragma once
 
 #include <ESP8266WiFi.h>
-#include <WiFiUdp.h>
 
 #define NTP_PACKET_SIZE 48
 
 class TimeClient {
 
   private:
-    int myUtcOffset = 0;
+    float myUtcOffset = 0;
     long localEpoc = 0;
     long localMillisAtUpdate;
 
@@ -43,14 +42,15 @@ class TimeClient {
 
 
   public:
-    TimeClient(int utcOffset);
+    TimeClient(float utcOffset);
     void updateTime();
 
     String getHours();
     String getMinutes();
     String getSeconds();
     String getFormattedTime();
     long getCurrentEpoch();
+    long getCurrentEpochWithUtcOffset();
 
 };