arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-27 18:02:17 +03:00
Code Activity

Merge pull request #995 from Juppit/master

Browse Source 
Updates for time.c
This commit is contained in:
Ivan Grokhotkov
2015-11-10 23:31:32 +03:00
parent 810ab68ae5 a394787aa1
commit a928025ccf
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp8266/Arduino.h
View File

@ -271,7 +271,7 @@ long random(long, long);
void randomSeed(unsigned long); void randomSeed(unsigned long);
long map(long, long, long, long, long); long map(long, long, long, long, long);
extern "C" void configTime(int timezone, int daylightOffset_sec, extern "C" void configTime(long timezone, int daylightOffset_sec,
const char* server1, const char* server2 = nullptr, const char* server3 = nullptr); const char* server1, const char* server2 = nullptr, const char* server3 = nullptr);
#endif #endif

7
cores/esp8266/time.c
View File

@ -35,7 +35,7 @@ extern struct tm* sntp_localtime(const time_t *clock);
#define DIFF1900TO1970 2208988800UL #define DIFF1900TO1970 2208988800UL
static int s_daylightOffset_sec = 0; static int s_daylightOffset_sec = 0;
static int s_timezone_sec = 0; static long s_timezone_sec = 0;
static time_t s_bootTime = 0; static time_t s_bootTime = 0;
// calculate offset used in gettimeofday // calculate offset used in gettimeofday
@ -46,7 +46,7 @@ static void ensureBootTimeIsSet()
time_t now = sntp_get_current_timestamp(); time_t now = sntp_get_current_timestamp();
if (now) if (now)
{ {
s_bootTime = - millis() / 1000; s_bootTime = now - millis() / 1000;
} }
} }
} }
@ -56,7 +56,7 @@ static void setServer(int id, const char* name_or_ip)
if (name_or_ip) if (name_or_ip)
{ {
//TODO: check whether server is given by name or IP //TODO: check whether server is given by name or IP
sntp_setservername(0, (char*) name_or_ip); sntp_setservername(id, (char*) name_or_ip);
} }
} }
@ -92,7 +92,6 @@ time_t mktime(struct tm *t)
time_t time(time_t * t) time_t time(time_t * t)
{ {
time_t seconds = sntp_get_current_timestamp(); time_t seconds = sntp_get_current_timestamp();
ensureBootTimeIsSet();
if (t) if (t)
{ {
*t = seconds; *t = seconds;