jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 12:16:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Etc the default time region

Browse Source
This commit is contained in:
fvanroie 2023-02-09 23:15:39 +01:00
parent 634c89a386
commit 62999284b2
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sys/net/hasp_time.cpp
View File

@ -41,7 +41,6 @@ void timeSetup()
String zone((char*)0); String zone((char*)0);
zone = preferences.getString("zone", TIMEZONE); zone = preferences.getString("zone", TIMEZONE);
// mytz = preferences.getString("tz", MYTZ);
mytz = time_zone_to_possix(zone.c_str()); mytz = time_zone_to_possix(zone.c_str());
ntp1 = preferences.getString("ntp1", NTPSERVER1); ntp1 = preferences.getString("ntp1", NTPSERVER1);
ntp2 = preferences.getString("ntp2", NTPSERVER2); ntp2 = preferences.getString("ntp2", NTPSERVER2);
@ -60,6 +59,7 @@ String time_zone_to_possix(const char* timezone)
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
uint16_t sdbm = 0; uint16_t sdbm = 0;
// sdbm doesn't parse numbers in the string; get the Etc/GMT hash from the offset to Greenwich
if(timezone == strstr(timezone, "Etc/GMT")) { // startsWith Etc/GMT if(timezone == strstr(timezone, "Etc/GMT")) { // startsWith Etc/GMT
int offset = atoi(timezone + 7); int offset = atoi(timezone + 7);
const uint16_t gmt[] = {TZ_ETC_GMT__14, TZ_ETC_GMT__13, TZ_ETC_GMT__12, TZ_ETC_GMT__11, TZ_ETC_GMT__10, const uint16_t gmt[] = {TZ_ETC_GMT__14, TZ_ETC_GMT__13, TZ_ETC_GMT__12, TZ_ETC_GMT__11, TZ_ETC_GMT__10,
@ -68,12 +68,12 @@ String time_zone_to_possix(const char* timezone)
TZ_ETC_GMT1, TZ_ETC_GMT2, TZ_ETC_GMT3, TZ_ETC_GMT4, TZ_ETC_GMT5, TZ_ETC_GMT1, TZ_ETC_GMT2, TZ_ETC_GMT3, TZ_ETC_GMT4, TZ_ETC_GMT5,
TZ_ETC_GMT6, TZ_ETC_GMT7, TZ_ETC_GMT8, TZ_ETC_GMT9, TZ_ETC_GMT10, TZ_ETC_GMT6, TZ_ETC_GMT7, TZ_ETC_GMT8, TZ_ETC_GMT9, TZ_ETC_GMT10,
TZ_ETC_GMT11, TZ_ETC_GMT12}; TZ_ETC_GMT11, TZ_ETC_GMT12};
offset += 14; int index = offset + 14;
if(offset >= 0 && offset < sizeof(gmt) / sizeof(gmt[0])) { if(index >= 0 && index < sizeof(gmt) / sizeof(gmt[0])) {
sdbm = gmt[offset]; sdbm = gmt[index];
LOG_DEBUG(TAG_TIME, "Etc/GMT%d (%d)", offset - 14, sdbm); LOG_DEBUG(TAG_TIME, "Etc/GMT%d (%d)", offset, sdbm);
} else { } else {
LOG_WARNING(TAG_TIME, "Invalid offset Etc/GMT%d", offset - 14); LOG_WARNING(TAG_TIME, "Invalid offset Etc/GMT%d", offset);
} }
} else { } else {
sdbm = Parser::get_sdbm(timezone); sdbm = Parser::get_sdbm(timezone);
@ -636,8 +636,8 @@ String time_zone_to_possix(const char* timezone)
return "WITA-8"; return "WITA-8";
} }
#endif #endif
LOG_WARNING(TAG_TIME, F("Timezone %s (%d) not found, using %s"), timezone, sdbm, MYTZ); LOG_WARNING(TAG_TIME, F("Timezone %s (%d) not found, using %s"), timezone, sdbm, TIMEZONE);
return MYTZ; return TIMEZONE;
} }
/* ===== Read/Write Configuration ===== */ /* ===== Read/Write Configuration ===== */
@ -649,7 +649,7 @@ bool timeGetConfig(const JsonObject& settings)
nvs_user_begin(preferences, "time", true); nvs_user_begin(preferences, "time", true);
settings["zone"] = preferences.getString("zone", TIMEZONE); settings["zone"] = preferences.getString("zone", TIMEZONE);
settings["region"] = preferences.getString("region", ""); settings["region"] = preferences.getString("region", "etc");
settings["ntp"][0] = preferences.getString("ntp1", NTPSERVER1); settings["ntp"][0] = preferences.getString("ntp1", NTPSERVER1);
settings["ntp"][1] = preferences.getString("ntp2", NTPSERVER2); settings["ntp"][1] = preferences.getString("ntp2", NTPSERVER2);
settings["ntp"][2] = preferences.getString("ntp3", NTPSERVER3); settings["ntp"][2] = preferences.getString("ntp3", NTPSERVER3);

3
src/sys/net/hasp_time.h
View File

@ -27,6 +27,9 @@ bool timeSetConfig(const JsonObject& settings);
#ifndef TIMEZONE #ifndef TIMEZONE
#define TIMEZONE "Etc/GMT0" #define TIMEZONE "Etc/GMT0"
#endif #endif
#ifndef TIMEREGION
#define TIMEREGION "etc"
#endif
#ifndef NTPSERVER1 #ifndef NTPSERVER1
#define NTPSERVER1 "pool.ntp.org" #define NTPSERVER1 "pool.ntp.org"