Merge remote-tracking branch 'esp8266/master'

Me No Dev · Me No Dev · commit f799ede3e015 · 2016-06-23T11:45:18.000+03:00
diff --git a/README.md b/README.md
@@ -34,12 +34,12 @@ If you find this forum or the ESP8266 Boards Manager package useful, please cons
 ##### Stable version ![](http://arduino.esp8266.com/stable/badge.svg)
 Boards manager link: `http://arduino.esp8266.com/stable/package_esp8266com_index.json`
 
-Documentation: [http://esp8266.github.io/Arduino/versions/2.2.0/](http://esp8266.github.io/Arduino/versions/2.2.0/)
+Documentation: [http://esp8266.github.io/Arduino/versions/2.3.0/](http://esp8266.github.io/Arduino/versions/2.3.0/)
 
 ##### Staging version ![](http://arduino.esp8266.com/staging/badge.svg)
 Boards manager link: `http://arduino.esp8266.com/staging/package_esp8266com_index.json`
 
-Documentation: [http://esp8266.github.io/Arduino/versions/2.2.0-rc1/](http://esp8266.github.io/Arduino/versions/2.2.0-rc1/)
+Documentation: [http://esp8266.github.io/Arduino/versions/2.3.0-rc2/](http://esp8266.github.io/Arduino/versions/2.3.0-rc2/)
 
 ### Using git version
 [![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino) [![codecov.io](https://codecov.io/github/esp8266/Arduino/coverage.svg?branch=master)](https://codecov.io/github/esp8266/Arduino?branch=master)
diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
@@ -23,6 +23,7 @@
 #include "eboot_command.h"
 #include <memory>
 #include "interrupts.h"
+#include "MD5Builder.h"
 
 extern "C" {
 #include "user_interface.h"
@@ -443,7 +444,7 @@ uint32_t EspClass::getSketchSize() {
         DEBUG_SERIAL.printf("section=%u size=%u pos=%u\r\n", section_index, section_header.size, pos);
 #endif
     }
-    result = pos;
+    result = (pos + 16) & ~15;
     return result;
 }
 
@@ -519,3 +520,33 @@ bool EspClass::flashRead(uint32_t offset, uint32_t *data, size_t size) {
     ets_isr_unmask(FLASH_INT_MASK);
     return rc == 0;
 }
+
+String EspClass::getSketchMD5()
+{
+    static String result;
+    if (result.length()) {
+        return result;
+    }
+    uint32_t lengthLeft = getSketchSize();
+    const size_t bufSize = 512;
+    std::unique_ptr<uint8_t[]> buf(new uint8_t[bufSize]);
+    uint32_t offset = 0;
+    if(!buf.get()) {
+        return String();
+    }
+    MD5Builder md5;
+    md5.begin();
+    while( lengthLeft > 0) {
+        size_t readBytes = (lengthLeft < bufSize) ? lengthLeft : bufSize;
+        if (!flashRead(offset, reinterpret_cast<uint32_t*>(buf.get()), (readBytes + 3) & ~3)) {
+            return String();
+        }
+        md5.add(buf.get(), readBytes);
+        lengthLeft -= readBytes;
+        offset += readBytes;
+    }
+    md5.calculate();
+    result = md5.toString();
+    return result;
+} 
+
diff --git a/cores/esp8266/Esp.h b/cores/esp8266/Esp.h
@@ -133,6 +133,7 @@ class EspClass {
         bool flashRead(uint32_t offset, uint32_t *data, size_t size);
 
         uint32_t getSketchSize();
+        String getSketchMD5();
         uint32_t getFreeSketchSpace();
         bool updateSketch(Stream& in, uint32_t size, bool restartOnFail = false, bool restartOnSuccess = true);
 
diff --git a/cores/esp8266/pgmspace.h b/cores/esp8266/pgmspace.h
@@ -111,14 +111,17 @@ int	vsnprintf_P(char *str, size_t strSize, PGM_P formatP, va_list ap) __attribut
 
 #define pgm_read_dword(addr) 		(*reinterpret_cast<const uint32_t*>(addr))
 #define pgm_read_float(addr) 		(*reinterpret_cast<const float*>(addr))
+#define pgm_read_ptr(addr) 		(*reinterpret_cast<const void* const *>(addr))
 
 #define pgm_read_byte_near(addr) 	pgm_read_byte(addr)
 #define pgm_read_word_near(addr) 	pgm_read_word(addr)
 #define pgm_read_dword_near(addr) 	pgm_read_dword(addr)
 #define pgm_read_float_near(addr)	pgm_read_float(addr)
+#define pgm_read_ptr_near(addr) 	pgm_read_ptr(addr)
 #define pgm_read_byte_far(addr) 	pgm_read_byte(addr)
 #define pgm_read_word_far(addr) 	pgm_read_word(addr)
 #define pgm_read_dword_far(addr) 	pgm_read_dword(addr)
 #define pgm_read_float_far(addr) 	pgm_read_float(addr)
+#define pgm_read_ptr_far(addr)		pgm_read_ptr(addr)
 
 #endif //__PGMSPACE_H_
diff --git a/cores/esp8266/spiffs_api.cpp b/cores/esp8266/spiffs_api.cpp
@@ -120,11 +120,15 @@ extern "C" uint32_t _SPIFFS_block;
 #define SPIFFS_PHYS_PAGE ((uint32_t) &_SPIFFS_page)
 #define SPIFFS_PHYS_BLOCK ((uint32_t) &_SPIFFS_block)
 
+#ifndef SPIFFS_MAX_OPEN_FILES
+#define SPIFFS_MAX_OPEN_FILES 5
+#endif
+
 FS SPIFFS = FS(FSImplPtr(new SPIFFSImpl(
                              SPIFFS_PHYS_ADDR,
                              SPIFFS_PHYS_SIZE,
                              SPIFFS_PHYS_PAGE,
                              SPIFFS_PHYS_BLOCK,
-                             5)));
+                             SPIFFS_MAX_OPEN_FILES)));
 
 #endif
diff --git a/cores/esp8266/uart.c b/cores/esp8266/uart.c
@@ -162,19 +162,19 @@ uart_t* uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin)
         uart->rx_enabled = (mode != UART_TX_ONLY);
         uart->tx_enabled = (mode != UART_RX_ONLY);
         uart->rx_pin = (uart->rx_enabled)?3:255;
-        if(uart->rx_enabled) {
+        if(uart->tx_enabled) {
             if (tx_pin == 2) {
                 uart->tx_pin = 2;
-                pinMode(uart->rx_pin, FUNCTION_4);
+                pinMode(uart->tx_pin, FUNCTION_4);
             } else {
                 uart->tx_pin = 1;
-                pinMode(uart->rx_pin, SPECIAL);
+                pinMode(uart->tx_pin, FUNCTION_0);
             }
         } else {
             uart->tx_pin = 255;
         }
-        if(uart->tx_enabled) {
-            pinMode(uart->tx_pin, SPECIAL);
+        if(uart->rx_enabled) {
+            pinMode(uart->rx_pin, SPECIAL);
         }
         IOSWAP &= ~(1 << IOSWAPU0);
         break;
diff --git a/doc/changes.md b/doc/changes.md
@@ -2,7 +2,10 @@
 title: Change Log
 ---
 
-## Current version
+## 2.3.0
+June 23, 2016
+
+Package link: `http://arduino.esp8266.com/versions/2.3.0/package_esp8266com_index.json`.
 
 ### Core
 - Fix NMI interrupt handler alignment
@@ -29,6 +32,11 @@ title: Change Log
 - MD5Builder::addStream: fixed falsy calculated hash for len > filelength (#2126)
 - Fix SPIFFS.openDir("") (#2143)
 - Bring back old semantics to random and randomSeed, add secureRandom (#1710) (#2142)
+- Add missing pgm_read_ptr{_near/_far} macros (#2160)
+- Add macro for maximum open SPIFFS files, settings it to 1 saves about 1k heap. (#2167)
+- Fix UART pins setting (#2098)
+- Fix ESP.getSketchSize, add ESP.getSketchMD5 (#2158)
+- Add Serial.baudRate() to get current baud rate (#2079)
 
 ### Libraries
 
@@ -70,7 +78,7 @@ title: Change Log
 - Python 3 compatibility for get.py
 - Device side test library and test runner
 - Fix ARM toolchain files permissions (#2004)
-
+- Update esptool to 0.4.9
 
 ## 2.2.0
 April 18, 2016
diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
@@ -78,7 +78,7 @@
             {
               "packager": "esp8266",
               "name": "esptool",
-              "version": "0.4.8"
+              "version": "0.4.9"
             },
             {
               "packager": "esp8266",
@@ -96,49 +96,49 @@
       "tools": [
         {
           "name": "esptool",
-          "version": "0.4.8",
+          "version": "0.4.9",
           "systems": [
             {
               "host": "i686-mingw32",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.8/esptool-0.4.8-win32.zip",
-              "archiveFileName": "esptool-0.4.8-win32.zip",
-              "checksum": "SHA-256:8d09cb0df6234c2a0562389ceedd11482b44a3f538695f9a4df80f9f10411ece",
-              "size": "32192"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-win32.zip",
+              "archiveFileName": "esptool-0.4.9-win32.zip",
+              "checksum": "SHA-256:9c4162cedf05fcb09fd829bfb90e34ae12458365980d79525a072ff5ca44751c",
+              "size": "32436"
             },
             {
               "host": "x86_64-apple-darwin",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.8/esptool-0.4.8-osx.tar.gz",
-              "archiveFileName": "esptool-0.4.8-osx.tar.gz",
-              "checksum": "SHA-256:2bcbf19934543fb06c505b2a595b68a76e4cab8e3d8968a4d1802195c87126cf",
-              "size": "28798"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-osx.tar.gz",
+              "archiveFileName": "esptool-0.4.9-osx.tar.gz",
+              "checksum": "SHA-256:57938b473765723a7e6602d55973017b7719bda69bdcff4250b24fcbf7a399f5",
+              "size": "29310"
             },
             {
               "host": "i386-apple-darwin",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.8/esptool-0.4.8-osx.tar.gz",
-              "archiveFileName": "esptool-0.4.8-osx.tar.gz",
-              "checksum": "SHA-256:2bcbf19934543fb06c505b2a595b68a76e4cab8e3d8968a4d1802195c87126cf",
-              "size": "28798"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-osx.tar.gz",
+              "archiveFileName": "esptool-0.4.9-osx.tar.gz",
+              "checksum": "SHA-256:57938b473765723a7e6602d55973017b7719bda69bdcff4250b24fcbf7a399f5",
+              "size": "29310"
             },
             {
               "host": "x86_64-pc-linux-gnu",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.8/esptool-0.4.8-linux64.tar.gz",
-              "archiveFileName": "esptool-0.4.8-linux64.tar.gz",
-              "checksum": "SHA-256:1cd9a6014bbbc37ba6dc249f4fc027f0ca9bbc6dd0e203ebc7d146dfd78a6e78",
-              "size": "15479"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-linux64.tar.gz",
+              "archiveFileName": "esptool-0.4.9-linux64.tar.gz",
+              "checksum": "SHA-256:fab9d1be8a648bea6728ad5c9d18ce972508187700cf90baf1897ac9cdf4db15",
+              "size": "15564"
             },
             {
               "host": "i686-pc-linux-gnu",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.8/esptool-0.4.8-linux32.tar.gz",
-              "archiveFileName": "esptool-0.4.8-linux32.tar.gz",
-              "checksum": "SHA-256:b0d6e71e6f41d4ed7e167bb4b3f4f0b1b3e49d69af50ab7fbe952cbfed83f164",
-              "size": "15444"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-linux32.tar.gz",
+              "archiveFileName": "esptool-0.4.9-linux32.tar.gz",
+              "checksum": "SHA-256:bc4444d73d59be74608be5e1431353a0a9ae9e308e99c76a271d68a6ae145b7b",
+              "size": "15984"
             },
             {
               "host": "arm-linux-gnueabihf",
-              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.8/esptool-0.4.8-linux-armhf.tar.gz",
-              "archiveFileName": "esptool-0.4.8-linux-armhf.tar.gz",
-              "checksum": "SHA-256:e9c4dfb81781610556a6af0377c8efc7cde359e0e2cda2fd48e0a32bae10f506",
-              "size": "13630"
+              "url": "https://github.com/igrr/esptool-ck/releases/download/0.4.9/esptool-0.4.9-linux-armhf.tar.gz",
+              "archiveFileName": "esptool-0.4.9-linux-armhf.tar.gz",
+              "checksum": "SHA-256:d0364492599d90b8305125f8212de5be05397e4efde2fc7d0ed3676bb7018164",
+              "size": "13763"
             }
           ]
         },
