From 4dd5d8cf7d6198752acc56d0f5590a5873874d16 Mon Sep 17 00:00:00 2001 From: Markus Sattler Date: Sun, 13 Dec 2015 23:04:27 +0100 Subject: [PATCH] allow control of restart on http update #1202 --- .../ESP8266httpUpdate/src/ESP8266httpUpdate.cpp | 16 ++++++++-------- .../ESP8266httpUpdate/src/ESP8266httpUpdate.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp index 785258de9..2eacf09db 100644 --- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp +++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp @@ -42,10 +42,10 @@ ESP8266HTTPUpdate::~ESP8266HTTPUpdate(void) { * @param httpsFingerprint const char * * @return t_httpUpdate_return */ -t_httpUpdate_return ESP8266HTTPUpdate::update(const char * url, const char * current_version, const char * httpsFingerprint) { +t_httpUpdate_return ESP8266HTTPUpdate::update(const char * url, const char * current_version, const char * httpsFingerprint, bool reboot) { HTTPClient http; http.begin(url, httpsFingerprint); - return handleUpdate(&http, current_version); + return handleUpdate(&http, current_version, reboot, false); } /** @@ -55,10 +55,10 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(const char * url, const char * cur * @param httpsFingerprint const char * * @return t_httpUpdate_return */ -t_httpUpdate_return ESP8266HTTPUpdate::updateSpiffs(const char * url, const char * current_version, const char * httpsFingerprint) { +t_httpUpdate_return ESP8266HTTPUpdate::updateSpiffs(const char * url, const char * current_version, const char * httpsFingerprint, bool reboot) { HTTPClient http; http.begin(url, httpsFingerprint); - return handleUpdate(&http, current_version, false, true); + return handleUpdate(&http, current_version, reboot, true); } /** @@ -70,16 +70,16 @@ t_httpUpdate_return ESP8266HTTPUpdate::updateSpiffs(const char * url, const char * @param httpsFingerprint const char * * @return */ -t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port, const char * url, const char * current_version, bool https, const char * httpsFingerprint) { +t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port, const char * url, const char * current_version, bool https, const char * httpsFingerprint, bool reboot) { HTTPClient http; http.begin(host, port, url, https, httpsFingerprint); - return handleUpdate(&http, current_version); + return handleUpdate(&http, current_version, reboot, false); } -t_httpUpdate_return ESP8266HTTPUpdate::update(String host, uint16_t port, String url, String current_version, bool https, String httpsFingerprint) { +t_httpUpdate_return ESP8266HTTPUpdate::update(String host, uint16_t port, String url, String current_version, bool https, String httpsFingerprint, bool reboot) { HTTPClient http; http.begin(host, port, url, https, httpsFingerprint); - return handleUpdate(&http, current_version.c_str()); + return handleUpdate(&http, current_version.c_str(), reboot, false); } /** diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h index d3fe4ca19..6a13f9ce3 100644 --- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h +++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h @@ -49,11 +49,11 @@ class ESP8266HTTPUpdate { ESP8266HTTPUpdate(void); ~ESP8266HTTPUpdate(void); - t_httpUpdate_return update(const char * url, const char * current_version = "", const char * httpsFingerprint = ""); - t_httpUpdate_return update(const char * host, uint16_t port, const char * url = "/", const char * current_version = "", bool https = false, const char * httpsFingerprint = ""); - t_httpUpdate_return update(String host, uint16_t port, String url = "/", String current_version = "", bool https = false, String httpsFingerprint = ""); + t_httpUpdate_return update(const char * url, const char * current_version = "", const char * httpsFingerprint = "", bool reboot = true); + t_httpUpdate_return update(const char * host, uint16_t port, const char * url = "/", const char * current_version = "", bool https = false, const char * httpsFingerprint = "", bool reboot = true); + t_httpUpdate_return update(String host, uint16_t port, String url = "/", String current_version = "", bool https = false, String httpsFingerprint = "", bool reboot = true); - t_httpUpdate_return updateSpiffs(const char * url, const char * current_version = "", const char * httpsFingerprint = ""); + t_httpUpdate_return updateSpiffs(const char * url, const char * current_version = "", const char * httpsFingerprint = "", bool reboot = false); protected: t_httpUpdate_return handleUpdate(HTTPClient * http, const char * current_version, bool reboot = true, bool spiffs = false);