Skip to content

Allow passing custom HTTPClient to HTTPUpdate #4959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 18, 2021
+15 −0
Merged

Allow passing custom HTTPClient to HTTPUpdate #4959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05e4ef5
Allow passing custom HTTPClient
MohammedNoureldin Mar 18, 2021
a86911d
Merge branch 'master' of https://github.com/MohammedNoureldin/arduino…
MohammedNoureldin Mar 18, 2021
7f05cb3
Remove WiFiClient when passing HTTPClient to HTTPUpdate
MohammedNoureldin Mar 18, 2021
600a67c
Remove redundant arguments from HTTPUpdate::update
MohammedNoureldin Mar 18, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove redundant arguments from HTTPUpdate::update 
These arguments are not required when passing the HTTPClient instead of WiFiClient.
  • Loading branch information
@MohammedNoureldin
MohammedNoureldin committed Mar 18, 2021
commit 600a67cd02445570e0dfb59d1f6c964b9d436b94
4 changes: 2 additions & 2 deletions libraries/HTTPUpdate/src/HTTPUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& url, const
return handleUpdate(http, currentVersion, false);
}

HTTPUpdateResult HTTPUpdate::updateSpiffs(HTTPClient& httpClient, const String& url, const String& currentVersion)
HTTPUpdateResult HTTPUpdate::updateSpiffs(HTTPClient& httpClient, const String& currentVersion)
{
return handleUpdate(httpClient, currentVersion, true);
}
Expand All @@ -73,7 +73,7 @@ HTTPUpdateResult HTTPUpdate::updateSpiffs(WiFiClient& client, const String& url,
return handleUpdate(http, currentVersion, true);
}

HTTPUpdateResult HTTPUpdate::update(HTTPClient& httpClient, const String& host, uint16_t port, const String& uri,
HTTPUpdateResult HTTPUpdate::update(HTTPClient& httpClient,
const String& currentVersion)
{
return handleUpdate(httpClient, currentVersion, false);
Expand Down
4 changes: 2 additions & 2 deletions libraries/HTTPUpdate/src/HTTPUpdate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ class HTTPUpdate

t_httpUpdate_return updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion = "");

t_httpUpdate_return update(HTTPClient& httpClient, const String& host, uint16_t port, const String& uri = "/",
t_httpUpdate_return update(HTTPClient& httpClient,
const String& currentVersion = "");

t_httpUpdate_return updateSpiffs(HTTPClient &httpClient, const String &url, const String &currentVersion = "");
t_httpUpdate_return updateSpiffs(HTTPClient &httpClient, const String &currentVersion = "");

int getLastError(void);
String getLastErrorString(void);
Expand Down