Updateing Readme & change CET to Europe/Amsterdam

rvdbreemen · Feb 22, 2021 · 1593dd3 · 1593dd3
1 parent 05355cd
commit 1593dd3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/OTGW-firmware.h b/OTGW-firmware.h
@@ -81,7 +81,7 @@ String    settingMQTTuser = "";
 String    settingMQTTpasswd = "";
 String    settingMQTTtopTopic = "OTGW";
 bool      settingNTPenable = true;
-String    settingNTPtimezone = "CET"; //Default
+String    settingNTPtimezone = "Europe/Amsterdam"; //Default
 bool      settingLEDblink = true;
 
 

diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Looking for the documentation, go here (work in progress):  <br> https://github.
 
 | Version | Release notes |
 |-|-|
-| 0.7.6 | PIC firmware integration done. <br> NTP configurable <br> Web UI only values that have been updated <br> Update to REST API to include epoch of last update to message|
+| 0.7.6 | PIC firmware integration done. <br> New setting: NTP configurable <br> New setting: heartbeat led on/off <br> Update to REST API to include epoch of last update to message|
 | 0.7.5 | Complete set of status bits in UI and Central Heating 2 information |
 | 0.7.4 | Integration of the otgw-pic firmware upgrade code - upgrade to pic firmware version 5.0 (by Schelte Bron) |
 | 0.7.3 | Adding MQTT disable/enable option<br>Adding MQTT long password (max. 100 chars)<br>Adding executeCommand API (verify and return response for commands)<br>Adding RESTAPI /api/v1/otgw/cmdrsp/{command} that returns {response from command}<br>Added uptime and otgw fwversion in devinfo UI |

diff --git a/networkStuff.h b/networkStuff.h
@@ -163,15 +163,15 @@ void startNTP(){
       DebugTf("GeoIP located your timezone to be: %s\r\n", CSTR(settingNTPtimezone));
     } else { 
       DebugTln(errorString());
-      settingNTPtimezone = "CET";
+      settingNTPtimezone = "Europe/Amsterdam";
     }
   } else {
     if (myTZ.setLocation(settingNTPtimezone)){
       DebugTf("Timezone set to (using default): %s\r\n", CSTR(settingNTPtimezone));
       settingNTPtimezone = myTZ.getTimezoneName();
     } else { 
       DebugTln(errorString());
-      settingNTPtimezone = "CET";
+      settingNTPtimezone = "Europe/Amsterdam";
     }
   }
   // }

diff --git a/settingStuff.ino b/settingStuff.ino
@@ -85,7 +85,7 @@ void readSettings(bool show)
   if (settingMQTTtopTopic.length()==0) settingMQTTtopTopic = _HOSTNAME;
   settingNTPenable        = doc["NTPenable"]; 
   settingNTPtimezone      = doc["NTPtimezone"].as<String>();
-  if (settingNTPtimezone=="null")  settingNTPtimezone = "CET"; //default to amsterdam timezone
+  if (settingNTPtimezone=="null")  settingNTPtimezone = "Europe/Amsterdam"; //default to amsterdam timezone
   settingLEDblink         = doc["LEDblink"]|settingLEDblink;
 
   // Close the file (Curiously, File's destructor doesn't close the file)

diff --git a/version.h b/version.h
@@ -2,13 +2,13 @@
 #define _VERSION_MAJOR 0
 #define _VERSION_MINOR 7  
 #define _VERSION_PATCH 6
-#define _VERSION_BUILD 687
+#define _VERSION_BUILD 688
 //#define _VERSION_PRERELEASE beta  //uncomment to define prerelease labels: alpha - beta - rc
 #define _VERSION_DATE "22-02-2021"
-#define _VERSION_TIME "08:04:45"
+#define _VERSION_TIME "08:10:13"
 #define _SEMVER_CORE "0.7.6"
-#define _SEMVER_BUILD "0.7.6+687"
-#define _SEMVER_FULL "0.7.6+687"
+#define _SEMVER_BUILD "0.7.6+688"
+#define _SEMVER_FULL "0.7.6+688"
 #define _SEMVER_NOBUILD "0.7.6 (22-02-2021)"
-#define _VERSION "0.7.6+687 (22-02-2021)"
+#define _VERSION "0.7.6+688 (22-02-2021)"
 //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver