jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Abort update if http.begin() returns false. Fix a typo in httpUpdate.ino (#2156)

Browse Source
This commit is contained in:
Jeroen88 2018-12-06 18:50:53 +01:00 committed by Me No Dev
parent fe1fdd2790
commit 0596a2ac86
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/HTTPUpdate/examples/httpUpdate/httpUpdate.ino
View File

@ -56,7 +56,7 @@ void loop() {
switch (ret) { switch (ret) {
case HTTP_UPDATE_FAILED: case HTTP_UPDATE_FAILED:
Serial.printf("HTTP_UPDATE_FAILD Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str()); Serial.printf("HTTP_UPDATE_FAILED Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
break; break;
case HTTP_UPDATE_NO_UPDATES: case HTTP_UPDATE_NO_UPDATES:

15
libraries/HTTPUpdate/src/HTTPUpdate.cpp
View File

@ -49,14 +49,20 @@ HTTPUpdate::~HTTPUpdate(void)
HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& url, const String& currentVersion) HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& url, const String& currentVersion)
{ {
HTTPClient http; HTTPClient http;
http.begin(client, url); if(!http.begin(client, url))
{
return HTTP_UPDATE_FAILED;
}
return handleUpdate(http, currentVersion, false); return handleUpdate(http, currentVersion, false);
} }
HTTPUpdateResult HTTPUpdate::updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion) HTTPUpdateResult HTTPUpdate::updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion)
{ {
HTTPClient http; HTTPClient http;
http.begin(client, url); if(!http.begin(client, url))
{
return HTTP_UPDATE_FAILED;
}
return handleUpdate(http, currentVersion, true); return handleUpdate(http, currentVersion, true);
} }
@ -64,7 +70,10 @@ HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& host, uint
const String& currentVersion) const String& currentVersion)
{ {
HTTPClient http; HTTPClient http;
http.begin(client, host, port, uri); if(!http.begin(client, host, port, uri))
{
return HTTP_UPDATE_FAILED;
}
return handleUpdate(http, currentVersion, false); return handleUpdate(http, currentVersion, false);
} }