Merge branch 'master' into bug-esp8266#3795

Author: devyte

cores/esp8266/Arduino.h

@@ -202,6 +202,7 @@ void analogWriteRange(uint32_t range);
 
 unsigned long millis(void);
 unsigned long micros(void);
+uint64_t micros64(void);
 void delay(unsigned long);
 void delayMicroseconds(unsigned int us);
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
@@ -236,7 +237,7 @@ void optimistic_yield(uint32_t interval_us);
 #endif
 
 #ifdef __cplusplus
-
+#include <algorithm>
 #include "pgmspace.h"
 
 #include "WCharacter.h"
@@ -247,11 +248,10 @@ void optimistic_yield(uint32_t interval_us);
 #include "Updater.h"
 #include "debug.h"
 
-#ifndef _GLIBCXX_VECTOR
-// arduino is not compatible with std::vector
-#define min(a,b) ((a)<(b)?(a):(b))
-#define max(a,b) ((a)>(b)?(a):(b))
-#endif
+using std::min;
+using std::max;
+using std::isinf;
+using std::isnan;
 
 #define _min(a,b) ((a)<(b)?(a):(b))
 #define _max(a,b) ((a)>(b)?(a):(b))

cores/esp8266/core_esp8266_wiring.c

@@ -71,6 +71,13 @@ unsigned long ICACHE_RAM_ATTR micros() {
     return system_get_time();
 }
 
+uint64_t ICACHE_RAM_ATTR micros64() {
+    uint32_t low32_us = system_get_time();
+    uint32_t high32_us = micros_overflow_count + ((low32_us < micros_at_last_overflow_tick) ? 1 : 0);
+    uint64_t duration64_us = (uint64_t)high32_us << 32 | low32_us;
+    return duration64_us;
+}
+
 void ICACHE_RAM_ATTR delayMicroseconds(unsigned int us) {
     os_delay_us(us);
 }

cores/esp8266/time.c

@@ -31,23 +31,27 @@ struct timeval {
 
 extern char* sntp_asctime(const struct tm *t);
 extern struct tm* sntp_localtime(const time_t *clock);
+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 time_t s_bootTime = 0;
+static bool s_bootTimeSet = false;
+static uint64_t s_bootTime_us = 0;
 
 // calculate offset used in gettimeofday
 static void ensureBootTimeIsSet()
 {
-    if (!s_bootTime)
+    // Check just a bool flag instead of the full 64-bit s_bootTime for zero.
+    if (!s_bootTimeSet)
     {
-        time_t now = sntp_get_current_timestamp();
-        if (now)
+        time_t now_s = sntp_get_current_timestamp();
+        if (now_s)
         {
-            s_bootTime =  now - millis() / 1000;
+            s_bootTime_us = now_s * 1000000ULL - micros64();
+            s_bootTimeSet = true;
         }
     }
 }
@@ -100,8 +104,9 @@ int _gettimeofday_r(struct _reent* unused, struct timeval *tp, void *tzp)
     if (tp)
     {
         ensureBootTimeIsSet();
-        tp->tv_sec  = s_bootTime + millis() / 1000;
-        tp->tv_usec = micros();
+        uint64_t currentTime_us = s_bootTime_us + micros64();
+        tp->tv_sec = currentTime_us / 1000000ULL;
+        tp->tv_usec = currentTime_us % 1000000ULL;
     }
     return 0;
 }

libraries/ESP8266LLMNR/ESP8266LLMNR.cpp

@@ -50,7 +50,7 @@ extern "C" {
 
 //#define LLMNR_DEBUG
 
-#define BIT(x) (1 << (x))
+//BIT(x) is defined in tools/sdk/c_types.h
 
 #define FLAGS_QR                BIT(15)
 #define FLAGS_OP_SHIFT          11
@@ -226,14 +226,15 @@ void LLMNRResponder::_process_packet() {
         Serial.println("(no matching RRs)");
 #endif
 
-    struct ip_info remote_ip_info;
-    remote_ip_info.ip.addr = _conn->getRemoteAddress();
+    ip_addr_t remote_ip;
+    remote_ip.addr = _conn->getRemoteAddress();
+
     struct ip_info ip_info;
     bool match_ap = false;
     if (wifi_get_opmode() & SOFTAP_MODE) {
         wifi_get_ip_info(SOFTAP_IF, &ip_info);
-        if (ip_info.ip.addr && ip_addr_netcmp(&remote_ip_info.ip, &ip_info.ip, &ip_info.netmask))
-            match_ap = true;
+    if (ip_info.ip.addr && ip_addr_netcmp(&remote_ip, &ip_info.ip, &ip_info.netmask))
+        match_ap = true;
     }
     if (!match_ap)
         wifi_get_ip_info(STATION_IF, &ip_info);
@@ -272,8 +273,8 @@ void LLMNRResponder::_process_packet() {
         };
         _conn->append(reinterpret_cast<const char*>(rr), sizeof(rr));
     }
-    _conn->setMulticastInterface(remote_ip_info.ip);
-    _conn->send(&remote_ip_info.ip, _conn->getRemotePort());
+    _conn->setMulticastInterface(remote_ip);
+    _conn->send(&remote_ip, _conn->getRemotePort());
 }
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_LLMNR)

libraries/ESP8266SSDP/ESP8266SSDP.cpp

@@ -201,7 +201,7 @@ bool SSDPClass::begin(){
 
 void SSDPClass::_send(ssdp_method_t method){
   char buffer[1460];
-  uint32_t ip = WiFi.localIP();
+  IPAddress ip = WiFi.localIP();
 
   char valueBuffer[strlen_P(_ssdp_notify_template)+1];
   strcpy_P(valueBuffer, (method == NONE)?_ssdp_response_template:_ssdp_notify_template);
@@ -214,7 +214,7 @@ void SSDPClass::_send(ssdp_method_t method){
     _uuid,
     (method == NONE)?"ST":"NT",
     _deviceType,
-    IP2STR(&ip), _port, _schemaURL
+   ip[0], ip[1], ip[2], ip[3], _port, _schemaURL
   );
 
   _server->append(buffer, len);
@@ -244,11 +244,11 @@ void SSDPClass::_send(ssdp_method_t method){
 }
 
 void SSDPClass::schema(WiFiClient client){
-  uint32_t ip = WiFi.localIP();
+  IPAddress ip = WiFi.localIP();
   char buffer[strlen_P(_ssdp_schema_template)+1];
   strcpy_P(buffer, _ssdp_schema_template);
   client.printf(buffer,
-    IP2STR(&ip), _port,
+    ip[0], ip[1], ip[2], ip[3], _port,
     _deviceType,
     _friendlyName,
     _presentationURL,

libraries/Servo/src/Servo.h

@@ -77,7 +77,7 @@ class Servo
 public:
     Servo();
     uint8_t attach(int pin);           // attach the given pin to the next free channel, sets pinMode, returns channel number or 0 if failure
-    uint8_t attach(int pin, int min, int max); // as above but also sets min and max values for writes. 
+    uint8_t attach(int pin, uint16_t min, uint16_t max); // as above but also sets min and max values for writes. 
     void detach();
     void write(int value);             // if value is < 200 its treated as an angle, otherwise as pulse width in microseconds 
     void writeMicroseconds(int value); // Write pulse width in microseconds 

libraries/Servo/src/esp8266/Servo.cpp

@@ -221,7 +221,7 @@ uint8_t Servo::attach(int pin)
     return attach(pin, MIN_PULSE_WIDTH, MAX_PULSE_WIDTH);
 }
 
-uint8_t Servo::attach(int pin, int minUs, int maxUs)
+uint8_t Servo::attach(int pin, uint16_t minUs, uint16_t maxUs)
 {
     ServoTimerSequence timerId;
 
@@ -235,8 +235,8 @@ uint8_t Servo::attach(int pin, int minUs, int maxUs)
         // keep the min and max within 200-3000 us, these are extreme
         // ranges and should support extreme servos while maintaining
         // reasonable ranges
-        _maxUs = max(250, min(3000, maxUs));
-        _minUs = max(200, min(_maxUs, minUs));
+        _maxUs = max((uint16_t)250, min((uint16_t)3000, maxUs));
+        _minUs = max((uint16_t)200, min(_maxUs, minUs));
 
         // initialize the timerId if it has not already been initialized
         timerId = SERVO_INDEX_TO_TIMER(_servoIndex);