arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-21 21:22:31 +03:00
Code Activity

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

Browse Source 
* simple TZ api: bypass sprintf/sscanf: + 7KB
This commit is contained in:
david gauchard
2020-02-25 11:16:10 +01:00
committed by GitHub
parent 4b2bf45933
commit abdd2bdbb6
1 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cores/esp8266/time.cpp
View File

@ -133,12 +133,13 @@ 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) 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 // There is no way to tell when DST starts or stop with this API
// So DST is always integrated in TZ // So DST is always integrated in TZ
// The other API should be preferred // The other API should be preferred
/*** portable version using posix API
(calls sprintf here, then sscanf internally)
int tzs = daylightOffset_sec + timezone_sec; int tzs = daylightOffset_sec + timezone_sec;
int tzh = tzs / 3600; int tzh = tzs / 3600;
tzs -= tzh * 3600; tzs -= tzh * 3600;
@ -146,8 +147,43 @@ void configTime(int timezone_sec, int daylightOffset_sec, const char* server1, c
tzs -= tzm * 60; tzs -= tzm * 60;
// man tzset: // man tzset:
char tzstr [64];
snprintf(tzstr, sizeof tzstr, "ESPUSER<%+d:%02d:%02d>", tzh, tzm, tzs); snprintf(tzstr, sizeof tzstr, "ESPUSER<%+d:%02d:%02d>", tzh, tzm, tzs);
return configTime(tzstr, server1, server2, server3); return configTime(tzstr, server1, server2, server3);
Replaced by light code found from
newlib inspection and internal structure hacking
(no sprintf, no sscanf, -7584 flash bytes):
***/
static char gmt[] = "GMT";
_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);
/*** end of posix replacement ***/
} }
void configTime(const char* tz, const char* server1, const char* server2, const char* server3) void configTime(const char* tz, const char* server1, const char* server2, const char* server3)