Merge pull request #6 from esp8266/esp8266

pull master

Author: me-no-dev

boards.txt

@@ -112,13 +112,22 @@ generic.menu.FlashSize.2M.build.spiffs_end=0x1FB000
 generic.menu.FlashSize.2M.build.spiffs_blocksize=8192
 generic.menu.FlashSize.2M.upload.maximum_size=1044464
 
-generic.menu.FlashSize.4M=4M (3M SPIFFS)
-generic.menu.FlashSize.4M.build.flash_size=4M
-generic.menu.FlashSize.4M.build.flash_ld=eagle.flash.4m.ld
-generic.menu.FlashSize.4M.build.spiffs_start=0x100000
-generic.menu.FlashSize.4M.build.spiffs_end=0x3FB000
-generic.menu.FlashSize.4M.build.spiffs_blocksize=8192
-generic.menu.FlashSize.4M.upload.maximum_size=1044464
+generic.menu.FlashSize.4M1M=4M (1M SPIFFS)
+generic.menu.FlashSize.4M1M.build.flash_size=4M
+generic.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+generic.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+generic.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+generic.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+generic.menu.FlashSize.4M1M.build.spiffs_pagesize=256
+generic.menu.FlashSize.4M1M.upload.maximum_size=1044464
+
+generic.menu.FlashSize.4M3M=4M (3M SPIFFS)
+generic.menu.FlashSize.4M3M.build.flash_size=4M
+generic.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+generic.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+generic.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+generic.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+generic.menu.FlashSize.4M3M.upload.maximum_size=1044464
 
 # disabled because espressif's bootloader refuses to write above 4M
 # generic.menu.FlashSize.8M=8M (7M SPIFFS)
@@ -154,11 +163,6 @@ huzzah.build.variant=adafruit
 huzzah.build.flash_mode=qio
 huzzah.build.flash_size=4M
 huzzah.build.flash_freq=40
-huzzah.build.flash_ld=eagle.flash.4m.ld
-huzzah.build.spiffs_start=0x100000
-huzzah.build.spiffs_end=0x3FB000
-huzzah.build.spiffs_pagesize=256
-huzzah.build.spiffs_blocksize=8192
 
 huzzah.menu.CpuFrequency.80=80 MHz
 huzzah.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -176,6 +180,22 @@ huzzah.menu.UploadSpeed.256000.upload.speed=256000
 huzzah.menu.UploadSpeed.921600=921600
 huzzah.menu.UploadSpeed.921600.upload.speed=921600
 
+huzzah.menu.FlashSize.4M3M=4M (3M SPIFFS)
+huzzah.menu.FlashSize.4M3M.build.flash_size=4M
+huzzah.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+huzzah.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+huzzah.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+huzzah.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+huzzah.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+
+huzzah.menu.FlashSize.4M1M=4M (1M SPIFFS)
+huzzah.menu.FlashSize.4M1M.build.flash_size=4M
+huzzah.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+huzzah.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+huzzah.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+huzzah.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+huzzah.menu.FlashSize.4M1M.build.spiffs_pagesize=256
+
 ##############################################################
 nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
 
@@ -196,11 +216,6 @@ nodemcu.build.variant=nodemcu
 nodemcu.build.flash_mode=qio
 nodemcu.build.flash_size=4M
 nodemcu.build.flash_freq=40
-nodemcu.build.flash_ld=eagle.flash.4m.ld
-nodemcu.build.spiffs_start=0x100000
-nodemcu.build.spiffs_end=0x3FB000
-nodemcu.build.spiffs_pagesize=256
-nodemcu.build.spiffs_blocksize=8192
 
 nodemcu.menu.CpuFrequency.80=80 MHz
 nodemcu.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -227,6 +242,22 @@ nodemcu.menu.UploadSpeed.512000.upload.speed=512000
 nodemcu.menu.UploadSpeed.921600=921600
 nodemcu.menu.UploadSpeed.921600.upload.speed=921600
 
+nodemcu.menu.FlashSize.4M3M=4M (3M SPIFFS)
+nodemcu.menu.FlashSize.4M3M.build.flash_size=4M
+nodemcu.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+nodemcu.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+nodemcu.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+nodemcu.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+nodemcu.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+
+nodemcu.menu.FlashSize.4M1M=4M (1M SPIFFS)
+nodemcu.menu.FlashSize.4M1M.build.flash_size=4M
+nodemcu.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+nodemcu.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+nodemcu.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+nodemcu.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+nodemcu.menu.FlashSize.4M1M.build.spiffs_pagesize=256
+
 ##############################################################
 nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
 
@@ -247,11 +278,6 @@ nodemcuv2.build.variant=nodemcu
 nodemcuv2.build.flash_mode=dio
 nodemcuv2.build.flash_size=4M
 nodemcuv2.build.flash_freq=40
-nodemcuv2.build.flash_ld=eagle.flash.4m.ld
-nodemcuv2.build.spiffs_start=0x100000
-nodemcuv2.build.spiffs_end=0x3FB000
-nodemcuv2.build.spiffs_pagesize=256
-nodemcuv2.build.spiffs_blocksize=8192
 
 nodemcuv2.menu.CpuFrequency.80=80 MHz
 nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -278,6 +304,23 @@ nodemcuv2.menu.UploadSpeed.512000.upload.speed=512000
 nodemcuv2.menu.UploadSpeed.921600=921600
 nodemcuv2.menu.UploadSpeed.921600.upload.speed=921600
 
+nodemcuv2.menu.FlashSize.4M3M=4M (3M SPIFFS)
+nodemcuv2.menu.FlashSize.4M3M.build.flash_size=4M
+nodemcuv2.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+nodemcuv2.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+nodemcuv2.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+nodemcuv2.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+nodemcuv2.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+
+nodemcuv2.menu.FlashSize.4M1M=4M (1M SPIFFS)
+nodemcuv2.menu.FlashSize.4M1M.build.flash_size=4M
+nodemcuv2.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+nodemcuv2.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+nodemcuv2.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+nodemcuv2.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+nodemcuv2.menu.FlashSize.4M1M.build.spiffs_pagesize=256
+
+
 ##############################################################
 modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
 
@@ -355,6 +398,7 @@ thing.build.flash_freq=40
 thing.build.spiffs_start=0x6B000
 thing.build.spiffs_end=0x7B000
 thing.build.spiffs_blocksize=4096
+thing.build.spiffs_pagesize=256
 
 thing.menu.CpuFrequency.80=80 MHz
 thing.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -400,11 +444,6 @@ esp210.build.variant=generic
 esp210.build.flash_mode=qio
 esp210.build.flash_size=4M
 esp210.build.flash_freq=40
-esp210.build.flash_ld=eagle.flash.4m.ld
-esp210.build.spiffs_start=0x100000
-esp210.build.spiffs_end=0x3FB000
-esp210.build.spiffs_pagesize=256
-esp210.build.spiffs_blocksize=8192
 
 esp210.menu.CpuFrequency.80=80 MHz
 esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
@@ -429,6 +468,22 @@ esp210.menu.UploadSpeed.512000.upload.speed=512000
 esp210.menu.UploadSpeed.921600=921600
 esp210.menu.UploadSpeed.921600.upload.speed=921600
 
+esp210.menu.FlashSize.4M3M=4M (3M SPIFFS)
+esp210.menu.FlashSize.4M3M.build.flash_size=4M
+esp210.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+esp210.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+esp210.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+esp210.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+esp210.menu.FlashSize.4M3M.build.spiffs_pagesize=256
+
+esp210.menu.FlashSize.4M1M=4M (1M SPIFFS)
+esp210.menu.FlashSize.4M1M.build.flash_size=4M
+esp210.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+esp210.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+esp210.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+esp210.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+esp210.menu.FlashSize.4M1M.build.spiffs_pagesize=256
+
 ##############################################################
 # wifio.name=Wifio
 #

cores/esp8266/Esp.cpp

@@ -280,6 +280,8 @@ uint32_t EspClass::getFlashChipSizeByChipId(void) {
             return (2_MB);
         case 0x1440EF: // W25Q80
             return (1_MB);
+        case 0x1340EF: // W25Q40
+            return (512_kB);
 
         default:
             return 0;
@@ -289,7 +291,7 @@ uint32_t EspClass::getFlashChipSizeByChipId(void) {
 String EspClass::getResetInfo(void) {
     if(resetInfo.reason != 0) {
         char buff[200];
-        sprintf(&buff[0], "Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason, (resetInfo.reason == 0 ? "DEFAULT" : resetInfo.reason == 1 ? "WDT" : resetInfo.reason == 2 ? "EXCEPTION" : resetInfo.reason == 3 ? "SOFT_WDT" : resetInfo.reason == 4 ? "SOFT_RESTART" : resetInfo.reason == 5 ? "DEEP_SLEEP_AWAKE" : "???"), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
+        sprintf(&buff[0], "Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason, (resetInfo.reason == 0 ? "DEFAULT" : resetInfo.reason == 1 ? "WDT" : resetInfo.reason == 2 ? "EXCEPTION" : resetInfo.reason == 3 ? "SOFT_WDT" : resetInfo.reason == 4 ? "SOFT_RESTART" : resetInfo.reason == 5 ? "DEEP_SLEEP_AWAKE" : resetInfo.reason == 6 ? "EXT_SYS_RST" : "???"), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
         return String(buff);
     }
     return String("flag: 0");
@@ -400,3 +402,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

@@ -29,14 +29,14 @@ size_t File::write(uint8_t c) {
     if (!_p)
         return 0;
 
-    _p->write(&c, 1);
+    return _p->write(&c, 1);
 }
 
 size_t File::write(const uint8_t *buf, size_t size) {
     if (!_p)
         return 0;
 
-    _p->write(buf, size);
+    return _p->write(buf, size);
 }
 
 int File::available() {
@@ -167,6 +167,13 @@ bool FS::begin() {
     return _impl->begin();
 }
 
+bool FS::format() {
+    if (!_impl) {
+        return false;
+    }
+    return _impl->format();
+}
+
 File FS::open(const String& path, const char* mode) {
     return open(path.c_str(), mode);
 }
@@ -186,6 +193,17 @@ File FS::open(const char* path, const char* mode) {
     return File(_impl->open(path, om, am));
 }
 
+bool FS::exists(const char* path) {
+    if (!_impl) {
+        return false;
+    }
+    return _impl->exists(path);
+}
+
+bool FS::exists(const String& path) {
+    return exists(path.c_str());
+}
+
 Dir FS::openDir(const char* path) {
     if (!_impl) {
         return Dir();

cores/esp8266/FS.h

@@ -92,9 +92,14 @@ class FS
 
     bool begin();
 
+    bool format();
+
     File open(const char* path, const char* mode);
     File open(const String& path, const char* mode);
 
+    bool exists(const char* path);
+    bool exists(const String& path);
+
     Dir openDir(const char* path);
     Dir openDir(const String& path);
 

cores/esp8266/FSImpl.h

@@ -63,7 +63,9 @@ class DirImpl {
 class FSImpl {
 public:
     virtual bool begin() = 0;
+    virtual bool format() = 0;
     virtual FileImplPtr open(const char* path, OpenMode openMode, AccessMode accessMode) = 0;
+    virtual bool exists(const char* path) = 0;
     virtual DirImplPtr openDir(const char* path) = 0;
     virtual bool rename(const char* pathFrom, const char* pathTo) = 0;
     virtual bool remove(const char* path) = 0;

cores/esp8266/HardwareSerial.cpp

@@ -290,6 +290,7 @@ uart_t* uart_init(int uart_nr, int baudrate, byte config, byte mode) {
             uart->txPin = (uart->txEnabled)?1:255;
             if(uart->rxEnabled) pinMode(uart->rxPin, SPECIAL);
             if(uart->txEnabled) pinMode(uart->txPin, SPECIAL);
+            IOSWAP &= ~(1 << IOSWAPU0);
             break;
         case UART1:
             uart->rxEnabled = false;

cores/esp8266/IPAddress.cpp

@@ -64,3 +64,10 @@ size_t IPAddress::printTo(Print& p) const {
     return n;
 }
 
+String IPAddress::toString()
+{
+    char szRet[16];
+    sprintf(szRet,"%u.%u.%u.%u", _address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3]);
+    return String(szRet);
+}
+

cores/esp8266/IPAddress.h

@@ -21,6 +21,7 @@
 #define IPAddress_h
 
 #include <stdint.h>
+#include <WString.h>
 #include <Printable.h>
 
 // A class to make it easier to handle and pass around IP addresses
@@ -70,6 +71,7 @@ class IPAddress: public Printable {
         IPAddress& operator=(uint32_t address);
 
         virtual size_t printTo(Print& p) const;
+        String toString();
 
         friend class EthernetClass;
         friend class UDP;