Merge branch 'master' into constcharweb

Author: devyte

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,12 +100,14 @@ 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_yield() __attribute__ ((weak, alias("__esp_yield")));
+
 extern "C" void esp_schedule() {
     // always on CONT stack here
     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/ESP8266WebServer/examples/SDWebServer/SDWebServer.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/src/detail/RequestHandlersImpl.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";
             }
         }

libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp

@@ -443,7 +443,7 @@ bool ESP8266WiFiGenericClass::mode(WiFiMode_t m, WiFiState* state) {
     //tasks to wait correctly.
     constexpr unsigned int timeoutValue = 1000; //1 second
     if(can_yield()) {
-        using oneShot = esp8266::polledTimeout::oneShotFastUs;
+        using oneShot = esp8266::polledTimeout::oneShotFastMs;
         oneShot timeout(timeoutValue);
         while(wifi_get_opmode() != (uint8) m && !timeout)
             delay(5);

platform.txt

@@ -149,7 +149,7 @@ tools.esptool.upload.params.quiet=
 # First, potentially perform an erase or nothing
 # Next, do the binary upload
 # Combined in one rule because Arduino doesn't suport upload.1.pattern/upload.3.pattern
-tools.esptool.upload.pattern="{cmd}" "{runtime.platform.path}/tools/upload.py" --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" {upload.erase_cmd} {upload.resetmethod} "{build.path}/{build.project_name}.bin"
+tools.esptool.upload.pattern="{cmd}" "{runtime.platform.path}/tools/upload.py" --chip esp8266 --port "{serial.port}" --baud "{upload.speed}" "{upload.verbose}" {upload.erase_cmd} {upload.resetmethod} write_flash 0x0 "{build.path}/{build.project_name}.bin"
 
 tools.esptool.upload.network_pattern="{network_cmd}" "{runtime.platform.path}/tools/espota.py" -i "{serial.port}" -p "{network.port}" "--auth={network.password}" -f "{build.path}/{build.project_name}.bin"
 

tools/upload.py

@@ -22,6 +22,7 @@
 
 cmdline = []
 write_option = ''
+write_addr = '0x0'
 erase_addr = ''
 erase_len = ''
 
@@ -38,28 +39,26 @@
     # https://github.com/esp8266/Arduino/issues/6755#issuecomment-553208688
     if thisarg == "erase_flash":
         write_option = '--erase-all'
-        thisarg = ''
-
-    if thisarg == 'erase_region':
+    elif thisarg == 'erase_region':
         erase_addr = sys.argv.pop(0)
         erase_len = sys.argv.pop(0)
-        thisarg = ''
-
-    if os.path.isfile(thisarg):
-        binary = thisarg
-        thisarg = ''
-
-    if len(thisarg):
+    elif thisarg == '--end':
+        # Backwards compatibility with fs upload tools, eat --end
+        pass
+    elif thisarg == 'write_flash':
+        write_addr = sys.argv.pop(0)
+        binary = sys.argv.pop(0)
+    elif len(thisarg):
         cmdline = cmdline + [thisarg]
 
 cmdline = cmdline + ['write_flash']
 if len(write_option):
     cmdline = cmdline + [write_option]
-cmdline = cmdline + ['0x0', binary]
+cmdline = cmdline + [write_addr, binary]
 
 erase_file = ''
 if len(erase_addr):
-    # generate temporary empty (0xff) file
+    # Generate temporary empty (0xff) file
     eraser = tempfile.mkstemp()
     erase_file = eraser[1]
     os.write(eraser[0], bytearray([255] * int(erase_len, 0)))