rebase time.c

Author: d-a-v

cores/esp8266/time.c

@@ -36,8 +36,6 @@ extern uint64_t micros64();
 // time gap in seconds from 01.01.1900 (NTP time) to 01.01.1970 (UNIX time)
 #define DIFF1900TO1970 2208988800UL
 
-static int s_daylightOffset_sec = 0;
-static long s_timezone_sec = 0;
 static bool s_bootTimeSet = false;
 static uint64_t s_bootTime_us = 0;
 
@@ -73,9 +71,10 @@ void configTime(int timezone, int daylightOffset_sec, const char* server1, const
     setServer(1, server2);
     setServer(2, server3);
 
-    s_timezone_sec = timezone;
-    s_daylightOffset_sec = daylightOffset_sec;
+    //s_timezone_sec = timezone;
+    //s_daylightOffset_sec = daylightOffset_sec;
     sntp_set_timezone(timezone/3600);
+    sntp_set_daylight(daylightOffset_sec);
     sntp_init();
 }
 

tools/sdk/lib/liblwip2.a

@@ -51,11 +51,17 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif
-
-void sntp_set_system_time (uint32_t t);
-
 #endif // defined(LWIP_BUILD)
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+void sntp_set_system_time (uint32_t t);	// also provided to user
+#ifdef __cplusplus
+}
+#endif
+
 #include "mem.h" // useful for os_malloc used in esp-arduino's mDNS
 
 typedef uint32_t sys_prot_t;	// not really used

tools/sdk/lwip2/builder

@@ -2986,7 +2986,10 @@
    --------------------------------------------------
 */
 #define SNTP_SERVER_DNS			1				// SNTP support DNS names through sntp_setservername / sntp_getservername
-#define SNTP_SERVER_ADDRESS		"pool.ntp.org"			// default
+// if SNTP_SERVER_ADDRESS is defined, it always overrides user's config
+// so we do not define it. sntp server can come from dhcp server, or by
+// user.
+//#define SNTP_SERVER_ADDRESS	"pool.ntp.org"			// default
 #define SNTP_GET_SERVERS_FROM_DHCP	1
 #define SNTP_SET_SYSTEM_TIME(t)		(sntp_set_system_time(t))	// implemented in lwip2-sntp.c