Skip to content

Commit cec84ed

Browse files
committed
added getAvailableVersion(), moved _httpClientTimeout and _followRedirects to protected, added enum HTTPUpdateError
1 parent f2da54d commit cec84ed

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

Diff for: libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h

+16-13
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,18 @@
4343
#endif
4444

4545
/// note we use HTTP client errors too so we start at 100
46-
//TODO - in v3.0.0 make this an enum
47-
constexpr int HTTP_UE_TOO_LESS_SPACE = (-100);
48-
constexpr int HTTP_UE_SERVER_NOT_REPORT_SIZE = (-101);
49-
constexpr int HTTP_UE_SERVER_FILE_NOT_FOUND = (-102);
50-
constexpr int HTTP_UE_SERVER_FORBIDDEN = (-103);
51-
constexpr int HTTP_UE_SERVER_WRONG_HTTP_CODE = (-104);
52-
constexpr int HTTP_UE_SERVER_FAULTY_MD5 = (-105);
53-
constexpr int HTTP_UE_BIN_VERIFY_HEADER_FAILED = (-106);
54-
constexpr int HTTP_UE_BIN_FOR_WRONG_FLASH = (-107);
55-
constexpr int HTTP_UE_SERVER_UNAUTHORIZED = (-108);
46+
enum HTTPUpdateError {
47+
HTTP_UE_TOO_LESS_SPACE = (-100),
48+
HTTP_UE_SERVER_NOT_REPORT_SIZE = (-101),
49+
HTTP_UE_SERVER_FILE_NOT_FOUND = (-102),
50+
HTTP_UE_SERVER_FORBIDDEN = (-103),
51+
HTTP_UE_SERVER_WRONG_HTTP_CODE = (-104),
52+
HTTP_UE_SERVER_FAULTY_MD5 = (-105),
53+
HTTP_UE_BIN_VERIFY_HEADER_FAILED = (-106),
54+
HTTP_UE_BIN_FOR_WRONG_FLASH = (-107),
55+
HTTP_UE_SERVER_UNAUTHORIZED = (-108),
56+
HTTP_UE_SERVER_NOT_REPORT_VERSION = (-109), // server did not respond with a firmware version
57+
};
5658

5759
enum HTTPUpdateResult {
5860
HTTP_UPDATE_FAILED,
@@ -122,7 +124,9 @@ class ESP8266HTTPUpdate
122124
t_httpUpdate_return updateFS(WiFiClient& client, const String& url, const String& currentVersion = "");
123125
t_httpUpdate_return update(HTTPClient& httpClient, const String& currentVersion = "");
124126
t_httpUpdate_return updateFS(HTTPClient& httpClient, const String& currentVersion = "");
125-
127+
128+
t_httpUpdate_return getAvailableVersion(WiFiClient& client, const String& host, uint16_t port, const String& uri, const String& current_version, String& available_version);
129+
126130
// Notification callbacks
127131
void onStart(HTTPUpdateStartCB cbOnStart) { _cbStart = cbOnStart; }
128132
void onEnd(HTTPUpdateEndCB cbOnEnd) { _cbEnd = cbOnEnd; }
@@ -153,10 +157,9 @@ class ESP8266HTTPUpdate
153157
String _password;
154158
String _auth;
155159
String _md5Sum;
156-
private:
157160
int _httpClientTimeout;
158161
followRedirects_t _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;
159-
162+
private:
160163
// Callbacks
161164
HTTPUpdateStartCB _cbStart;
162165
HTTPUpdateEndCB _cbEnd;

0 commit comments

Comments
 (0)