Skip to content

Commit 572b013

Browse files
author
Jeroen88
committed
Merge branch 'master' into bugfix/HTTPUpdate2
2 parents cf9175b + bff9f0b commit 572b013

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

libraries/HTTPUpdate/examples/httpUpdate/httpUpdate.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void loop() {
5656

5757
switch (ret) {
5858
case HTTP_UPDATE_FAILED:
59-
Serial.printf("HTTP_UPDATE_FAILD Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
59+
Serial.printf("HTTP_UPDATE_FAILED Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
6060
break;
6161

6262
case HTTP_UPDATE_NO_UPDATES:

libraries/HTTPUpdate/src/HTTPUpdate.cpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,31 @@ HTTPUpdate::~HTTPUpdate(void)
4949
HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& url, const String& currentVersion)
5050
{
5151
HTTPClient http;
52-
http.begin(client, url);
52+
if(!http.begin(client, url))
53+
{
54+
return HTTP_UPDATE_FAILED;
55+
}
5356
return handleUpdate(http, currentVersion, false);
5457
}
5558

5659
HTTPUpdateResult HTTPUpdate::updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion)
5760
{
5861
HTTPClient http;
59-
http.begin(client, url);
62+
if(!http.begin(client, url))
63+
{
64+
return HTTP_UPDATE_FAILED;
65+
}
6066
return handleUpdate(http, currentVersion, true);
6167
}
6268

6369
HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& host, uint16_t port, const String& uri,
6470
const String& currentVersion)
6571
{
6672
HTTPClient http;
67-
http.begin(client, host, port, uri);
73+
if(!http.begin(client, host, port, uri))
74+
{
75+
return HTTP_UPDATE_FAILED;
76+
}
6877
return handleUpdate(http, currentVersion, false);
6978
}
7079

libraries/WiFi/examples/WiFiClientEnterprise/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
|University|Board|Method|Result|
1919
|-------------|-------------| -----|------|
2020
|Technical University in Košice (Slovakia)|ESP32 Devkit v1|PEAP + MsCHAPv2|Working|
21-
|Technical University in Košice (Slovakia)|ESP32 DevKitc v4|PEAP + MsCHAPv2|Working|
21+
|Technical University in Košice (Slovakia)|ESP32 Devmodule v4|PEAP + MsCHAPv2|Working on 6th attempt in loop|
2222
|Slovak Technical University in Bratislava (Slovakia)|ESP32 Devkit v1|PEAP + MsCHAPv2|Working|
2323
|University of Antwerp (Belgium)|Lolin32|PEAP + MsCHAPv2|Working|
2424
|UPV Universitat Politècnica de València (Spain)|ESP32 Devmodule v4|PEAP + MsCHAPv2|Working|
@@ -27,7 +27,8 @@
2727
|Universidad de Granada (Spain)|Lolin D32 Pro|PEAP + MsCHAPv2|Working|
2828
|Universidad de Granada (Spain)|Lolin D32|PEAP + MsCHAPv2|Working|
2929
|Universidade Federal de Santa Catarina (Brazil)|xxx|EAP-TTLS + MsCHAPv2|Working|
30-
|University of Regensburg (Germany)|Lolin32|PEAP + MsCHAPv2|Working|
30+
|University of Central Florida (Orlando, Florida)|ESP32 Built-in OLED – Heltec WiFi Kit 32|PEAP + MsCHAPv2|Working|
31+
|Université de Montpellier (France)|NodeMCU-32S|PEAP + MsCHAPv2|Working|
3132

3233
# Common errors - Switch to Debug mode for Serial monitor prints
3334
|Error|Appearance|Solution|

0 commit comments

Comments
 (0)