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

Conflicts:
	hardware/esp8266com/esp8266/cores/esp8266/Updater.cpp
	hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/include/ClientContext.h

Author: Links2004

boards.txt

@@ -181,7 +181,7 @@ nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
 
 nodemcu.upload.tool=esptool
 nodemcu.upload.speed=115200
-nodemcu.upload.resetmethod=ck
+nodemcu.upload.resetmethod=nodemcu
 nodemcu.upload.maximum_size=1044464
 nodemcu.upload.maximum_data_size=81920
 nodemcu.upload.wait_for_upload_port=true

cores/esp8266/Esp.cpp

@@ -400,3 +400,26 @@ bool EspClass::updateSketch(Stream& in, uint32_t size, bool restartOnFail, bool
     if(restartOnSuccess) ESP.restart();
     return true;
 }
+
+static const int FLASH_INT_MASK = ((B10 << 8) | B00111010);
+
+bool EspClass::flashEraseSector(uint32_t sector) {
+    ets_isr_mask(FLASH_INT_MASK);
+    int rc = spi_flash_erase_sector(sector);
+    ets_isr_unmask(FLASH_INT_MASK);
+    return rc == 0;
+}
+
+bool EspClass::flashWrite(uint32_t offset, uint32_t *data, size_t size) {
+    ets_isr_mask(FLASH_INT_MASK);
+    int rc = spi_flash_write(offset, (uint32_t*) data, size);
+    ets_isr_unmask(FLASH_INT_MASK);
+    return rc == 0;
+}
+
+bool EspClass::flashRead(uint32_t offset, uint32_t *data, size_t size) {
+    ets_isr_mask(FLASH_INT_MASK);
+    int rc = spi_flash_read(offset, (uint32_t*) data, size);
+    ets_isr_unmask(FLASH_INT_MASK);
+    return rc == 0;
+}

cores/esp8266/Esp.h

@@ -117,6 +117,10 @@ class EspClass {
         FlashMode_t getFlashChipMode();
         uint32_t getFlashChipSizeByChipId();
 
+        bool flashEraseSector(uint32_t sector);
+        bool flashWrite(uint32_t offset, uint32_t *data, size_t size);
+        bool flashRead(uint32_t offset, uint32_t *data, size_t size);
+
         uint32_t getSketchSize();
         uint32_t getFreeSketchSpace();
         bool updateSketch(Stream& in, uint32_t size, bool restartOnFail = false, bool restartOnSuccess = true);

cores/esp8266/FS.cpp

@@ -144,6 +144,14 @@ String Dir::fileName() {
     return _impl->fileName();
 }
 
+size_t Dir::fileSize() {
+    if (!_impl) {
+        return 0;
+    }
+
+    return _impl->fileSize();
+}
+
 bool Dir::next() {
     if (!_impl) {
         return false;

cores/esp8266/FS.h

@@ -78,6 +78,7 @@ class Dir {
 
     File openFile(const char* mode);
     String fileName();
+    size_t fileSize();
     bool next();
 
 protected:

cores/esp8266/FSImpl.h

@@ -56,6 +56,7 @@ class DirImpl {
     virtual ~DirImpl() { }
     virtual FileImplPtr openFile(OpenMode openMode, AccessMode accessMode) = 0;
     virtual const char* fileName() = 0;
+    virtual size_t fileSize() = 0;
     virtual bool next() = 0;
 };
 

cores/esp8266/Updater.cpp

@@ -5,6 +5,11 @@
 
 //#define DEBUG_UPDATER Serial
 
+extern "C" {
+    #include "c_types.h"
+    #include "spi_flash.h"
+}
+
 extern "C" uint32_t _SPIFFS_start;
 
 UpdaterClass::UpdaterClass() 
@@ -112,28 +117,14 @@ bool UpdaterClass::end(bool evenIfRemaining){
   return true;
 }
 
-bool UpdaterClass::_writeBuffer() {
-    int rc = 0;
-    delay(2); // give the rtos some time to handle TCP
-    {
-        AutoInterruptLock(15);
-        rc = SPIEraseSector(_currentAddress / FLASH_SECTOR_SIZE);
-    }
-
-    delay(2); // give the rtos some time to handle TCP
-
-    if(!rc) {
-        {
-            AutoInterruptLock(15);
-            rc = SPIWrite(_currentAddress, _buffer, _bufferLen);
-        }
-    }
-
-    delay(2); // give the rtos some time to handle TCP
+bool UpdaterClass::_writeBuffer(){
+  yield();
+  bool result = ESP.flashEraseSector(_currentAddress/FLASH_SECTOR_SIZE) &&
+                ESP.flashWrite(_currentAddress, (uint32_t*) _buffer, _bufferLen);
 
-    if(rc) {
-        _error = UPDATE_ERROR_WRITE;
-        _currentAddress = (_startAddress + _size);
+  if (!result) {
+    _error = UPDATE_ERROR_WRITE;
+    _currentAddress = (_startAddress + _size);
 #ifdef DEBUG_UPDATER
         printError(DEBUG_UPDATER);
 #endif

cores/esp8266/core_esp8266_noniso.c

@@ -148,7 +148,8 @@ char* ultoa(unsigned long value, char* result, int base) {
 }
 
 char * dtostrf(double number, signed char width, unsigned char prec, char *s) {
-
+    bool negative = false;
+    
     if (isnan(number)) {
         strcpy(s, "nan");
         return s;
@@ -158,50 +159,65 @@ char * dtostrf(double number, signed char width, unsigned char prec, char *s) {
         return s;
     }
 
-    if (number > 4294967040.0 || number < -4294967040.0) {
-        strcpy(s, "ovf");
-        return s;
-    }
-
     char* out = s;
-    int signInt_Part = 1;
-
+   
+    int fillme = width; // how many cells to fill for the integer part
+    if (prec > 0) {
+        fillme -= (prec+1);
+    } 
+   
     // Handle negative numbers
     if (number < 0.0) {
-        signInt_Part = -1;
+        negative = true;
+        fillme--;
         number = -number;
     }
 
-    // calc left over digits 
-    if (prec > 0)
-    {
-        width -= (prec + 1);
-    }
-
     // Round correctly so that print(1.999, 2) prints as "2.00"
-    double rounding = 0.5;
+    // I optimized out most of the divisions
+    double rounding = 2.0;
     for (uint8_t i = 0; i < prec; ++i)
-        rounding /= 10.0;
+        rounding *= 10.0;     
+    rounding = 1.0 / rounding; 
 
     number += rounding;
-
-    // Extract the integer part of the number and print it
-    unsigned long int_part = (unsigned long)number;
-    double remainder = number - (double)int_part;
-    out += sprintf(out, "%*ld", width, int_part * signInt_Part);
-
-    // Print the decimal point, but only if there are digits beyond
-    if (prec > 0) {
-        *out = '.';
-        ++out;
-
-
-        for (unsigned char decShift = prec; decShift > 0; decShift--) {
-            remainder *= 10.0;
-        }
-        sprintf(out, "%0*d", prec, (int)remainder);
+   
+    // Figure out how big our number really is
+    double tenpow = 1.0;
+    int digitcount = 1;
+    while (number >= 10.0 * tenpow) {
+        tenpow *= 10.0;   
+        digitcount++;
+    }
+   
+    number /= tenpow;
+    fillme -= digitcount;
+   
+    // Pad unused cells with spaces
+    while (fillme-- > 0) {
+        *out++ = ' ';
+    }
+    
+    // Handle negative sign
+    if (negative) *out++ = '-';
+   
+    // Print the digits, and if necessary, the decimal point
+    digitcount += prec;
+    int8_t digit = 0;
+    while (digitcount-- > 0) {       
+        digit = (int8_t)number;
+        if (digit > 9) digit = 9; // insurance
+        *out++ = (char)('0' | digit);
+        if ((digitcount == prec) && (prec > 0)) {
+            *out++ = '.';
+        }   
+        number -= digit;
+        number *= 10.0;
     }
 
+    // make sure the string is terminated
+    *out = 0;
     return s;
 }
 
+

cores/esp8266/spiffs/README

@@ -1,5 +1,5 @@
 SPIFFS (SPI Flash File System)
-V0.3.0
+V0.3.2
 
 Copyright (c) 2013-2015 Peter Andersson (pelleplutt1976<at>gmail.com)
 
@@ -58,6 +58,30 @@ For testing and contributions, see the docs/IMPLEMENTING file.
 
 * HISTORY
 
+0.3.2
+  Limit cache size if too much cache is given (thanks pgeiem)
+  New feature - Controlled erase. #23
+  SPIFFS_rename leaks file descriptors #28 (thanks benpicco)
+  moved dbg print defines in test framework to params_test.h
+  lseek should return the resulting offset (thanks hefloryd)
+  fixed type on dbg ifdefs
+  silence warning about signed/unsigned comparison when spiffs_obj_id is 32 bit (thanks benpicco)
+  Possible error in test_spiffs.c #21 (thanks yihcdaso-yeskela)
+  Cache might writethrough too often #16
+  even moar testrunner updates
+  Test framework update and some added tests
+  Some thoughts for next gen
+  Test sigsevs when having too many sectors #13  (thanks alonewolfx2)
+  GC might be suboptimal #11
+  Fix eternal readdir when objheader at last block, last entry
+  
+  New API functions:
+    SPIFFS_gc_quick - call a nonintrusive gc
+    SPIFFS_gc - call a full-scale intrusive gc
+
+0.3.1
+  Removed two return warnings, was too triggerhappy on release
+
 0.3.0
   Added existing namecheck when creating files
   Lots of static analysis bugs #6