arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-05-03 20:44:46 +03:00
Code

Merge branch 'master' into master

Browse Source
This commit is contained in:
adrionics 2019-05-21 01:33:35 -06:00 committed by GitHub
commit fdaad6bd14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -3,7 +3,7 @@ Arduino core for ESP8266 WiFi chip
# Quick links
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.5.1/)
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.5.2/)
- [Current "git version" documentation](https://arduino-esp8266.readthedocs.io/en/latest/)
- [Install git version](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version) ([sources](doc/installing.rst#using-git-version))
@ -36,7 +36,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
#### Latest release [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
Boards manager link: `https://arduino.esp8266.com/stable/package_esp8266com_index.json`
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.1/](https://arduino-esp8266.readthedocs.io/en/2.5.1/)
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.2/](https://arduino-esp8266.readthedocs.io/en/2.5.2/)
### Using git version (basic instructions)
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)

4
libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
View File

@ -248,6 +248,7 @@ void WiFiClientSecure::_freeSSL() {
_recvapp_len = 0;
// This connection is toast
_handshake_done = false;
_timeout = 15000;
}
bool WiFiClientSecure::_clientConnected() {
@ -1009,6 +1010,9 @@ bool WiFiClientSecure::_connectSSL(const char* hostName) {
_x509_insecure = nullptr;
_x509_knownkey = nullptr;
// reduce timeout after successful handshake to fail fast if server stop accepting our data for whathever reason
if (ret) _timeout = 5000;
return ret;
}

3
libraries/ESP8266WiFi/src/include/ClientContext.h
View File

@ -456,7 +456,8 @@ protected:
}
_send_waiting = true;
esp_yield();
// This delay will be interrupted by esp_schedule on next received ack
delay(_timeout_ms);
} while(true);
_send_waiting = false;

2
tools/elf2bin.py
View File

@ -25,7 +25,7 @@ import subprocess
import sys
import tempfile
fmodeb = { 'dout': 3, 'dio': 2, 'quot': 1, 'qio': 0 }
fmodeb = { 'dout': 3, 'dio': 2, 'qout': 1, 'qio': 0 }
ffreqb = { '40': 0, '26': 1, '20': 2, '80': 15 }
fsizeb = { '512K': 0, '256K': 1, '1M': 2, '2M': 3, '4M': 4, '8M': 8, '16M': 9 }

14
tools/platformio-build.py
View File

@ -135,16 +135,16 @@ env.Append(
ElfToBin=Builder(
action=env.VerboseAction(" ".join([
'"$PYTHONEXE"',
'"%s"' % env.subst(join(FRAMEWORK_DIR, "tools", "elf2bin.py")),
"--eboot", '"%s"' % env.subst(join(
FRAMEWORK_DIR, "bootloaders", "eboot", "eboot.elf")),
"--app", '"%s"' % "$SOURCE",
'"%s"' % join(FRAMEWORK_DIR, "tools", "elf2bin.py"),
"--eboot", '"%s"' % join(
FRAMEWORK_DIR, "bootloaders", "eboot", "eboot.elf"),
"--app", "$SOURCE",
"--flash_mode", "$BOARD_FLASH_MODE",
"--flash_freq", "${__get_board_f_flash(__env__)}",
"--flash_size", "${__get_flash_size(__env__)}",
"--path", '"%s"' % env.subst(join(
platform.get_package_dir("toolchain-xtensa"), "bin")),
"--out", '"$TARGET"'
"--path", '"%s"' % join(
platform.get_package_dir("toolchain-xtensa"), "bin"),
"--out", "$TARGET"
]), "Building $TARGET"),
suffix=".bin"
)