new OTA page with progressbar (#1756)

* new OTA page with progress bar * improve error message on missing demo files * . * Implemented Reboot for "firmware.bin" as well * Update feature.yaml * cache static files (#1755) Co-authored-by: CaCO3 <caco@ruinelli.ch> * . * . * added filename validation * . * . * . * move * added missing dash to regex * restrict file type * . * . * . * . * cleanup no longer needed mode * only start restart counter if restart is required Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com>
jomjol · Jan 7, 2023 · 26897cc · 26897cc
1 parent b1a38e0
commit 26897cc
Show file tree

Hide file tree

Showing 5 changed files with 281 additions and 277 deletions.
diff --git 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
@@ -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 = 
         "<html><head><script>"
             "function m(h) {"
                 "document.getElementById('t').innerHTML=h;"
                 "setInterval(function (){h +='.'; document.getElementById('t').innerHTML=h;"
                 "fetch('reboot_page.html',{mode: 'no-cors'}).then(r=>{parent.location.href=('index.html');})}, 1000);"
-            "}</script></head></html><body style='font-family: arial'><h3 id=t></h3>";
-
-    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);
-        }
-    }
+            "}</script></head></html><body style='font-family: arial'><h3 id=t></h3>"
+            "<script>m('Rebooting!<br>The page will automatically reload in around 25..60s.<br><br>');</script>"
+            "</body></html>";
 
     httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
-
-    if (_task.compare("OTA") == 0) { // Reboot after OTA upload
-        response.append("<script>m('The upload completed successfully.<br>Rebooting and installing it now...<br><br>"
-                "The page will automatically reload after the update completed.<br>"
-                "This can take several minutes!<br><br>');</script>");
-    }
-    else { // Normal reboot
-        response.append("<script>m('Rebooting!<br>The page will automatically reload in around 25..60s.<br><br>');</script>");
-    }    
-
-    response.append("</body></html>");
     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
@@ -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
@@ -11,6 +11,10 @@
 <script type="text/javascript" src="readconfigcommon.js"></script>
 <script type="text/javascript" src="readconfigparam.js"></script>
 
+<script type="text/javascript" src="jquery-3.6.0.min.js"></script>
+<script type="text/javascript" src="common.js"></script>
+<script type="text/javascript" src="firework.js"></script>
+
 <script>
     async function loadPage(page) {
         console.log("loadPage(" + page + ")");