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

simple TZ api: bypass sprintf/sscanf: + 7KB #7109

Merged
merged 2 commits into from
Feb 25, 2020
Merged

simple TZ api: bypass sprintf/sscanf: + 7KB #7109

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
058e476
simple TZ api: bypass sprintf/sscanf: + 7KB
d-a-v Feb 24, 2020
b897f74
using obfuscating comments instead of #if 0
d-a-v Feb 25, 2020
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
41 changes: 39 additions & 2 deletions cores/esp8266/time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,58 @@ int _gettimeofday_r(struct _reent* unused, struct timeval *tp, void *tzp)

void configTime(int timezone_sec, int daylightOffset_sec, const char* server1, const char* server2, const char* server3)
{
char tzstr [64];

// There is no way to tell when DST starts or stop with this API
// So DST is always integrated in TZ
// The other API should be preferred

#if 0
d-a-v marked this conversation as resolved.
Show resolved Hide resolved

// using posix API (calls sprintf here, sscanf internally)

int tzs = daylightOffset_sec + timezone_sec;
int tzh = tzs / 3600;
tzs -= tzh * 3600;
int tzm = tzs / 60;
tzs -= tzm * 60;

// man tzset:
char tzstr [64];
snprintf(tzstr, sizeof tzstr, "ESPUSER<%+d:%02d:%02d>", tzh, tzm, tzs);
return configTime(tzstr, server1, server2, server3);

#else

// newlib inspection and internal structure hacking
// no sprintf, no sscanf, -7584 flash bytes

static char gmt[] = "GMT";

// newlib inspection and hack
_timezone = timezone_sec + daylightOffset_sec;
_daylight = 0;
_tzname[0] = gmt;
_tzname[1] = gmt;
auto tz = __gettzinfo();
tz->__tznorth = 1;
tz->__tzyear = 0;
for (int i = 0; i < 2; i++)
{
auto tzr = &tz->__tzrule[i];
tzr->ch = 74;
tzr->m = 0;
tzr->n = 0;
tzr->d = 0;
tzr->s = 0;
tzr->change = 0;
tzr->offset = _timezone;
}

// sntp servers
setServer(0, server1);
setServer(1, server2);
setServer(2, server3);

#endif
}

void configTime(const char* tz, const char* server1, const char* server2, const char* server3)
Expand Down