From 16244c5dfd694e9868384041e43f2b70be7a2318 Mon Sep 17 00:00:00 2001 From: wemos <11569115@qq.com> Date: Sun, 27 Dec 2015 14:36:22 +0800 Subject: [PATCH 1/3] fix d1_mini board. --- boards.txt | 145 ++++++++++++++++---------------- variants/d1_mini/pins_arduino.h | 6 +- 2 files changed, 76 insertions(+), 75 deletions(-) diff --git a/boards.txt b/boards.txt index c8ac253e6..30ce8c51b 100644 --- a/boards.txt +++ b/boards.txt @@ -577,78 +577,7 @@ esp210.menu.FlashSize.4M1M.build.spiffs_pagesize=256 # ############################################################## -d1.name=WeMos D1 - -d1.upload.tool=esptool -d1.upload.speed=460800 -d1.upload.resetmethod=nodemcu -d1.upload.maximum_size=1044464 -d1.upload.maximum_data_size=81920 -d1.upload.wait_for_upload_port=true -d1.serial.disableDTR=true -d1.serial.disableRTS=true - -d1.build.mcu=esp8266 -d1.build.f_cpu=80000000L -d1.build.board=ESP8266_ESP12 -d1.build.core=esp8266 -d1.build.variant=d1 -d1.build.flash_mode=dio -d1.build.flash_size=4M -d1.build.flash_freq=40 - -d1.menu.CpuFrequency.80=80 MHz -d1.menu.CpuFrequency.80.build.f_cpu=80000000L -d1.menu.CpuFrequency.160=160 MHz -d1.menu.CpuFrequency.160.build.f_cpu=160000000L - -d1.menu.UploadTool.esptool=Serial -d1.menu.UploadTool.esptool.upload.tool=esptool -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 -d1.menu.UploadSpeed.9600.upload.speed=9600 -d1.menu.UploadSpeed.57600=57600 -d1.menu.UploadSpeed.57600.upload.speed=57600 -d1.menu.UploadSpeed.256000.windows=256000 -d1.menu.UploadSpeed.256000.upload.speed=256000 -d1.menu.UploadSpeed.230400.linux=230400 -d1.menu.UploadSpeed.230400.macosx=230400 -d1.menu.UploadSpeed.230400.macosx=230400 -d1.menu.UploadSpeed.230400.upload.speed=230400 -d1.menu.UploadSpeed.460800.linux=460800 -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.FlashSize.4M3M=4M (3M SPIFFS) -d1.menu.FlashSize.4M3M.build.flash_size=4M -d1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld -d1.menu.FlashSize.4M3M.build.spiffs_start=0x100000 -d1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 -d1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 -d1.menu.FlashSize.4M3M.build.spiffs_pagesize=256 - -d1.menu.FlashSize.4M1M=4M (1M SPIFFS) -d1.menu.FlashSize.4M1M.build.flash_size=4M -d1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld -d1.menu.FlashSize.4M1M.build.spiffs_start=0x300000 -d1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 -d1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 -d1.menu.FlashSize.4M1M.build.spiffs_pagesize=256 - - -############################################################## -d1_mini.name=WeMos D1 mini +d1_mini.name=WeMos D1 R2 & mini d1_mini.upload.tool=esptool d1_mini.upload.speed=460800 @@ -719,6 +648,78 @@ d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256 ############################################################## +d1.name=WeMos D1(Retired) + +d1.upload.tool=esptool +d1.upload.speed=460800 +d1.upload.resetmethod=nodemcu +d1.upload.maximum_size=1044464 +d1.upload.maximum_data_size=81920 +d1.upload.wait_for_upload_port=true +d1.serial.disableDTR=true +d1.serial.disableRTS=true + +d1.build.mcu=esp8266 +d1.build.f_cpu=80000000L +d1.build.board=ESP8266_ESP12 +d1.build.core=esp8266 +d1.build.variant=d1 +d1.build.flash_mode=dio +d1.build.flash_size=4M +d1.build.flash_freq=40 + +d1.menu.CpuFrequency.80=80 MHz +d1.menu.CpuFrequency.80.build.f_cpu=80000000L +d1.menu.CpuFrequency.160=160 MHz +d1.menu.CpuFrequency.160.build.f_cpu=160000000L + +d1.menu.UploadTool.esptool=Serial +d1.menu.UploadTool.esptool.upload.tool=esptool +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 +d1.menu.UploadSpeed.9600.upload.speed=9600 +d1.menu.UploadSpeed.57600=57600 +d1.menu.UploadSpeed.57600.upload.speed=57600 +d1.menu.UploadSpeed.256000.windows=256000 +d1.menu.UploadSpeed.256000.upload.speed=256000 +d1.menu.UploadSpeed.230400.linux=230400 +d1.menu.UploadSpeed.230400.macosx=230400 +d1.menu.UploadSpeed.230400.macosx=230400 +d1.menu.UploadSpeed.230400.upload.speed=230400 +d1.menu.UploadSpeed.460800.linux=460800 +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.FlashSize.4M3M=4M (3M SPIFFS) +d1.menu.FlashSize.4M3M.build.flash_size=4M +d1.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld +d1.menu.FlashSize.4M3M.build.spiffs_start=0x100000 +d1.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000 +d1.menu.FlashSize.4M3M.build.spiffs_blocksize=8192 +d1.menu.FlashSize.4M3M.build.spiffs_pagesize=256 + +d1.menu.FlashSize.4M1M=4M (1M SPIFFS) +d1.menu.FlashSize.4M1M.build.flash_size=4M +d1.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld +d1.menu.FlashSize.4M1M.build.spiffs_start=0x300000 +d1.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000 +d1.menu.FlashSize.4M1M.build.spiffs_blocksize=8192 +d1.menu.FlashSize.4M1M.build.spiffs_pagesize=256 + + +############################################################## + espino.name=ESPino espino.upload.tool=esptool diff --git a/variants/d1_mini/pins_arduino.h b/variants/d1_mini/pins_arduino.h index 160b9a442..40a16f2b5 100644 --- a/variants/d1_mini/pins_arduino.h +++ b/variants/d1_mini/pins_arduino.h @@ -55,10 +55,10 @@ static const uint8_t D5 = 14; static const uint8_t D6 = 12; static const uint8_t D7 = 13; static const uint8_t D8 = 15; -static const uint8_t D9 = 3; -static const uint8_t D10 = 1; +static const uint8_t RX = 3; +static const uint8_t TX = 1; + -static const uint8_t D13 = 2; // These serial port names are intended to allow libraries and architecture-neutral // sketches to automatically default to the correct port name for a particular type From d1a6b32133f281b64d84d194a30546b7a4069563 Mon Sep 17 00:00:00 2001 From: Denver Abrey Date: Sun, 27 Dec 2015 19:45:17 +0200 Subject: [PATCH 2/3] Allow setting TCP timeout --- libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp | 11 ++++++++++- libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h | 5 +++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp index 7a409e025..65d7339ac 100644 --- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp +++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp @@ -50,6 +50,7 @@ HTTPClient::HTTPClient() { _returnCode = 0; _size = -1; _canReuse = false; + _tcpTimeout = HTTPCLIENT_DEFAULT_TCP_TIMEOUT; } @@ -252,6 +253,14 @@ void HTTPClient::setAuthorization(const char * auth) { } } +/** + * set the timeout for the TCP connection + * @param timeout unsigned int + */ +void HTTPClient::setTimeout(uint16_t timeout) { + _tcpTimeout = timeout; +} + /** * send a GET request * @return http code @@ -673,7 +682,7 @@ bool HTTPClient::connect(void) { } // set Timeout for readBytesUntil and readStringUntil - _tcp->setTimeout(HTTPCLIENT_TCP_TIMEOUT); + _tcp->setTimeout(_tcpTimeout); #ifdef ESP8266 _tcp->setNoDelay(true); diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h index 74a27af5d..43c6b19ac 100644 --- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h +++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h @@ -31,7 +31,7 @@ #define DEBUG_HTTPCLIENT(...) #endif -#define HTTPCLIENT_TCP_TIMEOUT (1000) +#define HTTPCLIENT_DEFAULT_TCP_TIMEOUT (1000) /// HTTP client errors #define HTTPC_ERROR_CONNECTION_REFUSED (-1) @@ -127,6 +127,7 @@ class HTTPClient { void setUserAgent(const char * userAgent); void setAuthorization(const char * user, const char * password); void setAuthorization(const char * auth); + void setTimeout(uint16_t timeout); /// request handling int GET(); @@ -170,7 +171,7 @@ class HTTPClient { String _host; uint16_t _port; bool _reuse; - + uint16_t _tcpTimeout; String _url; bool _https; From 80857e3f8795d2a0f65c4a1655a03d9b1ee6a53d Mon Sep 17 00:00:00 2001 From: Denver Abrey Date: Sun, 27 Dec 2015 20:02:08 +0200 Subject: [PATCH 3/3] Also set timeout on already existing connections --- libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp index 65d7339ac..36545fcbb 100644 --- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp +++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp @@ -259,6 +259,9 @@ void HTTPClient::setAuthorization(const char * auth) { */ void HTTPClient::setTimeout(uint16_t timeout) { _tcpTimeout = timeout; + if(connected()) { + _tcp->setTimeout(timeout); + } } /**