Merge remote-tracking branch 'remotes/esp8266/esp8266' into esp8266

cores/esp8266/Updater.cpp

@@ -114,8 +114,12 @@ bool UpdaterClass::end(bool evenIfRemaining){
 bool UpdaterClass::_writeBuffer(){
   noInterrupts();
   int rc = SPIEraseSector(_currentAddress/FLASH_SECTOR_SIZE);
+  interrupts();
+  yield();
   if(!rc){
+    noInterrupts();
     rc = SPIWrite(_currentAddress, _buffer, _bufferLen);
+    interrupts();
   }
   interrupts();
   if (rc) {

libraries/ESP8266httpUpdate/library.properties

@@ -5,4 +5,4 @@ maintainer=Markus Sattler
 sentence=Http Update for ESP8266
 paragraph=
 url=https://github.com/Links2004/Arduino/tree/esp8266/hardware/esp8266com/esp8266/libraries/ESP8266httpUpdate
-architectures=ESP8266
+architectures=esp8266

libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-#include "ESP8266HTTPUpdate.h"
+#include "ESP8266httpUpdate.h"
 
 ESP8266HTTPUpdate::ESP8266HTTPUpdate(void) {
 

libraries/ESP8266mDNS/examples/DNS_SD_Arduino_OTA/DNS_SD_Arduino_OTA.ino

@@ -54,8 +54,11 @@ void loop() {
     WiFiClient client;
     if (client.connect(remote, port)) {
     
-      Serial.setDebugOutput(true);
-      while(!Update.isFinished()) Update.write(client);
+      uint32_t written;
+      while(!Update.isFinished()){
+        written = Update.write(client);
+        if(written > 0) client.print(written, DEC);
+      }
       Serial.setDebugOutput(false);
     
       if(Update.end()){

tools/espota.py

@@ -48,12 +48,14 @@ def serve(remoteAddr, remotePort, filename):
     sys.stderr.write('Uploading')
     sys.stderr.flush()
     while True:
-      chunk = f.read(4096)
+      chunk = f.read(1460)
       if not chunk: break
       sys.stderr.write('.')
       sys.stderr.flush()
+      connection.settimeout(10)
       try:
         connection.sendall(chunk)
+        res = connection.recv(4)
       except:
         print('\nError Uploading', file=sys.stderr)
         connection.close()

tools/sdk/include/ip_addr.h

@@ -15,12 +15,6 @@ struct ip_info {
     struct ip_addr gw;
 };
 
-#define IP4_ADDR(ipaddr, a,b,c,d) \
-        (ipaddr)->addr = ((uint32)((d) & 0xff) << 24) | \
-                         ((uint32)((c) & 0xff) << 16) | \
-                         ((uint32)((b) & 0xff) << 8)  | \
-                          (uint32)((a) & 0xff)
-
 /**
  * Determine if two address are on the same network.
  *