DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ota.cpp: control flow

Browse Source
This commit is contained in:
Klaus K Wilting 2018-11-05 00:30:32 +01:00
parent cbc846d30b
commit d17638ad90
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ota.cpp
View File

@ -75,7 +75,7 @@ void start_ota_update() {
WiFi.begin(WIFI_SSID, WIFI_PASS); WiFi.begin(WIFI_SSID, WIFI_PASS);
int i = WIFI_MAX_TRY, j = OTA_MAX_TRY; int i = WIFI_MAX_TRY, j = OTA_MAX_TRY;
bool ret = false; bool ret = 1;
ESP_LOGI(TAG, "Trying to connect to %s", WIFI_SSID); ESP_LOGI(TAG, "Trying to connect to %s", WIFI_SSID);
while (i--) { while (i--) {
@ -84,7 +84,7 @@ void start_ota_update() {
ESP_LOGI(TAG, "Connected to %s", WIFI_SSID); ESP_LOGI(TAG, "Connected to %s", WIFI_SSID);
display(1, "OK", "WiFi connected"); display(1, "OK", "WiFi connected");
// do a number of tries to update firmware limited by OTA_MAX_TRY // do a number of tries to update firmware limited by OTA_MAX_TRY
while ((j--) && (!ret)) { while ((j--) && (ret > 0)) {
ESP_LOGI(TAG, "Starting OTA update, attempt %u of %u", OTA_MAX_TRY - j, ESP_LOGI(TAG, "Starting OTA update, attempt %u of %u", OTA_MAX_TRY - j,
OTA_MAX_TRY); OTA_MAX_TRY);
ret = do_ota_update(); ret = do_ota_update();
@ -101,7 +101,7 @@ void start_ota_update() {
end: end:
switch_LED(LED_OFF); switch_LED(LED_OFF);
ESP_LOGI(TAG, "Rebooting to %s firmware", ret ? "new" : "current"); ESP_LOGI(TAG, "Rebooting to %s firmware", (ret < 0) ? "current" : "new");
display(5, "**", ""); // mark line rebooting display(5, "**", ""); // mark line rebooting
vTaskDelay(5000 / portTICK_PERIOD_MS); vTaskDelay(5000 / portTICK_PERIOD_MS);
ESP.restart(); ESP.restart();
@ -122,11 +122,11 @@ bool do_ota_update() {
if (latest.length() == 0) { if (latest.length() == 0) {
ESP_LOGI(TAG, "Could not fetch info on latest firmware"); ESP_LOGI(TAG, "Could not fetch info on latest firmware");
display(2, " E", "file not found"); display(2, " E", "file not found");
return false; return -1;
} else if (version_compare(latest, cfg.version) <= 0) { } else if (version_compare(latest, cfg.version) <= 0) {
ESP_LOGI(TAG, "Current firmware is up to date"); ESP_LOGI(TAG, "Current firmware is up to date");
display(2, "NO", "no update found"); display(2, "NO", "no update found");
return false; return -2;
} }
ESP_LOGI(TAG, "New firmware version v%s available", latest.c_str()); ESP_LOGI(TAG, "New firmware version v%s available", latest.c_str());
display(2, "OK", latest.c_str()); display(2, "OK", latest.c_str());
@ -136,7 +136,7 @@ bool do_ota_update() {
if (!firmwarePath.endsWith(".bin")) { if (!firmwarePath.endsWith(".bin")) {
ESP_LOGI(TAG, "Unsupported binary format"); ESP_LOGI(TAG, "Unsupported binary format");
display(3, " E", "file type error"); display(3, " E", "file type error");
return false; return -1;
} }
String currentHost = bintray.getStorageHost(); String currentHost = bintray.getStorageHost();
@ -149,7 +149,7 @@ bool do_ota_update() {
if (!client.connect(currentHost.c_str(), port)) { if (!client.connect(currentHost.c_str(), port)) {
ESP_LOGI(TAG, "Cannot connect to %s", currentHost.c_str()); ESP_LOGI(TAG, "Cannot connect to %s", currentHost.c_str());
display(3, " E", "connection lost"); display(3, " E", "connection lost");
goto failure; goto abort;
} }
// client.setTimeout(RESPONSE_TIMEOUT); // client.setTimeout(RESPONSE_TIMEOUT);
@ -161,7 +161,7 @@ bool do_ota_update() {
ESP_LOGI(TAG, "Redirect detected, but cannot connect to %s", ESP_LOGI(TAG, "Redirect detected, but cannot connect to %s",
currentHost.c_str()); currentHost.c_str());
display(3, " E", "server error"); display(3, " E", "server error");
goto failure; goto abort;
} }
// client.setTimeout(RESPONSE_TIMEOUT); // client.setTimeout(RESPONSE_TIMEOUT);
} }
@ -178,7 +178,7 @@ bool do_ota_update() {
if ((millis() - timeout) > (RESPONSE_TIMEOUT * 1000)) { if ((millis() - timeout) > (RESPONSE_TIMEOUT * 1000)) {
ESP_LOGI(TAG, "Client timeout"); ESP_LOGI(TAG, "Client timeout");
display(3, " E", "client timeout"); display(3, " E", "client timeout");
goto failure; goto abort;
} }
} }
@ -242,13 +242,13 @@ bool do_ota_update() {
if (!(contentLength && isValidContentType)) { if (!(contentLength && isValidContentType)) {
ESP_LOGI(TAG, "Invalid OTA server response"); ESP_LOGI(TAG, "Invalid OTA server response");
display(4, " E", "response error"); display(4, " E", "response error");
goto failure; goto retry;
} }
if (!Update.begin(contentLength)) { if (!Update.begin(contentLength)) {
ESP_LOGI(TAG, "Not enough space to start OTA update"); ESP_LOGI(TAG, "Not enough space to start OTA update");
display(4, " E", "disk full"); display(4, " E", "disk full");
goto failure; goto abort;
} }
#ifdef HAS_DISPLAY #ifdef HAS_DISPLAY
@ -275,18 +275,21 @@ bool do_ota_update() {
ESP_LOGI(TAG, "An error occurred. Error#: %d", Update.getError()); ESP_LOGI(TAG, "An error occurred. Error#: %d", Update.getError());
snprintf(buf, 17, "Error#: %d", Update.getError()); snprintf(buf, 17, "Error#: %d", Update.getError());
display(4, " E", buf); display(4, " E", buf);
goto failure; goto retry;
} }
finished: finished:
client.stop(); client.stop();
ESP_LOGI(TAG, "OTA update finished"); ESP_LOGI(TAG, "OTA update finished");
return true; return 0;
failure: abort:
client.stop(); client.stop();
ESP_LOGI(TAG, "OTA update failed"); ESP_LOGI(TAG, "OTA update failed");
return false; return -1;
retry:
return 1;
} // do_ota_update } // do_ota_update