Merge branch 'rolling' into update-webui

Changelog.md

@@ -1,5 +1,24 @@
+## [15.2.4] - 2023-05-02
+
+### 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.4)
+
+#### 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
+ - [#2381](https://github.com/jomjol/AI-on-the-edge-device/pull/2381) Fix broken sysinfo REST API
+
+
 ## [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 +985,7 @@ External Illumination
 -   Initial Version
 
 
+[15.2.4]: https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.1...v15.2.4
 [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_fileserver_ota/server_file.cpp

@@ -844,11 +844,9 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
             return ESP_FAIL;
         }
 
-        if (stat(filepath, &file_stat) == -1) {
+        if (stat(filepath, &file_stat) == -1) { // File does not exist
-            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File does not exist: " + string(filename));
+            /* This is ok, we would delete it anyway */
-            /* Respond with 400 Bad Request */
+            LogFile.WriteToFile(ESP_LOG_INFO, TAG, "File does not exist: " + string(filename));
-            httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "File does not exist");
-            return ESP_FAIL;
         }
 
         /* Delete file */
@@ -894,6 +892,7 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
         }
     }
 
+
     httpd_resp_set_hdr(req, "Location", directory.c_str());
     httpd_resp_sendstr(req, "File successfully deleted");
     return ESP_OK;

code/components/jomjol_flowcontroll/ClassFlowControll.cpp

@@ -190,10 +190,15 @@ void ClassFlowControll::SetInitialParameter(void)
 }
 
 
-bool ClassFlowControll::isAutoStart(long &_interval)
+bool ClassFlowControll::getIsAutoStart(void)
+{
+    return AutoStart;
+}
+
+
+void ClassFlowControll::setAutoStartInterval(long &_interval)
 {
     _interval = AutoInterval * 60 * 1000; // AutoInterval: minutes -> ms
-    return AutoStart;
 }
 
 

code/components/jomjol_flowcontroll/ClassFlowControll.h

@@ -66,7 +66,8 @@ public:
 
 	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);
@@ -679,8 +679,8 @@ esp_err_t handler_editflow(httpd_req_t *req)
             zw = "CutImage Done";
         }
         else {
-            LogFile.WriteToFile(ESP_LOG_WARN, TAG, *flowctrl.getActStatus());
+            LogFile.WriteToFile(ESP_LOG_WARN, TAG, std::string("Taking image for Alignment Mark not possible while device") +
-            LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Taking image for Alignment Mark not possible while device is busy with a round!");
+            " is busy with a round (Current State: '" + state + "')!");
             zw = "Device Busy";
         }
 
@@ -956,16 +956,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";
@@ -1039,7 +1048,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/components/jomjol_helper/psram.cpp

@@ -62,6 +62,7 @@ void *psram_reserve_shared_stbi_memory(size_t size) {
         if ((allocatedBytesForSTBI + size) > TENSOR_ARENA_SIZE + MAX_MODEL_SIZE) { // Check if it still fits in the shared region
             LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Shared memory in PSRAM too small (STBI) to fit additional " + 
                     std::to_string(size) + " bytes! Available: " + std::to_string(TENSOR_ARENA_SIZE + MAX_MODEL_SIZE - allocatedBytesForSTBI) + " bytes!");
+
             return NULL;
         }
         
@@ -194,7 +195,7 @@ void *calloc_psram_heap(std::string name, size_t n, size_t size, uint32_t caps)
 
 	ptr = heap_caps_calloc(n, size, caps);
     if (ptr != NULL) {
-	    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocated " + to_string(size) + " bytes in PSRAM for '" + name + "'");
+	    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Allocated " + to_string(size) + " bytes in PSRAM for '" + name + "'");
 	}
     else {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to allocate " + to_string(size) + " bytes in PSRAM for '" + name + "'!");

code/components/jomjol_helper/sdcard_check.cpp

@@ -147,12 +147,6 @@ bool SDCardCheckFolderFilePresence()
         bRetval = false;
     }
 
-    /* check if file exists: gethost.js */
-    if (stat("/sdcard/html/gethost.js", &sb) != 0) {
-        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Folder/file check: File /html/gethost.js not found");
-        bRetval = false;
-    }
-
     /* check if file exists: version.txt */
     if (stat("/sdcard/html/version.txt", &sb) != 0) {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Folder/file check: File /html/version.txt not found");
@@ -163,4 +157,4 @@ bool SDCardCheckFolderFilePresence()
         LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Folder/file presence check successful");
     
     return bRetval;
-}
+}

code/components/jomjol_influxdb/interface_influxdb.cpp

@@ -116,7 +116,7 @@ static esp_err_t http_event_handler(esp_http_client_event_t *evt)
             LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client Error encountered");
             break;
         case HTTP_EVENT_ON_CONNECTED:
-            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client Error encountered");
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client connected");
             ESP_LOGI(TAG, "HTTP Client Connected");
             break;
         case HTTP_EVENT_HEADERS_SENT:

code/components/jomjol_wlan/connect_wlan.cpp

@@ -49,14 +49,13 @@
 #define ets_delay_us(a) esp_rom_delay_us(a)
 #endif
 
-esp_netif_t *sta_netif = NULL;
-
 static const char *TAG = "WIFI";
 
 static bool APWithBetterRSSI = false;
 static bool WIFIConnected = false;
 static int WIFIReconnectCnt = 0;
 
+esp_netif_t *my_sta;
 
 
 void strinttoip4(const char *ip, int &a, int &b, int &c, int &d) {
@@ -531,7 +530,7 @@ esp_err_t wifi_init_sta(void)
 		return retval;
 	}
 	
-    esp_netif_t *my_sta = esp_netif_create_default_wifi_sta();
+    my_sta = esp_netif_create_default_wifi_sta();
 
     if (!wlan_config.ipaddress.empty() && !wlan_config.gateway.empty() && !wlan_config.netmask.empty())
     {
@@ -674,6 +673,20 @@ int get_WIFI_RSSI()
 }
 
 
+/*std::string getIp() {
+	esp_netif_ip_info_t ip_info;
+	ESP_ERROR_CHECK(esp_netif_get_ip_info(my_sta, ip_info));
+	char ipFormated[4*3+3+1];
+    sprintf(ipFormated, IPSTR, IP2STR(&ip_info.ip));
+	return std::string(ipFormated);
+}*/
+
+
+std::string* getHostname() {
+	return &wlan_config.hostname;
+}
+
+
 bool getWIFIisConnected() 
 {
     return WIFIConnected;

code/components/jomjol_wlan/connect_wlan.h

@@ -9,6 +9,8 @@ int wifi_init_sta(void);
 std::string* getIPAddress();
 std::string* getSSID();
 int get_WIFI_RSSI();
+std::string* getHostname();
+
 bool getWIFIisConnected();
 void WIFIDestroy();
 

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 ...");
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Initialization completed successfully");
-        StartMainFlowTask();
+        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 ...");
+        LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Initialization completed with non-critical errors!");
-        StartMainFlowTask();
+        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/main/server_main.cpp

@@ -25,8 +25,6 @@
 httpd_handle_t server = NULL;   
 std::string starttime = "";
 
-extern esp_netif_t *sta_netif;
-
 static const char *TAG = "MAIN SERVER";
 
 /* An HTTP GET handler */
@@ -353,15 +351,6 @@ esp_err_t sysinfo_handler(httpd_req_t *req)
     char freeheapmem[11];
     sprintf(freeheapmem, "%lu", (long) getESPHeapSize());
     
-    esp_netif_ip_info_t ip_info;
-    ESP_ERROR_CHECK(esp_netif_get_ip_info(sta_netif, &ip_info));
-    const char *hostname;
-    ESP_ERROR_CHECK(esp_netif_get_hostname(sta_netif, &hostname));
-    
-    char ipFormated[4*3+3+1];
-
-    sprintf(ipFormated, IPSTR, IP2STR(&ip_info.ip));
-
     zw = string("[{") + 
         "\"firmware\": \"" + gitversion + "\"," +
         "\"buildtime\": \"" + buildtime + "\"," +
@@ -370,8 +359,8 @@ esp_err_t sysinfo_handler(httpd_req_t *req)
         "\"gitrevision\": \"" + gitrevision + "\"," +
         "\"html\": \"" + htmlversion + "\"," +
         "\"cputemp\": \"" + cputemp + "\"," +
-        "\"hostname\": \"" + hostname + "\"," +
+        "\"hostname\": \"" + *getHostname() + "\"," +
-        "\"IPv4\": \"" + string(ipFormated) + "\"," +
+        "\"IPv4\": \"" + *getIPAddress() + "\"," +
         "\"freeHeapMem\": \"" + freeheapmem + "\"" +
         "}]";
 

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/config/config.ini

@@ -31,7 +31,7 @@ main.dig2 343 126 30 54 false
 main.dig3 391 126 30 54 false
 
 [Analog]
-Model = /config/ana-cont_1105_s2_q.tflite
+Model = /config/ana-cont_1206_s2_q.tflite
 CNNGoodThreshold = 0.5
 ;ROIImagesLocation = /log/analog
 ;ROIImagesRetention = 3

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/edit_analog.html

@@ -752,7 +752,8 @@ function drawTextBG(context, txt, x, y, padding) {
                     context.strokeRect(x0, y0, dx, dy); 
                     context.lineWidth = lw;
                     context.beginPath();
-                    context.arc(x0+dx/2, y0+dy/2, dx/2, 0, 2 * Math.PI);
+//                    context.arc (x0+dx/2, y0+dy/2, dx/2, 0, 2 * Math.PI);
+                    context.ellipse(x0+dx/2, y0+dy/2, dx/2, dy/2, 0, 0, 2 * Math.PI);
                     context.moveTo(x0+dx/2, y0);
                     context.lineTo(x0+dx/2, y0+dy);
                     context.moveTo(x0, y0+dy/2);
@@ -777,7 +778,8 @@ function drawTextBG(context, txt, x, y, padding) {
 
             context.lineWidth = 1;
             context.beginPath();
-            context.arc(x0+dx/2, y0+dy/2, dx/2, 0, 2 * Math.PI);
+//            context.arc(x0+dx/2, y0+dy/2, dx/2, 0, 2 * Math.PI);
+            context.ellipse(x0+dx/2, y0+dy/2, dx/2, dy/2, 0, 0, 2 * Math.PI);
             context.moveTo(x0+dx/2, y0);
             context.lineTo(x0+dx/2, y0+dy);
             context.moveTo(x0, y0+dy/2);

sd-card/html/gethost.js

@@ -1,41 +0,0 @@
-
-function gethost_Version(){
-    return "1.0.0 - 20200910";
-}
-
-
-function getbasepath(){
-    var host = window.location.hostname;
-    if (((host == "127.0.0.1") || (host == "localhost") || (host == "")) 
-//       && ((window.location.port == "80") || (window.location.port == ""))
-       )
-    
-    {
-//        host = "http://192.168.2.219";          // jomjol interner test
-//        host = "http://192.168.178.46";          // jomjol interner test
-        host = "http://192.168.178.44";          // jomjol interner Real
-//        host = "http://192.168.43.191";
-//        host = ".";                           // jomjol interner localhost   
-
-    }
-    else
-    {
-        host = window.location.protocol + "//" + host;
-        if (window.location.port != "") {
-            host = host + ":" + window.location.port;
-        }
-    }
-
-    return host;
-}
-
-function UpdatePage(_dosession = true){
-    var zw = location.href;
-    zw = zw.substr(0, zw.indexOf("?"));
-    if (_dosession) {
-        window.location = zw + '?session=' + Math.floor((Math.random() * 1000000) + 1); 
-    }
-    else {
-        window.location = zw; 
-    }
-}

sd-card/html/readconfigcommon.js

@@ -269,7 +269,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;
      }
 }
@@ -297,7 +297,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>