diff --git a/code/components/jomjol_controlcamera/ClassControllCamera.cpp b/code/components/jomjol_controlcamera/ClassControllCamera.cpp index fb5e071be..fc650877d 100644 --- a/code/components/jomjol_controlcamera/ClassControllCamera.cpp +++ b/code/components/jomjol_controlcamera/ClassControllCamera.cpp @@ -682,7 +682,8 @@ void CCamera::useDemoMode() FILE *fd = fopen("/sdcard/demo/files.txt", "r"); if (!fd) { - LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Please provide the demo files first!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can not start Demo mode, the folder '/sdcard/demo/' does not contain the needed files!"); + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "See Details on https://github.com/jomjol/AI-on-the-edge-device/wiki/Demo-Mode!"); return; } diff --git a/code/components/jomjol_fileserver_ota/server_ota.cpp b/code/components/jomjol_fileserver_ota/server_ota.cpp index 06f113660..cf2de42de 100644 --- a/code/components/jomjol_fileserver_ota/server_ota.cpp +++ b/code/components/jomjol_fileserver_ota/server_ota.cpp @@ -645,40 +645,17 @@ esp_err_t handler_reboot(httpd_req_t *req) LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handler_reboot"); ESP_LOGI(TAG, "!!! System will restart within 5 sec!!!"); - char _query[200]; - char _valuechar[30]; - std::string _task; std::string response = "

"; - - if (httpd_req_get_url_query_str(req, _query, 200) == ESP_OK) - { - ESP_LOGD(TAG, "Query: %s", _query); - - if (httpd_query_key_value(_query, "task", _valuechar, 30) == ESP_OK) - { - ESP_LOGD(TAG, "task is found: %s", _valuechar); - _task = std::string(_valuechar); - } - } + "}

" + "" + ""; httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); - - if (_task.compare("OTA") == 0) { // Reboot after OTA upload - response.append(""); - } - else { // Normal reboot - response.append(""); - } - - response.append(""); httpd_resp_send(req, response.c_str(), strlen(response.c_str())); doReboot(); diff --git a/code/components/jomjol_tfliteclass/server_tflite.cpp b/code/components/jomjol_tfliteclass/server_tflite.cpp index ebca7b63f..e97cca226 100644 --- a/code/components/jomjol_tfliteclass/server_tflite.cpp +++ b/code/components/jomjol_tfliteclass/server_tflite.cpp @@ -839,11 +839,11 @@ void task_autodoFlow(void *pvParameter) if (!isPlannedReboot) { if (esp_reset_reason() == ESP_RST_PANIC) { - LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Restarted due to an Exception/panic! Postponing first round start by 5 minutes to allow for an OTA or to fetch the log!"); + LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Restarted due to an Exception/panic! Postponing first round start by 5 minutes to allow for an OTA Update or to fetch the log!"); LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Setting logfile level to DEBUG until the next reboot!"); LogFile.setLogLevel(ESP_LOG_DEBUG); //MQTTPublish(GetMQTTMainTopic() + "/" + "status", "Postponing first round", false); - vTaskDelay(60*5000 / portTICK_RATE_MS); // Wait 5 minutes to give time to do an OTA or fetch the log + vTaskDelay(60*5000 / portTICK_RATE_MS); // Wait 5 minutes to give time to do an OTA Update or fetch the log } } diff --git a/sd-card/html/index.html b/sd-card/html/index.html index be0963791..09cbc0ce8 100644 --- a/sd-card/html/index.html +++ b/sd-card/html/index.html @@ -11,6 +11,10 @@ + + + + - - - - + + OTA Update + + + + + + + + -

Check the Release Page to see if there is an update available.

-

Normally, the overall update package (update__*.zip) is your best choice!
-Alternatively you can use the old style firmware__*.bin and -web interface (html__*.zip). How ever it is strongly recommended to update firmware and - web interface at the same time!

-
-

Update

-Do not reload the page or switch to another page while the update is in progress! - - -

-

- - - -

- -

- - -

- -

- - -

-

Status: idle

-

- -
- - - + function abortHandler(event) { + _("status").innerHTML = "Status: Upload Aborted"; + firework.launch('Upload aborted!', 'danger', 30000); + document.getElementById("file_selector").disabled = false; + } + - +