Skip to content

Tz update #7234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2020
Merged

Tz update #7234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94a6eae
TZ update
kugelkopf123 Apr 20, 2020
005f89e
Update time.cpp
kugelkopf123 Apr 20, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cores/esp8266/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ long secureRandom(long);
long secureRandom(long, long);
long map(long, long, long, long, long);

void setTZ(const char* tz);

void configTime(int timezone, int daylightOffset_sec, const char* server1,
const char* server2 = nullptr, const char* server3 = nullptr);

Expand Down
16 changes: 11 additions & 5 deletions cores/esp8266/time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,23 @@ void configTime(int timezone_sec, int daylightOffset_sec, const char* server1, c
/*** end of posix replacement ***/
}

void setTZ(const char* tz){

char tzram[strlen_P(tz) + 1];
memcpy_P(tzram, tz, sizeof(tzram));
setenv("TZ", tzram, 1/*overwrite*/);
tzset();
}

void configTime(const char* tz, const char* server1, const char* server2, const char* server3)
{
sntp_stop();

setServer(0, server1);
setServer(1, server2);
setServer(2, server3);
char tzram[strlen_P(tz) + 1];
memcpy_P(tzram, tz, sizeof(tzram));
setenv("TZ", tzram, 1/*overwrite*/);
tzset();

setTZ(tz);

sntp_init();
}