Merge remote-tracking branch 'upstream/master' into ota_commands_in_flash

Author: davisonja

cores/esp8266/core_esp8266_features.h

@@ -32,10 +32,11 @@
 
 #define WIFI_HAS_EVENT_CALLBACK
 
-#ifdef __cplusplus
-
 #include <stdlib.h> // malloc()
 #include <stddef.h> // size_t
+#include <stdint.h>
+
+#ifdef __cplusplus
 
 namespace arduino
 {

cores/esp8266/core_esp8266_main.cpp

@@ -100,14 +100,15 @@ static void esp_yield_within_cont() {
         run_scheduled_recurrent_functions();
 }
 
-extern "C" void esp_yield() {
+extern "C" void __esp_yield() {
     if (can_yield()) {
         esp_yield_within_cont();
     }
 }
 
-extern "C" void esp_schedule() {
-    // always on CONT stack here
+extern "C" void esp_yield() __attribute__ ((weak, alias("__esp_yield")));
+
+extern "C" IRAM_ATTR void esp_schedule() {
     ets_post(LOOP_TASK_PRIORITY, 0, 0);
 }
 

libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp

@@ -551,7 +551,6 @@ bool HTTPClient::setURL(const String& url)
     }
     // disconnect but preserve _client
     disconnect(true);
-    clear();
     return beginInternal(url, nullptr);
 }
 

libraries/ESP8266SSDP/ESP8266SSDP.cpp

@@ -73,7 +73,7 @@ static const char _ssdp_packet_template[] PROGMEM =
   "SERVER: Arduino/1.0 UPNP/1.1 %s/%s\r\n" // _modelName, _modelNumber
   "USN: %s\r\n" // _uuid
   "%s: %s\r\n"  // "NT" or "ST", _deviceType
-  "LOCATION: http://%u.%u.%u.%u:%u/%s\r\n" // WiFi.localIP(), _port, _schemaURL
+  "LOCATION: http://%s:%u/%s\r\n" // WiFi.localIP(), _port, _schemaURL
   "\r\n";
 
 static const char _ssdp_schema_template[] PROGMEM =
@@ -88,7 +88,7 @@ static const char _ssdp_schema_template[] PROGMEM =
   "<major>1</major>"
   "<minor>0</minor>"
   "</specVersion>"
-  "<URLBase>http://%u.%u.%u.%u:%u/</URLBase>" // WiFi.localIP(), _port
+  "<URLBase>http://%s:%u/</URLBase>" // WiFi.localIP(), _port
   "<device>"
   "<deviceType>%s</deviceType>"
   "<friendlyName>%s</friendlyName>"
@@ -247,7 +247,7 @@ void SSDPClass::_send(ssdp_method_t method) {
                        _uuid,
                        (method == NONE) ? "ST" : "NT",
                        (_st_is_uuid) ? _uuid : _deviceType,
-                       ip[0], ip[1], ip[2], ip[3], _port, _schemaURL
+                       ip.toString().c_str(), _port, _schemaURL
                       );
 
   _server->append(buffer, len);
@@ -276,12 +276,12 @@ void SSDPClass::_send(ssdp_method_t method) {
   _server->send(remoteAddr, remotePort);
 }
 
-void SSDPClass::schema(WiFiClient client) {
+void SSDPClass::schema(Print &client) const {
   IPAddress ip = WiFi.localIP();
   char buffer[strlen_P(_ssdp_schema_template) + 1];
   strcpy_P(buffer, _ssdp_schema_template);
   client.printf(buffer,
-                ip[0], ip[1], ip[2], ip[3], _port,
+                ip.toString().c_str(), _port,
                 _deviceType,
                 _friendlyName,
                 _presentationURL,

libraries/ESP8266SSDP/ESP8266SSDP.h

@@ -62,7 +62,8 @@ class SSDPClass{
     ~SSDPClass();
     bool begin();
     void end();
-    void schema(WiFiClient client);
+    void schema(WiFiClient client) const { schema((Print&)std::ref(client)); }
+    void schema(Print &print) const;
     void setDeviceType(const String& deviceType) { setDeviceType(deviceType.c_str()); }
     void setDeviceType(const char *deviceType);
 

libraries/ESP8266SdFat

@@ -67,6 +67,23 @@ void setup(void) {
     server.send(200, "text/plain", "this works as well");
   });
 
+  server.on("/gif", []() {
+    static const uint8_t gif[] PROGMEM = {
+      0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x10, 0x00, 0x10, 0x00, 0x80, 0x01,
+      0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x2c, 0x00, 0x00, 0x00, 0x00,
+      0x10, 0x00, 0x10, 0x00, 0x00, 0x02, 0x19, 0x8c, 0x8f, 0xa9, 0xcb, 0x9d,
+      0x00, 0x5f, 0x74, 0xb4, 0x56, 0xb0, 0xb0, 0xd2, 0xf2, 0x35, 0x1e, 0x4c,
+      0x0c, 0x24, 0x5a, 0xe6, 0x89, 0xa6, 0x4d, 0x01, 0x00, 0x3b
+    };
+    char gif_colored[sizeof(gif)];
+    memcpy_P(gif_colored, gif, sizeof(gif));
+    // Set the background to a random set of colors
+    gif_colored[16] = millis() % 256;
+    gif_colored[17] = millis() % 256;
+    gif_colored[18] = millis() % 256;
+    server.send(200, "image/gif", gif_colored, sizeof(gif_colored));
+  });
+
   server.onNotFound(handleNotFound);
 
   server.begin();

libraries/ESP8266WebServer/examples/HelloServer/HelloServer.ino

@@ -241,6 +241,7 @@ void printDirectory() {
     entry.close();
   }
   server.sendContent("]");
+  server.sendContent(""); // Terminate the HTTP chunked transmission with a 0-length chunk
   dir.close();
 }
 

libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino

@@ -127,6 +127,15 @@ class ESP8266WebServerTemplate
   void send(int code, const char* content_type = NULL, const String& content = String(""));
   void send(int code, char* content_type, const String& content);
   void send(int code, const String& content_type, const String& content);
+  void send(int code, const char *content_type, const char *content, size_t content_length = 0) {
+    if (content_length == 0) {
+      content_length = strlen_P(content);
+    }
+    send_P(code, content_type, content, content_length);
+  }
+  void send(int code, const char *content_type, const uint8_t *content, size_t content_length) {
+    send_P(code, content_type, (const char *)content, content_length);
+  }
   void send_P(int code, PGM_P content_type, PGM_P content);
   void send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength);
 

libraries/ESP8266WebServer/src/ESP8266WebServer.h

@@ -102,7 +102,7 @@ class StaticRequestHandler : public RequestHandler<ServerType> {
             // Append whatever follows this URI in request to get the file path.
             path += requestUri.substring(_baseUriLength);
 
-            if (!_fs.exists(path) && path.endsWith(".htm")) {
+            if (!_fs.exists(path) && path.endsWith(".htm") && _fs.exists(path + "l")) {
                 path += "l";
             }
         }