arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-08-07 00:04:36 +03:00
Code Activity

Merge branch 'master' into wifi_mesh_update_2.2

Browse Source
This commit is contained in:
aerlon
2019-08-10 10:45:40 +02:00
committed by GitHub
parent 235b02edee adfc28d7d8
commit 26e626de19
11 changed files with 129 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ArduinoOTA/ArduinoOTA.cpp
View File

@@ -330,7 +330,7 @@ void ArduinoOTAClass::_runUpdate() {
if (Update.end()) {
client.print("OK");
client.stop();
delay(10);
delay(1000);
#ifdef OTA_DEBUG
OTA_DEBUG.printf("Update Success\n");
#endif

2
libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
View File

@@ -558,7 +558,7 @@ void HTTPClient::setRedirectLimit(uint16_t limit)
/**
* use HTTP1.0
* @param timeout
* @param useHTTP10 bool
*/
void HTTPClient::useHTTP10(bool useHTTP10)
{

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

@@ -819,7 +819,7 @@ extern "C" {
BR_TLS_RSA_WITH_3DES_EDE_CBC_SHA
#endif
};
#ifndef BEARSSL_BASIC
#ifndef BEARSSL_SSL_BASIC
// Server w/EC has one set, not possible with basic SSL config
static const uint16_t suites_server_ec_P [] PROGMEM = {
BR_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
@@ -852,7 +852,7 @@ extern "C" {
#endif
static const uint16_t suites_server_rsa_P[] PROGMEM = {
#ifndef BEARSSL_BASIC
#ifndef BEARSSL_SSL_BASIC
BR_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
BR_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
@@ -871,7 +871,7 @@ extern "C" {
BR_TLS_RSA_WITH_AES_256_CBC_SHA256,
BR_TLS_RSA_WITH_AES_128_CBC_SHA,
BR_TLS_RSA_WITH_AES_256_CBC_SHA,
#ifndef BEARSSL_BASIC
#ifndef BEARSSL_SSL_BASIC
BR_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
BR_TLS_RSA_WITH_3DES_EDE_CBC_SHA
#endif

1
libraries/GDBStub/src/GDBStub.h
View File

@@ -5,6 +5,7 @@
#include <stdint.h>
#include <stddef.h>
#include <gdb_hooks.h>
#include "internal/gdbstub-cfg.h"
#ifdef __cplusplus