Implemented Reboot for "firmware.bin" as well

This commit is contained in:
jomjol
2023-01-04 21:22:55 +01:00
parent 68ac6b0185
commit 7ee308dec6

View File

@@ -87,11 +87,12 @@ void task_do_Update_ZIP(void *pvParameter)
ota_update_task(retfirmware); ota_update_task(retfirmware);
} }
if (initial_setup) LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Trigger reboot due to firmware update.");
doRebootOTA();
} else if (filetype == "BIN")
{ {
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Do firmware update - file: " + _file_name_update);
} ota_update_task(_file_name_update);
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Trigger reboot due to firmware update."); LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Trigger reboot due to firmware update.");
doRebootOTA(); doRebootOTA();
} }
@@ -443,7 +444,7 @@ esp_err_t handler_ota_update(httpd_req_t *req)
} }
if (filetype == "ZIP") if ((filetype == "ZIP") || (filetype == "BIN"))
{ {
FILE *pfile; FILE *pfile;
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Update for reboot."); LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Update for reboot.");
@@ -457,32 +458,9 @@ esp_err_t handler_ota_update(httpd_req_t *req)
ESP_LOGD(TAG, "Send reboot"); ESP_LOGD(TAG, "Send reboot");
return ESP_OK; return ESP_OK;
}
/* /*
std::string in, out, outbin, zw, retfirmware;
out = "/sdcard/html";
outbin = "/sdcard/firmware";
retfirmware = unzip_new(fn, out+"/", outbin+"/");
if (retfirmware.length() > 0)
{
filetype = "BIN";
fn = retfirmware;
}
else
{
zw = "Web Interface Update Successfull!\nNo reboot necessary.\n";
httpd_resp_sendstr_chunk(req, zw.c_str());
httpd_resp_sendstr_chunk(req, NULL);
return ESP_OK;
}
*/
}
if (filetype == "BIN") if (filetype == "BIN")
{ {
const char* resp_str; const char* resp_str;
@@ -507,7 +485,7 @@ esp_err_t handler_ota_update(httpd_req_t *req)
return ESP_OK; return ESP_OK;
} }
*/
std::string zw = "Update failed - no valid file specified (zip, bin, tfl, tlite)!"; std::string zw = "Update failed - no valid file specified (zip, bin, tfl, tlite)!";
httpd_resp_sendstr_chunk(req, zw.c_str()); httpd_resp_sendstr_chunk(req, zw.c_str());