v15.2.2

Changelog.md

@@ -1,5 +1,23 @@
+## [15.2.2] - 2023-05-01
+
+### Changes
+
+For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.1...v15.2.2)
+
+#### Changed
+ - Updated PlatformIO to `6.2.0`
+ - [#2376](https://github.com/jomjol/AI-on-the-edge-device/pull/2376) Improve logging if Autostart is not enabled
+
+#### Fixed
+ - [#2373](https://github.com/jomjol/AI-on-the-edge-device/pull/2373) Allow the Alignment Mark step while status is "Initializing" or "Initialization (delayed)" or while in setup mode
+
+
 ## [15.2.1] - 2023-04-27
 
+### Changes
+
+For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.0...v15.2.1)
+
 #### Fixed
  - [#2357](https://github.com/jomjol/AI-on-the-edge-device/pull/2357) Fix Alignment Mark issue
 
@@ -966,6 +984,7 @@ External Illumination
 -   Initial Version
 
 
+[15.2.2]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.1...v15.2.2
 [15.2.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.0...v15.2.1
 [15.2.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.1...v15.2.0
 [15.1.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.0...v15.1.1

code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -190,13 +190,18 @@ void ClassFlowControll::SetInitialParameter(void)
 }
 
 
-bool ClassFlowControll::isAutoStart(long &_interval)
+bool ClassFlowControll::getIsAutoStart(void)
 {
-    _interval = AutoInterval * 60 * 1000; // AutoInterval: minutes -> ms
     return AutoStart;
 }
 
 
+void ClassFlowControll::setAutoStartInterval(long &_interval)
+{
+    _interval = AutoInterval * 60 * 1000; // AutoInterval: minutes -> ms
+}
+
+
 ClassFlow* ClassFlowControll::CreateClassFlow(std::string _type)
 {
     ClassFlow* cfc = NULL;

code/components/jomjol_flowcontroll/ClassFlowControll.h

@@ -65,7 +65,8 @@ class ClassFlowControll :
 
 	std::string doSingleStep(std::string _stepname, std::string _host);
 
-	bool isAutoStart(long &_interval);
+	bool getIsAutoStart();
+	void setAutoStartInterval(long &_interval);
 
 	std::string* getActStatusWithTime();
 	std::string* getActStatus();

code/components/jomjol_flowcontroll/MainFlowControl.cpp

@@ -41,7 +41,7 @@ bool bTaskAutoFlowCreated = false;
 bool flowisrunning = false;
 
 long auto_interval = 0;
-bool auto_isrunning = false;
+bool autostartIsEnabled = false;
 
 int countRounds = 0;
 bool isPlannedReboot = false;
@@ -257,7 +257,7 @@ esp_err_t handler_flow_start(httpd_req_t *req) {
 
     httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
 
-    if (auto_isrunning) {
+    if (autostartIsEnabled) {
         xTaskAbortDelay(xHandletask_autodoFlow); // Delay will be aborted if task is in blocked (waiting) state. If task is already running, no action
         LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Flow start triggered by REST API /flow_start");
         const char* resp_str = "The flow is going to be started immediately or is already running";
@@ -286,7 +286,7 @@ esp_err_t MQTTCtrlFlowStart(std::string _topic) {
 
     ESP_LOGD(TAG, "MQTTCtrlFlowStart: topic %s", _topic.c_str());
 
-    if (auto_isrunning) 
+    if (autostartIsEnabled) 
     {
         xTaskAbortDelay(xHandletask_autodoFlow); // Delay will be aborted if task is in blocked (waiting) state. If task is already running, no action
         LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Flow start triggered by MQTT topic " + _topic);
@@ -657,7 +657,14 @@ esp_err_t handler_editflow(httpd_req_t *req)
 
         string out2 = out.substr(0, out.length() - 4) + "_org.jpg";
 
-        if ((*flowctrl.getActStatus() == "Flow finished") && psram_init_shared_memory_for_take_image_step()) {
+        std::string state = *flowctrl.getActStatus();
+
+        /* To be able to provide the image, several conditions must be met due to the shared PSRAM usage:
+           - Ether the round most be completed or not started yet
+           - Or we must be in Setup Mode
+           - Additionally, the initialization of the shared PSRAM must be successful */
+        if (((state == "Flow finished") || (state == "Initialization") || (state == "Initialization (delayed)") || isSetupModusActive()) && 
+                psram_init_shared_memory_for_take_image_step()) {
             LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Taking image for Alignment Mark Update...");
 
             CAlignAndCutImage *caic = new CAlignAndCutImage("cutref", in);
@@ -679,7 +686,8 @@ esp_err_t handler_editflow(httpd_req_t *req)
             zw = "CutImage Done";
         }
         else {
-            LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Taking image for Alignment Mark not possible while device is busy with a round!");
+            LogFile.WriteToFile(ESP_LOG_WARN, TAG, std::string("Taking image for Alignment Mark not possible while device") +
+            " is busy with a round (Current State: '" + state + "')!");
             zw = "Device Busy";
         }
 
@@ -955,16 +963,25 @@ void task_autodoFlow(void *pvParameter)
     ESP_LOGD(TAG, "task_autodoFlow: start");
     doInit();
 
-    auto_isrunning = flowctrl.isAutoStart(auto_interval);
+    flowctrl.setAutoStartInterval(auto_interval);
+    autostartIsEnabled = flowctrl.getIsAutoStart();
 
     if (isSetupModusActive()) 
     {
-        auto_isrunning = false;
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "We are in Setup Mode -> Not starting Auto Flow!");
+        autostartIsEnabled = false;
         std::string zw_time = getCurrentTimeString(LOGFILE_TIME_FORMAT);
         flowctrl.doFlowTakeImageOnly(zw_time);
     }
+
+    if (autostartIsEnabled) {
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Starting Flow...");
+    }
+    else {
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Autostart is not enabled -> Not starting Flow");
+    }
 
-    while (auto_isrunning)
+    while (autostartIsEnabled)
     {
         LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "----------------------------------------------------------------"); // Clear separation between runs
         std::string _zw = "Round #" + std::to_string(++countRounds) + " started";
@@ -1038,7 +1055,7 @@ void task_autodoFlow(void *pvParameter)
 }
 
 
-void StartMainFlowTask()
+void InitializeFlowTask()
 {
     BaseType_t xReturned;
 

code/components/jomjol_flowcontroll/MainFlowControl.h

@@ -18,7 +18,7 @@ void register_server_main_flow_task_uri(httpd_handle_t server);
 void CheckIsPlannedReboot();
 bool getIsPlannedReboot();
 
-void StartMainFlowTask();
+void InitializeFlowTask();
 void DeleteMainFlowTask();
 bool isSetupModusActive();
 

code/main/main.cpp

@@ -512,13 +512,13 @@ extern "C" void app_main(void)
     // Check main init + start TFlite task
     // ********************************************
     if (getSystemStatus() == 0) { // No error flag is set
-        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Initialization completed successfully! Starting flow task ...");
-        StartMainFlowTask();
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Initialization completed successfully");
+        InitializeFlowTask();
     }
     else if (isSetSystemStatusFlag(SYSTEM_STATUS_CAM_FB_BAD) || // Non critical errors occured, we try to continue...
              isSetSystemStatusFlag(SYSTEM_STATUS_NTP_BAD)) {
-        LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Initialization completed with errors! Starting flow task ...");
-        StartMainFlowTask();
+        LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Initialization completed with non-critical errors!");
+        InitializeFlowTask();
     }
     else { // Any other error is critical and makes running the flow impossible. Init is going to abort.
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Initialization failed. Flow task start aborted. Loading reduced web interface...");

code/platformio.ini

@@ -19,7 +19,7 @@
 
 [common:esp32-idf]
     extends = common:idf
-    platform = platformio/espressif32 @ 6.1.0
+    platform = platformio/espressif32 @ 6.2.0
     framework = espidf
     lib_deps = 
         ${common:idf.lib_deps}

sd-card/html/backup.html

@@ -105,7 +105,7 @@ <h2>Restore Configuration</h2>
 
 //    console.log(url + " started (" + index + "/" + urls.length + ")");
     if (retry == 0) {
-        setStatus("&nbsp;- " + getFilenameFromUrl(urls[index]) + " (" + index + "/" + urls.length + ")...");
+        setStatus("&nbsp;- " + getFilenameFromUrl(urls[index]) + " (" + (index+1) + "/" + urls.length + ")...");
     }
     else {
         setStatus("<span style=\"color: gray\">&nbsp;&nbsp;&nbsp;Retrying (" + retry + ")...</span>");

sd-card/html/common.js

@@ -4,12 +4,6 @@
 var domainname_for_testing = "192.168.178.23";
 
 
-
-function gethost_Version(){
-    return "1.0.0 - 20200910";
-}
-
-
 /* Returns the domainname with prepended protocol.
 Eg. http://watermeter.fritz.box or http://192.168.1.5 */
 function getDomainname(){

sd-card/html/readconfigcommon.js

@@ -264,7 +264,7 @@ function MakeContrastImageZW(zw, _enhance, _domainname){
           return true;
      }
      else {
-          firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000);
+          firework.launch("Device is busy, please try again when the Digitalization Round got completed!", 'warning', 10000);
           return false;
      }
 }
@@ -293,7 +293,7 @@ function MakeRefZW(zw, _domainname){
           return true;
      }
      else {
-          firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000);
+          firework.launch("Device is busy, please try again when the Digitalization Round got completed!", 'warning', 10000);
           return false;
      }
 }

sd-card/html/wlan_config.html

@@ -3,6 +3,7 @@
         <link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
         <script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script>  
         <script type="text/javascript" src="firework.js?v=$COMMIT_HASH"></script>
+        <script type="text/javascript" src="/common.js?v=$COMMIT_HASH"> 
     </head>
 <body>
     <table>