add synchronous ota

fungxu · Jul 10, 2015 · 260fd2d · 260fd2d
1 parent 5012228
commit 260fd2d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/hardware/esp8266com/esp8266/bootloaders/eboot/eboot.elf b/hardware/esp8266com/esp8266/bootloaders/eboot/eboot.elf
diff --git a/hardware/esp8266com/esp8266/cores/esp8266/Updater.cpp b/hardware/esp8266com/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);
-  if (!rc) {
+  interrupts();
+  yield();
+  if(!rc){
+    noInterrupts();
     rc = SPIWrite(_currentAddress, _buffer, _bufferLen);
+    interrupts();
   }
   interrupts();
   if (rc) {

diff --git a/hardware/esp8266com/esp8266/tools/espota.py b/hardware/esp8266com/esp8266/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()

diff --git a/hardware/esp8266com/esp8266/tools/sdk/include/ip_addr.h b/hardware/esp8266com/esp8266/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.
  *