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

Author: Links2004

README.md

@@ -14,6 +14,10 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
 - Enter ```http://arduino.esp8266.com/stable/package_esp8266com_index.json``` into *Additional Board Manager URLs* field. You can add multiple URLs, separating them with commas.
 - Open Boards Manager from Tools > Board menu and install *esp8266* platform (and don't forget to select your ESP8266 board from Tools > Board menu after installation).
 
+The best place to ask questions related to this core is ESP8266 community forum: http://www.esp8266.com/arduino.
+If you find this ESP8266 board manager useful, please consider supporting it with a donation. The ESP8266 Community Forum and IGRR have made this wonderful port available.
+[![Donate](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/webscr?cmd=_s-xclick&hosted_button_id=4M56YCWV6PX66)
+
 #### Available versions
 
 ##### Stable version ![](http://arduino.esp8266.com/stable/badge.svg)
@@ -26,7 +30,6 @@ Boards manager link: `http://arduino.esp8266.com/staging/package_esp8266com_inde
 
 Documentation: [Reference](http://arduino.esp8266.com/staging/doc/reference.html)
 
-
 ### Using git version [![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)
 
 - Install Arduino 1.6.5
@@ -54,10 +57,6 @@ Documentation for latest development version:
 
 ### Issues and support ###
 
-The best place to ask questions related to this core is ESP8266 community forum: http://www.esp8266.com/arduino.
-If you find the forum useful, please consider supporting it with a donation.
-[![Donate](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/webscr?cmd=_s-xclick&hosted_button_id=4M56YCWV6PX66)
-
 If you encounter an issue, you are welcome to submit it here on Github: https://github.com/esp8266/Arduino/issues.
 Please provide as much context as possible: version which you are using (you can check it in Boards Manager), your sketch code, serial output, board model, IDE settings (board selection, flash size, etc).
 

boards.txt

@@ -584,6 +584,8 @@ d1.menu.UploadTool.esptool.upload.verbose=-vv
 d1.menu.UploadTool.espota=OTA
 d1.menu.UploadTool.espota.upload.tool=espota
 
+d1.menu.UploadSpeed.921600=921600
+d1.menu.UploadSpeed.921600.upload.speed=921600
 d1.menu.UploadSpeed.115200=115200
 d1.menu.UploadSpeed.115200.upload.speed=115200
 d1.menu.UploadSpeed.9600=9600
@@ -601,8 +603,7 @@ d1.menu.UploadSpeed.460800.macosx=460800
 d1.menu.UploadSpeed.460800.upload.speed=460800
 d1.menu.UploadSpeed.512000.windows=512000
 d1.menu.UploadSpeed.512000.upload.speed=512000
-d1.menu.UploadSpeed.921600=921600
-d1.menu.UploadSpeed.921600.upload.speed=921600
+
 
 d1.menu.FlashSize.4M3M=4M (3M SPIFFS)
 d1.menu.FlashSize.4M3M.build.flash_size=4M
@@ -654,6 +655,8 @@ d1_mini.menu.UploadTool.esptool.upload.verbose=-vv
 d1_mini.menu.UploadTool.espota=OTA
 d1_mini.menu.UploadTool.espota.upload.tool=espota
 
+d1_mini.menu.UploadSpeed.921600=921600
+d1_mini.menu.UploadSpeed.921600.upload.speed=921600
 d1_mini.menu.UploadSpeed.115200=115200
 d1_mini.menu.UploadSpeed.115200.upload.speed=115200
 d1_mini.menu.UploadSpeed.9600=9600
@@ -671,8 +674,7 @@ d1_mini.menu.UploadSpeed.460800.macosx=460800
 d1_mini.menu.UploadSpeed.460800.upload.speed=460800
 d1_mini.menu.UploadSpeed.512000.windows=512000
 d1_mini.menu.UploadSpeed.512000.upload.speed=512000
-d1_mini.menu.UploadSpeed.921600=921600
-d1_mini.menu.UploadSpeed.921600.upload.speed=921600
+
 
 d1_mini.menu.FlashSize.4M3M=4M (3M SPIFFS)
 d1_mini.menu.FlashSize.4M3M.build.flash_size=4M

cores/esp8266/core_esp8266_postmortem.c

@@ -37,6 +37,11 @@ static void uart1_write_char_d(char c);
 static void print_stack(uint32_t start, uint32_t end);
 //static void print_pcs(uint32_t start, uint32_t end);
 
+extern void __custom_crash_callback( struct rst_info * rst_info, uint32_t stack, uint32_t stack_end ) {
+}
+
+extern void custom_crash_callback( struct rst_info * rst_info, uint32_t stack, uint32_t stack_end ) __attribute__ ((weak, alias("__custom_crash_callback")));
+
 void __wrap_system_restart_local() {
     register uint32_t sp asm("a1");
 
@@ -92,6 +97,9 @@ void __wrap_system_restart_local() {
 
     // print_pcs(sp + offset, stack_end);
     print_stack(sp + offset, stack_end);
+
+    custom_crash_callback( &rst_info, sp + offset, stack_end );
+
     delayMicroseconds(10000);
     __real_system_restart_local();
 }

doc/boards.md

@@ -10,6 +10,8 @@ title: Supported Hardware
 - [SparkFun ESP8266 Thing](#sparkfun-esp8266-thing)
 - [SweetPea ESP-210](#sweetpea-esp-210)
 - [Generic ESP8266 modules](#generic-esp8266-modules)
+- [WeMos D1](#wemos-d1)
+- [WeMos D1 mini](#wemos-d1-mini)
 
 ### Adafruit HUZZAH ESP8266 (ESP-12)
 
@@ -212,4 +214,7 @@ the first value respects the pin setup of the Pins 0, 2 and 15.
 note:
  - number = ((GPIO15 << 2) | (GPIO0 << 1) | GPIO2);
 
-
+### WeMos D1
+Product page: http://wemos.cc
+### WeMos D1 mini
+Product page: http://wemos.cc

doc/reference.md

@@ -167,6 +167,7 @@ NodeMCU 1.0    | 4M | 1M, 3M
 Olimex MOD-WIFI-ESP8266(-DEV)| 2M | 1M
 SparkFun Thing | 512k | 64k
 SweetPea ESP-210 | 4M | 1M, 3M
+WeMos D1 & D1 mini | 4M | 1M, 3M
 
 **Note:** to use any of file system functions in the sketch, add the following include to the sketch:
 

libraries/ESP8266WebServer/src/ESP8266WebServer.cpp

@@ -31,23 +31,32 @@
 #define DEBUG_OUTPUT Serial
 
 
+ESP8266WebServer::ESP8266WebServer(IPAddress addr, int port)
+: _server(addr, port)
+, _firstHandler(0)
+, _lastHandler(0)
+, _currentArgCount(0)
+, _currentArgs(0)
+, _headerKeysCount(0)
+, _currentHeaders(0)
+{
+}
+
 ESP8266WebServer::ESP8266WebServer(int port)
 : _server(port)
 , _firstHandler(0)
 , _lastHandler(0)
 , _currentArgCount(0)
 , _currentArgs(0)
-,_headerKeysCount(0)
-,_currentHeaders(0)
+, _headerKeysCount(0)
+, _currentHeaders(0)
 {
 }
 
 ESP8266WebServer::~ESP8266WebServer() {
-   if (_currentHeaders)
-     delete[]_currentHeaders;
+  if (_currentHeaders)
+    delete[]_currentHeaders;
   _headerKeysCount = 0;
-  if (!_firstHandler)
-    return;
   RequestHandler* handler = _firstHandler;
   while (handler) {
     RequestHandler* next = handler->next();

libraries/ESP8266WebServer/src/ESP8266WebServer.h

@@ -59,6 +59,7 @@ typedef struct {
 class ESP8266WebServer
 {
 public:
+  ESP8266WebServer(IPAddress addr, int port = 80);
   ESP8266WebServer(int port = 80);
   ~ESP8266WebServer();
 

libraries/ESP8266WiFi/src/WiFiClientSecure.cpp

@@ -50,7 +50,6 @@ extern "C"
 #define SSL_DEBUG_OPTS 0
 #endif
 
-#define SSL_RX_BUF_SIZE 4096
 
 class SSLContext {
 public:
@@ -59,8 +58,6 @@ class SSLContext {
             _ssl_ctx = ssl_ctx_new(SSL_SERVER_VERIFY_LATER | SSL_DEBUG_OPTS, 0);
         }
         ++_ssl_ctx_refcnt;
-
-        _rxbuf = new cbuf(SSL_RX_BUF_SIZE);
     }
 
     ~SSLContext() {
@@ -73,8 +70,6 @@ class SSLContext {
         if (_ssl_ctx_refcnt == 0) {
             ssl_ctx_free(_ssl_ctx);
         }
-
-        delete _rxbuf;
     }
 
     void ref() {
@@ -92,38 +87,50 @@ class SSLContext {
     }
 
     int read(uint8_t* dst, size_t size) {
-        if (!_rxbuf->getSize()) {
-            _readAll();
+        if (!_available) {
+            if (!_readAll())
+                return 0;
         }
-        size_t available = _rxbuf->getSize();
-        size_t will_read = (available < size) ? available : size;
-        return _rxbuf->read(reinterpret_cast<char*>(dst), will_read);
+        size_t will_copy = (_available < size) ? _available : size;
+        memcpy(dst, _read_ptr, will_copy);
+        _read_ptr += will_copy;
+        _available -= will_copy;
+        if (_available == 0) {
+            _read_ptr = nullptr;
+        }
+        return will_copy;
     }
 
     int read() {
-        optimistic_yield(100);
-        if (!_rxbuf->getSize()) {
-            _readAll();
+        if (!_available) {
+            if (!_readAll())
+                return -1;
         }
-        return _rxbuf->read();
+        int result = _read_ptr[0];
+        ++_read_ptr;
+        --_available;
+        if (_available == 0) {
+            _read_ptr = nullptr;
+        }
+        return result;
     }
 
     int peek() {
-        if (!_rxbuf->getSize()) {
-            _readAll();
+        if (!_available) {
+            if (!_readAll())
+                return -1;
         }
-        return _rxbuf->peek();
+        return _read_ptr[0];
     }
 
     int available() {
-        auto rc = _rxbuf->getSize();
-        if (rc == 0) {
-            _readAll();
-            rc = _rxbuf->getSize();
+        auto cb = _available;
+        if (cb == 0) {
+            cb = _readAll();
         } else {
             optimistic_yield(100);
         }
-        return rc;
+        return cb;
     }
 
     operator SSL*() {
@@ -135,6 +142,8 @@ class SSLContext {
         if (!_ssl)
             return 0;
 
+        optimistic_yield(100);
+
         uint8_t* data;
         int rc = ssl_read(_ssl, &data);
         if (rc <= 0) {
@@ -144,25 +153,18 @@ class SSLContext {
             }
             return 0;
         }
-
-
-        if (rc > _rxbuf->room()) {
-            DEBUGV("WiFiClientSecure rx overflow");
-            rc = _rxbuf->room();
-        }
-        int result = 0;
-        size_t sizeBefore = _rxbuf->getSize();
-        if (rc)
-            result = _rxbuf->write(reinterpret_cast<const char*>(data), rc);
-        DEBUGV("*** rb: %d + %d = %d\r\n", sizeBefore, rc, _rxbuf->getSize());
-        return result;
+        DEBUGV(":wcs ra %d", rc);
+        _read_ptr = data;
+        _available = rc;
+        return _available;
     }
 
     static SSL_CTX* _ssl_ctx;
     static int _ssl_ctx_refcnt;
     SSL* _ssl = nullptr;
     int _refcnt = 0;
-    cbuf* _rxbuf;
+    const uint8_t* _read_ptr = nullptr;
+    size_t _available = 0;
 };
 
 SSL_CTX* SSLContext::_ssl_ctx = nullptr;
@@ -313,14 +315,13 @@ bool WiFiClientSecure::verify(const char* fp, const char* url) {
         while (pos < len && fp[pos] == ' ') {
             ++pos;
         }
-        DEBUGV("pos:%d ", pos);
         if (pos > len - 2) {
-            DEBUGV("fingerprint too short\r\n");
+            DEBUGV("pos:%d len:%d fingerprint too short\r\n", pos, len);
             return false;
         }
         uint8_t high, low;
         if (!parseHexNibble(fp[pos], &high) || !parseHexNibble(fp[pos+1], &low)) {
-            DEBUGV("invalid hex sequence: %c%c\r\n", fp[pos], fp[pos+1]);
+            DEBUGV("pos:%d len:%d invalid hex sequence: %c%c\r\n", pos, len, fp[pos], fp[pos+1]);
             return false;
         }
         pos += 2;