- Notifications
You must be signed in to change notification settings - Fork13.2k
simple TZ api: bypass sprintf/sscanf: + 7KB#7109
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
2 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
NextNext commit
simple TZ api: bypass sprintf/sscanf: + 7KB
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit058e4762cf221df70f4c544c5554ea40b0c2a7c2
There are no files selected for viewing
41 changes: 39 additions & 2 deletionscores/esp8266/time.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) | ||
| { | ||
| // 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. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| // 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) | ||
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.