arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

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

Browse Source
This commit is contained in:
Markus Sattler 2015-07-13 10:37:26 +02:00
commit b54a98ba03
8 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bootloaders/eboot/eboot.elf
View File

Binary file not shown.

4
cores/esp8266/Updater.cpp
View File

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

0
changes.md → doc/changes.md
View File

2
libraries/ESP8266httpUpdate/library.properties
View File

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

2
libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
View File

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

7
libraries/ESP8266mDNS/examples/DNS_SD_Arduino_OTA/DNS_SD_Arduino_OTA.ino
View File

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

4
tools/espota.py
View File

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

6
tools/sdk/include/ip_addr.h
View File

@ -15,12 +15,6 @@ struct ip_info {
struct ip_addr gw; 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. * Determine if two address are on the same network.
* *