Skip to content
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

Jump to bottom

Backported getLocalTime from ESP32 Arduino #8407

Closed
wants to merge 1 commit into from
Closed

Backported getLocalTime from ESP32 Arduino #8407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

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 @@ -279,6 +279,8 @@ inline void configTzTime(const char* tz, const char* server1,
configTime(tz, server1, server2, server3);
}

bool getLocalTime(struct tm * info, uint32_t ms = 5000);

// Everything we expect to be implicitly loaded for the sketch
#include <pgmspace.h>

Expand Down
29 changes: 24 additions & 5 deletions cores/esp8266/time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ void configTime(int timezone_sec, int daylightOffset_sec, const char* server1, c
sntp_init();
}

void setTZ(const char* tz){
void setTZ(const char* tz)
{
char tzram[strlen_P(tz) + 1];
memcpy_P(tzram, tz, sizeof(tzram));
setenv("TZ", tzram, 1/*overwrite*/);
Expand All @@ -198,15 +198,33 @@ void setTZ(const char* tz){
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);
setTZ(tz);

setTZ(tz);
sntp_init();
}

/*
* Backported from ESP32 Arduino
*/
bool getLocalTime(struct tm * info, uint32_t ms)
{
uint32_t start = millis();
time_t now;
while ((millis()-start) <= ms)
{
time(&now);
localtime_r(&now, info);
if (info->tm_year > (2016 - 1900))
{
return true;
}
delay(10);
}
return false;
}

static BoolCB _settimeofday_cb;

void settimeofday_cb (const TrivialCB& cb)
Expand Down Expand Up @@ -258,3 +276,4 @@ int settimeofday(const struct timeval* tv, const struct timezone* tz)
}

};