Skip to content

Commit 70d0339

Browse files
author
yichone
committed
Merge branch 'master' into master
2 parents 858d6fd + 304bf08 commit 70d0339

File tree

4 files changed

+91
-77
lines changed

4 files changed

+91
-77
lines changed

‎boards.txt

+72-71
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,78 @@ esp210.menu.FlashSize.4M1M.build.spiffs_pagesize=256
644644
#
645645

646646
##############################################################
647-
d1.name=WeMos D1
647+
d1_mini.name=WeMos D1 R2 & mini
648+
649+
d1_mini.upload.tool=esptool
650+
d1_mini.upload.speed=460800
651+
d1_mini.upload.resetmethod=nodemcu
652+
d1_mini.upload.maximum_size=1044464
653+
d1_mini.upload.maximum_data_size=81920
654+
d1_mini.upload.wait_for_upload_port=true
655+
d1_mini.serial.disableDTR=true
656+
d1_mini.serial.disableRTS=true
657+
658+
d1_mini.build.mcu=esp8266
659+
d1_mini.build.f_cpu=80000000L
660+
d1_mini.build.board=ESP8266_ESP12
661+
d1_mini.build.core=esp8266
662+
d1_mini.build.variant=d1_mini
663+
d1_mini.build.flash_mode=dio
664+
d1_mini.build.flash_size=4M
665+
d1_mini.build.flash_freq=40
666+
667+
d1_mini.menu.CpuFrequency.80=80 MHz
668+
d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
669+
d1_mini.menu.CpuFrequency.160=160 MHz
670+
d1_mini.menu.CpuFrequency.160.build.f_cpu=160000000L
671+
672+
d1_mini.menu.UploadTool.esptool=Serial
673+
d1_mini.menu.UploadTool.esptool.upload.tool=esptool
674+
d1_mini.menu.UploadTool.esptool.upload.verbose=-vv
675+
676+
d1_mini.menu.UploadTool.espota=OTA
677+
d1_mini.menu.UploadTool.espota.upload.tool=espota
678+
679+
d1_mini.menu.UploadSpeed.921600=921600
680+
d1_mini.menu.UploadSpeed.921600.upload.speed=921600
681+
d1_mini.menu.UploadSpeed.115200=115200
682+
d1_mini.menu.UploadSpeed.115200.upload.speed=115200
683+
d1_mini.menu.UploadSpeed.9600=9600
684+
d1_mini.menu.UploadSpeed.9600.upload.speed=9600
685+
d1_mini.menu.UploadSpeed.57600=57600
686+
d1_mini.menu.UploadSpeed.57600.upload.speed=57600
687+
d1_mini.menu.UploadSpeed.256000.windows=256000
688+
d1_mini.menu.UploadSpeed.256000.upload.speed=256000
689+
d1_mini.menu.UploadSpeed.230400.linux=230400
690+
d1_mini.menu.UploadSpeed.230400.macosx=230400
691+
d1_mini.menu.UploadSpeed.230400.macosx=230400
692+
d1_mini.menu.UploadSpeed.230400.upload.speed=230400
693+
d1_mini.menu.UploadSpeed.460800.linux=460800
694+
d1_mini.menu.UploadSpeed.460800.macosx=460800
695+
d1_mini.menu.UploadSpeed.460800.upload.speed=460800
696+
d1_mini.menu.UploadSpeed.512000.windows=512000
697+
d1_mini.menu.UploadSpeed.512000.upload.speed=512000
698+
699+
700+
d1_mini.menu.FlashSize.4M3M=4M (3M SPIFFS)
701+
d1_mini.menu.FlashSize.4M3M.build.flash_size=4M
702+
d1_mini.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
703+
d1_mini.menu.FlashSize.4M3M.build.spiffs_start=0x100000
704+
d1_mini.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
705+
d1_mini.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
706+
d1_mini.menu.FlashSize.4M3M.build.spiffs_pagesize=256
707+
708+
d1_mini.menu.FlashSize.4M1M=4M (1M SPIFFS)
709+
d1_mini.menu.FlashSize.4M1M.build.flash_size=4M
710+
d1_mini.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
711+
d1_mini.menu.FlashSize.4M1M.build.spiffs_start=0x300000
712+
d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
713+
d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
714+
d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256
715+
716+
717+
##############################################################
718+
d1.name=WeMos D1(Retired)
648719

649720
d1.upload.tool=esptool
650721
d1.upload.speed=460800
@@ -715,77 +786,7 @@ d1.menu.FlashSize.4M1M.build.spiffs_pagesize=256
715786

716787

717788
##############################################################
718-
d1_mini.name=WeMos D1 mini
719789

720-
d1_mini.upload.tool=esptool
721-
d1_mini.upload.speed=460800
722-
d1_mini.upload.resetmethod=nodemcu
723-
d1_mini.upload.maximum_size=1044464
724-
d1_mini.upload.maximum_data_size=81920
725-
d1_mini.upload.wait_for_upload_port=true
726-
d1_mini.serial.disableDTR=true
727-
d1_mini.serial.disableRTS=true
728-
729-
d1_mini.build.mcu=esp8266
730-
d1_mini.build.f_cpu=80000000L
731-
d1_mini.build.board=ESP8266_ESP12
732-
d1_mini.build.core=esp8266
733-
d1_mini.build.variant=d1_mini
734-
d1_mini.build.flash_mode=dio
735-
d1_mini.build.flash_size=4M
736-
d1_mini.build.flash_freq=40
737-
738-
d1_mini.menu.CpuFrequency.80=80 MHz
739-
d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
740-
d1_mini.menu.CpuFrequency.160=160 MHz
741-
d1_mini.menu.CpuFrequency.160.build.f_cpu=160000000L
742-
743-
d1_mini.menu.UploadTool.esptool=Serial
744-
d1_mini.menu.UploadTool.esptool.upload.tool=esptool
745-
d1_mini.menu.UploadTool.esptool.upload.verbose=-vv
746-
747-
d1_mini.menu.UploadTool.espota=OTA
748-
d1_mini.menu.UploadTool.espota.upload.tool=espota
749-
750-
d1_mini.menu.UploadSpeed.921600=921600
751-
d1_mini.menu.UploadSpeed.921600.upload.speed=921600
752-
d1_mini.menu.UploadSpeed.115200=115200
753-
d1_mini.menu.UploadSpeed.115200.upload.speed=115200
754-
d1_mini.menu.UploadSpeed.9600=9600
755-
d1_mini.menu.UploadSpeed.9600.upload.speed=9600
756-
d1_mini.menu.UploadSpeed.57600=57600
757-
d1_mini.menu.UploadSpeed.57600.upload.speed=57600
758-
d1_mini.menu.UploadSpeed.256000.windows=256000
759-
d1_mini.menu.UploadSpeed.256000.upload.speed=256000
760-
d1_mini.menu.UploadSpeed.230400.linux=230400
761-
d1_mini.menu.UploadSpeed.230400.macosx=230400
762-
d1_mini.menu.UploadSpeed.230400.macosx=230400
763-
d1_mini.menu.UploadSpeed.230400.upload.speed=230400
764-
d1_mini.menu.UploadSpeed.460800.linux=460800
765-
d1_mini.menu.UploadSpeed.460800.macosx=460800
766-
d1_mini.menu.UploadSpeed.460800.upload.speed=460800
767-
d1_mini.menu.UploadSpeed.512000.windows=512000
768-
d1_mini.menu.UploadSpeed.512000.upload.speed=512000
769-
770-
771-
d1_mini.menu.FlashSize.4M3M=4M (3M SPIFFS)
772-
d1_mini.menu.FlashSize.4M3M.build.flash_size=4M
773-
d1_mini.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
774-
d1_mini.menu.FlashSize.4M3M.build.spiffs_start=0x100000
775-
d1_mini.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
776-
d1_mini.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
777-
d1_mini.menu.FlashSize.4M3M.build.spiffs_pagesize=256
778-
779-
d1_mini.menu.FlashSize.4M1M=4M (1M SPIFFS)
780-
d1_mini.menu.FlashSize.4M1M.build.flash_size=4M
781-
d1_mini.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
782-
d1_mini.menu.FlashSize.4M1M.build.spiffs_start=0x300000
783-
d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
784-
d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
785-
d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256
786-
787-
788-
##############################################################
789790
espino.name=ESPino
790791

791792
espino.upload.tool=esptool

‎libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp

+13-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ HTTPClient::HTTPClient() {
5050
_returnCode = 0;
5151
_size = -1;
5252
_canReuse = false;
53+
_tcpTimeout = HTTPCLIENT_DEFAULT_TCP_TIMEOUT;
5354

5455
}
5556

@@ -252,6 +253,17 @@ void HTTPClient::setAuthorization(const char * auth) {
252253
}
253254
}
254255

256+
/**
257+
* set the timeout for the TCP connection
258+
* @param timeout unsigned int
259+
*/
260+
void HTTPClient::setTimeout(uint16_t timeout) {
261+
_tcpTimeout = timeout;
262+
if(connected()) {
263+
_tcp->setTimeout(timeout);
264+
}
265+
}
266+
255267
/**
256268
* send a GET request
257269
* @return http code
@@ -673,7 +685,7 @@ bool HTTPClient::connect(void) {
673685
}
674686

675687
// set Timeout for readBytesUntil and readStringUntil
676-
_tcp->setTimeout(HTTPCLIENT_TCP_TIMEOUT);
688+
_tcp->setTimeout(_tcpTimeout);
677689

678690
#ifdef ESP8266
679691
_tcp->setNoDelay(true);

‎libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define DEBUG_HTTPCLIENT(...)
3232
#endif
3333

34-
#define HTTPCLIENT_TCP_TIMEOUT (1000)
34+
#define HTTPCLIENT_DEFAULT_TCP_TIMEOUT (1000)
3535

3636
/// HTTP client errors
3737
#define HTTPC_ERROR_CONNECTION_REFUSED (-1)
@@ -127,6 +127,7 @@ class HTTPClient {
127127
void setUserAgent(const char * userAgent);
128128
void setAuthorization(const char * user, const char * password);
129129
void setAuthorization(const char * auth);
130+
void setTimeout(uint16_t timeout);
130131

131132
/// request handling
132133
int GET();
@@ -170,7 +171,7 @@ class HTTPClient {
170171
String _host;
171172
uint16_t _port;
172173
bool _reuse;
173-
174+
uint16_t _tcpTimeout;
174175

175176
String _url;
176177
bool _https;

‎variants/d1_mini/pins_arduino.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ static const uint8_t D5 = 14;
5555
static const uint8_t D6 = 12;
5656
static const uint8_t D7 = 13;
5757
static const uint8_t D8 = 15;
58-
static const uint8_t D9 = 3;
59-
static const uint8_t D10 = 1;
58+
static const uint8_t RX = 3;
59+
static const uint8_t TX = 1;
60+
6061

61-
static const uint8_t D13 = 2;
6262

6363
// These serial port names are intended to allow libraries and architecture-neutral
6464
// sketches to automatically default to the correct port name for a particular type

0 commit comments

Comments
 (0)