arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-13 13:01:55 +03:00
Code Activity

added getAvailableVersion(), moved _httpClientTimeout and _followRedirects to protected, added enum HTTPUpdateError

Browse Source
This commit is contained in:
Holger Müller
2023-08-03 23:19:24 +02:00
parent f2da54d3a2
commit cec84ed17a
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
View File

@ -43,16 +43,18 @@
#endif #endif
/// note we use HTTP client errors too so we start at 100 /// note we use HTTP client errors too so we start at 100
//TODO - in v3.0.0 make this an enum enum HTTPUpdateError {
constexpr int HTTP_UE_TOO_LESS_SPACE = (-100); HTTP_UE_TOO_LESS_SPACE = (-100),
constexpr int HTTP_UE_SERVER_NOT_REPORT_SIZE = (-101); HTTP_UE_SERVER_NOT_REPORT_SIZE = (-101),
constexpr int HTTP_UE_SERVER_FILE_NOT_FOUND = (-102); HTTP_UE_SERVER_FILE_NOT_FOUND = (-102),
constexpr int HTTP_UE_SERVER_FORBIDDEN = (-103); HTTP_UE_SERVER_FORBIDDEN = (-103),
constexpr int HTTP_UE_SERVER_WRONG_HTTP_CODE = (-104); HTTP_UE_SERVER_WRONG_HTTP_CODE = (-104),
constexpr int HTTP_UE_SERVER_FAULTY_MD5 = (-105); HTTP_UE_SERVER_FAULTY_MD5 = (-105),
constexpr int HTTP_UE_BIN_VERIFY_HEADER_FAILED = (-106); HTTP_UE_BIN_VERIFY_HEADER_FAILED = (-106),
constexpr int HTTP_UE_BIN_FOR_WRONG_FLASH = (-107); HTTP_UE_BIN_FOR_WRONG_FLASH = (-107),
constexpr int HTTP_UE_SERVER_UNAUTHORIZED = (-108); HTTP_UE_SERVER_UNAUTHORIZED = (-108),
HTTP_UE_SERVER_NOT_REPORT_VERSION = (-109), // server did not respond with a firmware version
};
enum HTTPUpdateResult { enum HTTPUpdateResult {
HTTP_UPDATE_FAILED, HTTP_UPDATE_FAILED,
@ -122,7 +124,9 @@ public:
t_httpUpdate_return updateFS(WiFiClient& client, const String& url, const String& currentVersion = ""); t_httpUpdate_return updateFS(WiFiClient& client, const String& url, const String& currentVersion = "");
t_httpUpdate_return update(HTTPClient& httpClient, const String& currentVersion = ""); t_httpUpdate_return update(HTTPClient& httpClient, const String& currentVersion = "");
t_httpUpdate_return updateFS(HTTPClient& httpClient, const String& currentVersion = ""); t_httpUpdate_return updateFS(HTTPClient& httpClient, const String& currentVersion = "");
t_httpUpdate_return getAvailableVersion(WiFiClient& client, const String& host, uint16_t port, const String& uri, const String& current_version, String& available_version);
// Notification callbacks // Notification callbacks
void onStart(HTTPUpdateStartCB cbOnStart) { _cbStart = cbOnStart; } void onStart(HTTPUpdateStartCB cbOnStart) { _cbStart = cbOnStart; }
void onEnd(HTTPUpdateEndCB cbOnEnd) { _cbEnd = cbOnEnd; } void onEnd(HTTPUpdateEndCB cbOnEnd) { _cbEnd = cbOnEnd; }
@ -153,10 +157,9 @@ protected:
String _password; String _password;
String _auth; String _auth;
String _md5Sum; String _md5Sum;
private:
int _httpClientTimeout; int _httpClientTimeout;
followRedirects_t _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS; followRedirects_t _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;
private:
// Callbacks // Callbacks
HTTPUpdateStartCB _cbStart; HTTPUpdateStartCB _cbStart;
HTTPUpdateEndCB _cbEnd; HTTPUpdateEndCB _cbEnd;