Update Changelog.md

Don't autofail if NTP server can't be reached during initalization (#1498 )
This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization.
2025-12-14 07:26:53 +03:00 · 2022-12-06 20:32:48 +01:00 · 2022-12-06 07:00:43 +01:00 · 2022-12-06 06:53:05 +01:00 · 2022-12-06 06:52:25 +01:00 · 2022-12-05 20:43:06 +01:00
22 changed files with 156 additions and 113 deletions
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,6 @@
 # Changelog

- ## [Unreleased]
+## [Unreleased]

 **Home Assistant MQTT Discovery Support**

@@ -27,11 +27,11 @@
 If anything breaks you can try to enforce manual update as following:

 **OTA:**
-  1\. Make sure the last run of the update completed the **Uploading** step.
-  1\. Call `http://<IP>/ota?task=update&file=<UPLOAD_FILENAME>` to enforce the extraction/flashing.
+  1. Make sure the last run of the update completed the **Uploading** step.
+  1. Call `http://<IP>/ota?task=update&file=<UPLOAD_FILENAME>` to enforce the extraction/flashing.

 **Initial Setup:**
-  1\. Use the initial_esp32_setup.zip ( <https://github.com/jomjol/AI-on-the-edge-device/wiki/Installation> ) as alternative to have a clean install.
+  1. Use the initial_esp32_setup.zip ( <https://github.com/jomjol/AI-on-the-edge-device/wiki/Installation> ) as alternative to have a clean install.

 ### Added

@@ -76,7 +76,8 @@ If anything breaks you can try to enforce manual update as following:
 -   Various minor fixes and improvements
 -   NEW v13.0.2: Corrected Version comparison between firmware and Web UI.
 -   NEW v13.0.3: Re-updated build environment to v5.2.0 (from accidental downgrad to v4.4.0)
-   **NEW v13.0.4**: Fix for reboot in case of MQTT not used
+-   NEW v13.0.4: Fix for reboot in case of MQTT not used
+-   **NEW v13.0.5**: No reboot in case of missing NTP-connection

 ### Removed

@@ -98,8 +99,8 @@ Improve **u**ser e**x**perience
 5.  Now you can reboot.

 If anything breaks you can try to
-1\. Call `http://<IP>/ota?task=update&file=firmware.bin` resp. `http://<IP>/ota?task=update&file=html.zip` if the upload successed but the extraction failed.
-1\. Use the initial_esp32_setup.zip ( <https://github.com/jomjol/AI-on-the-edge-device/wiki/Installation> ) as alternative.
+1. Call `http://<IP>/ota?task=update&file=firmware.bin` resp. `http://<IP>/ota?task=update&file=html.zip` if the upload successed but the extraction failed.
+1. Use the initial_esp32_setup.zip ( <https://github.com/jomjol/AI-on-the-edge-device/wiki/Installation> ) as alternative.

 ### Added

@@ -751,7 +752,9 @@ External Illumination

 -   Initial Version

-[Unreleased]: https://github.com/jomjol/AI-on-the-edge-device/compare/13.0.1...HEAD
+[Unreleased]: https://github.com/jomjol/AI-on-the-edge-device/compare/13.0.4...HEAD
+
+[13.0.4]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.4

 [13.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.1

--- a/code/components/jomjol_controlcamera/ClassControllCamera.cpp
+++ b/code/components/jomjol_controlcamera/ClassControllCamera.cpp
@@ -425,7 +425,7 @@ esp_err_t CCamera::CaptureToFile(std::string nm, int delay)
    nm = FormatFileName(nm);

 #ifdef DEBUG_DETAIL_ON
-    ESP_LOGD(TAG, "Save Camera to : %s", nm.c_str());
+    ESP_LOGD(TAG, "Save Camera to: %s", nm.c_str());
 #endif

    ftype = toUpper(getFileType(nm));
@@ -675,6 +675,7 @@ esp_err_t CCamera::InitCam()
    ActualQuality = camera_config.jpeg_quality;
    ActualResolution = camera_config.frame_size;
    //initialize the camera
+    esp_camera_deinit(); // De-init in case it was already initialized
    esp_err_t err = esp_camera_init(&camera_config);
    if (err != ESP_OK) {
        ESP_LOGE(TAG, "Camera Init Failed");
--- a/code/components/jomjol_fileserver_ota/server_file.cpp
+++ b/code/components/jomjol_fileserver_ota/server_file.cpp
@@ -219,9 +219,9 @@ static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const
    ESP_LOGD(TAG, "entrypath: <%s>", entrypath);

    if (!dir) {
-        ESP_LOGE(TAG, "Failed to stat dir : %s", dirpath);
+        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to stat dir: %s", dirpath);
        /* Respond with 404 Not Found */
-        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, "Directory does not exist");
+        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404());
        return ESP_FAIL;
    }

@@ -278,11 +278,11 @@ static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const
            strlcpy(entrypath + dirpath_len, entry->d_name, sizeof(entrypath) - dirpath_len);
            ESP_LOGD(TAG, "Entrypath: %s", entrypath);
            if (stat(entrypath, &entry_stat) == -1) {
-                ESP_LOGE(TAG, "Failed to stat %s : %s", entrytype, entry->d_name);
+                ESP_LOGE(TAG, "Failed to stat %s: %s", entrytype, entry->d_name);
                continue;
            }
            sprintf(entrysize, "%ld", entry_stat.st_size);
-            ESP_LOGI(TAG, "Found %s : %s (%s bytes)", entrytype, entry->d_name, entrysize);
+            ESP_LOGI(TAG, "Found %s: %s (%s bytes)", entrytype, entry->d_name, entrysize);

            /* Send chunk of HTML file containing table entries with file name and size */
            httpd_resp_sendstr_chunk(req, "<tr><td><a href=\"");
@@ -361,15 +361,15 @@ static esp_err_t send_datafile(httpd_req_t *req, bool send_full_file)

    fd = OpenFileAndWait(currentfilename.c_str(), "r");
    if (!fd) {
-        ESP_LOGE(TAG, "Failed to read existing file : %s", filepath);
-        /* Respond with 500 Internal Server Error */
-        httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to read existing file");
+        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to read existing file: %s", filepath);
+        /* Respond with 404 Error */
+        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404());
        return ESP_FAIL;
    }

    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");

-//    ESP_LOGI(TAG, "Sending file : %s (%ld bytes)...", &filename, file_stat.st_size);
+//    ESP_LOGI(TAG, "Sending file: %s (%ld bytes)...", &filename, file_stat.st_size);
    set_content_type_from_file(req, filename);

    if (!send_full_file) { // Send only last part of file
@@ -446,15 +446,15 @@ static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file)

    fd = OpenFileAndWait(currentfilename.c_str(), "r");
    if (!fd) {
-        ESP_LOGE(TAG, "Failed to read existing file : %s", filepath);
-        /* Respond with 500 Internal Server Error */
-        httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to read existing file");
+        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to read existing file: %s", filepath);
+        /* Respond with 404 Error */
+        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404());
        return ESP_FAIL;
    }

    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");

-//    ESP_LOGI(TAG, "Sending file : %s (%ld bytes)...", &filename, file_stat.st_size);
+//    ESP_LOGI(TAG, "Sending file: %s (%ld bytes)...", &filename, file_stat.st_size);
    set_content_type_from_file(req, filename);

    if (!send_full_file) { // Send only last part of file
@@ -534,8 +534,8 @@ static esp_err_t download_get_handler(httpd_req_t *req)

    if (!filename) {
        ESP_LOGE(TAG, "Filename is too long");
-        /* Respond with 500 Internal Server Error */
-        httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Filename too long");
+        /* Respond with 414 Error */
+        httpd_resp_send_err(req, HTTPD_414_URI_TOO_LONG, "Filename too long");
        return ESP_FAIL;
    }

@@ -566,23 +566,23 @@ static esp_err_t download_get_handler(httpd_req_t *req)

        /* If file not present on SPIFFS check if URI
         * corresponds to one of the hardcoded paths */
-        ESP_LOGE(TAG, "Failed to stat file : %s", filepath);
+        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to stat file: %s!", filepath);
        /* Respond with 404 Not Found */
-        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, "File does not exist");
+        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404());
        return ESP_FAIL;
    }

    fd = OpenFileAndWait(filepath, "r");
    if (!fd) {
-        ESP_LOGE(TAG, "Failed to read existing file : %s", filepath);
-        /* Respond with 500 Internal Server Error */
-        httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to read existing file");
+        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to read existing file: %s!", filepath);
+        /* Respond with 404 Error */
+        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404());
        return ESP_FAIL;
    }

    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");

-    ESP_LOGD(TAG, "Sending file : %s (%ld bytes)...", filename, file_stat.st_size);
+    ESP_LOGD(TAG, "Sending file: %s (%ld bytes)...", filename, file_stat.st_size);
    set_content_type_from_file(req, filename);

    /* Retrieve the pointer to scratch buffer for temporary storage */
@@ -599,7 +599,7 @@ static esp_err_t download_get_handler(httpd_req_t *req)
            /* Abort sending file */
            httpd_resp_sendstr_chunk(req, NULL);
            /* Respond with 500 Internal Server Error */
-            httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to send file");
+            httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to send file!");
            return ESP_FAIL;
        }

@@ -628,20 +628,21 @@ static esp_err_t upload_post_handler(httpd_req_t *req)
    const char *filename = get_path_from_uri(filepath, ((struct file_server_data *)req->user_ctx)->base_path,
                                             req->uri + sizeof("/upload") - 1, sizeof(filepath));
    if (!filename) {
-        /* Respond with 500 Internal Server Error */
-        httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Filename too long");
+        /* Respond with 413 Error */
+        httpd_resp_send_err(req, HTTPD_414_URI_TOO_LONG, "Filename too long");
        return ESP_FAIL;
    }

    /* Filename cannot have a trailing '/' */
    if (filename[strlen(filename) - 1] == '/') {
-        ESP_LOGE(TAG, "Invalid filename : %s", filename);
-        httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Invalid filename");
+        ESP_LOGE(TAG, "Invalid filename: %s", filename);
+        /* Respond with 400 Bad Request */
+        httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "Invalid filename");
        return ESP_FAIL;
    }

    if (stat(filepath, &file_stat) == 0) {
-        ESP_LOGE(TAG, "File already exists : %s", filepath);
+        ESP_LOGE(TAG, "File already exists: %s", filepath);
        /* Respond with 400 Bad Request */
        httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "File already exists");
        return ESP_FAIL;
@@ -649,7 +650,7 @@ static esp_err_t upload_post_handler(httpd_req_t *req)

    /* File cannot be larger than a limit */
    if (req->content_len > MAX_FILE_SIZE) {
-        ESP_LOGE(TAG, "File too large : %d bytes", req->content_len);
+        ESP_LOGE(TAG, "File too large: %d bytes", req->content_len);
        /* Respond with 400 Bad Request */
        httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST,
                            "File size must be less than "
@@ -661,13 +662,13 @@ static esp_err_t upload_post_handler(httpd_req_t *req)

    fd = OpenFileAndWait(filepath, "w");
    if (!fd) {
-        ESP_LOGE(TAG, "Failed to create file : %s", filepath);
+        ESP_LOGE(TAG, "Failed to create file: %s", filepath);
        /* Respond with 500 Internal Server Error */
        httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to create file");
        return ESP_FAIL;
    }

-    ESP_LOGI(TAG, "Receiving file : %s...", filename);
+    ESP_LOGI(TAG, "Receiving file: %s...", filename);

    /* Retrieve the pointer to scratch buffer for temporary storage */
    char *buf = ((struct file_server_data *)req->user_ctx)->scratch;
@@ -679,7 +680,7 @@ static esp_err_t upload_post_handler(httpd_req_t *req)

    while (remaining > 0) {

-        ESP_LOGI(TAG, "Remaining size : %d", remaining);
+        ESP_LOGI(TAG, "Remaining size: %d", remaining);
        /* Receive the file part by part into a buffer */
        if ((received = httpd_req_recv(req, buf, MIN(remaining, SCRATCH_BUFSIZE))) <= 0) {
            if (received == HTTPD_SOCK_ERR_TIMEOUT) {
@@ -790,8 +791,8 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
        const char *filename = get_path_from_uri(filepath, ((struct file_server_data *)req->user_ctx)->base_path,
                                                req->uri  + sizeof("/delete") - 1, sizeof(filepath));
        if (!filename) {
-            /* Respond with 500 Internal Server Error */
-            httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Filename too long");
+            /* Respond with 414 Error */
+            httpd_resp_send_err(req, HTTPD_414_URI_TOO_LONG, "Filename too long");
            return ESP_FAIL;
        }
        zw = std::string(filename);
@@ -824,19 +825,20 @@ static esp_err_t delete_post_handler(httpd_req_t *req)

        /* Filename cannot have a trailing '/' */
        if (filename[strlen(filename) - 1] == '/') {
-            ESP_LOGE(TAG, "Invalid filename : %s", filename);
-            httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Invalid filename");
+            ESP_LOGE(TAG, "Invalid filename: %s", filename);
+            /* Respond with 400 Bad Request */
+            httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "Invalid filename");
            return ESP_FAIL;
        }

        if (stat(filepath, &file_stat) == -1) {
-            ESP_LOGE(TAG, "File does not exist : %s", filename);
+            ESP_LOGE(TAG, "File does not exist: %s", filename);
            /* Respond with 400 Bad Request */
            httpd_resp_send_err(req, HTTPD_400_BAD_REQUEST, "File does not exist");
            return ESP_FAIL;
        }

-        ESP_LOGI(TAG, "Deleting file : %s", filename);
+        ESP_LOGI(TAG, "Deleting file: %s", filename);
        /* Delete file */
        unlink(filepath);

@@ -878,7 +880,7 @@ void delete_all_in_directory(std::string _directory)
    std::string filename;

    if (!dir) {
-        ESP_LOGE(TAG, "Failed to stat dir : %s", _directory.c_str());
+        ESP_LOGE(TAG, "Failed to stat dir: %s", _directory.c_str());
        return;
    }

@@ -887,7 +889,7 @@ void delete_all_in_directory(std::string _directory)
        if (!(entry->d_type == DT_DIR)){
            if (strcmp("wlan.ini", entry->d_name) != 0){                    // auf wlan.ini soll nicht zugegriffen werden !!!
                filename = _directory + "/" + std::string(entry->d_name);
-                ESP_LOGI(TAG, "Deleting file : %s", filename.c_str());
+                ESP_LOGI(TAG, "Deleting file: %s", filename.c_str());
                /* Delete file */
                unlink(filename.c_str());    
            }
--- a/code/components/jomjol_fileserver_ota/server_help.cpp
+++ b/code/components/jomjol_fileserver_ota/server_help.cpp
@@ -36,13 +36,13 @@ esp_err_t send_file(httpd_req_t *req, std::string filename)
 {
    FILE *fd = OpenFileAndWait(filename.c_str(), "r");
    if (!fd) {
-        ESP_LOGE(TAG, "Failed to read existing file : %s", filename.c_str());
-        /* Respond with 500 Internal Server Error */
-        httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to read existing file");
+        ESP_LOGE(TAG, "Failed to read existing file: %s", filename.c_str());
+        /* Respond with 404 Error */
+        httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404());
        return ESP_FAIL;
    }

-    ESP_LOGD(TAG, "Sending file : %s ...", filename.c_str());
+    ESP_LOGD(TAG, "Sending file: %s ...", filename.c_str());
 //    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
    set_content_type_from_file(req, filename.c_str());

--- a/code/components/jomjol_fileserver_ota/server_ota.cpp
+++ b/code/components/jomjol_fileserver_ota/server_ota.cpp
@@ -530,7 +530,7 @@ esp_err_t handler_ota_update(httpd_req_t *req)
        int _result = stat(fn.c_str(), &file_stat);
        ESP_LOGD(TAG, "Ergebnis %d\n", _result);
        if (_result == 0) {
-            ESP_LOGD(TAG, "Deleting file : %s", fn.c_str());
+            ESP_LOGD(TAG, "Deleting file: %s", fn.c_str());
            /* Delete file */
            unlink(fn.c_str());
        }
--- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
@@ -569,10 +569,10 @@ bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
 int ClassFlowControll::CleanTempFolder() {
    const char* folderPath = "/sdcard/img_tmp";
    
-    ESP_LOGD(TAG, "Clean up temporary folder to avoid damage of sdcard sectors : %s", folderPath);
+    ESP_LOGD(TAG, "Clean up temporary folder to avoid damage of sdcard sectors: %s", folderPath);
    DIR *dir = opendir(folderPath);
    if (!dir) {
-        ESP_LOGE(TAG, "Failed to stat dir : %s", folderPath);
+        ESP_LOGE(TAG, "Failed to stat dir: %s", folderPath);
        return -1;
    }

@@ -584,7 +584,7 @@ int ClassFlowControll::CleanTempFolder() {
 			if (unlink(path.c_str()) == 0) {
 				deleted ++;
 			} else {
-				ESP_LOGE(TAG, "can't delete file : %s", path.c_str());
+				ESP_LOGE(TAG, "can't delete file: %s", path.c_str());
 			}
        } else if (entry->d_type == DT_DIR) {
 			deleted += removeFolder(path.c_str(), TAG);
@@ -679,7 +679,7 @@ esp_err_t ClassFlowControll::GetJPGStream(std::string _fn, httpd_req_t *req)

    if (_send)
    {
-        ESP_LOGD(TAG, "Sending file : %s ...", _fn.c_str());
+        ESP_LOGD(TAG, "Sending file: %s ...", _fn.c_str());
        set_content_type_from_file(req, _fn.c_str());
        result = _send->SendJPGtoHTTP(req);
        ESP_LOGD(TAG, "File sending complete");    
--- a/code/components/jomjol_flowcontroll/ClassFlowImage.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowImage.cpp
@@ -113,7 +113,7 @@ void ClassFlowImage::RemoveOldLogs()

    DIR *dir = opendir(LogImageLocation.c_str());
    if (!dir) {
-        ESP_LOGE(TAG, "Failed to stat dir : %s", LogImageLocation.c_str());
+        ESP_LOGE(TAG, "Failed to stat dir: %s", LogImageLocation.c_str());
        return;
    }

--- a/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
@@ -225,6 +225,7 @@ bool ClassFlowMQTT::doFlow(string zwtime)
    std::string result;
    std::string resulterror = "";
    std::string resultraw = "";
+    std::string resultpre = "";
    std::string resultrate = ""; // Always Unit / Minute
    std::string resultRatePerTimeUnit = ""; // According to selection
    std::string resulttimestamp = "";
@@ -244,6 +245,7 @@ bool ClassFlowMQTT::doFlow(string zwtime)
        {
            result =  (*NUMBERS)[i]->ReturnValue;
            resultraw =  (*NUMBERS)[i]->ReturnRawValue;
+            resultpre =  (*NUMBERS)[i]->ReturnPreValue;
            resulterror = (*NUMBERS)[i]->ErrorMessageText;
            resultrate = (*NUMBERS)[i]->ReturnRateValue; // Unit per minutes
            resultchangabs = (*NUMBERS)[i]->ReturnChangeAbsolute; // Units per round
@@ -289,38 +291,43 @@ bool ClassFlowMQTT::doFlow(string zwtime)
            std::string json = "";
            
            if (result.length() > 0)
-                json += "{\"value\":"+result;
+                json += "{\"value\": "+result;
            else
-                json += "{\"value\":\"\"";
+                json += "{\"value\": \"\"";

-            json += ",\"raw\":\""+resultraw;
-            json += "\",\"error\":\""+resulterror;
+            json += ", \"raw\": \""+resultraw;
+
+            json += ", \"pre\": \"" + resultpre;
+
+            json += "\", \"error\": \""+resulterror;

            if (resultrate.length() > 0)
-                json += "\",\"rate\":"+resultrate;
+                json += "\", \"rate\": "+resultrate;
            else
-                json += "\",\"rate\":\"\"";
+                json += "\", \"rate\": \"\"";

-            json += ",\"timestamp\":\""+resulttimestamp+"\"}";
+            json += ", \"timestamp\": \""+resulttimestamp+"\"}";

            MQTTPublish(namenumber + "json", json, SetRetainFlag);
        }
    }
-    else
-    {
-        for (int i = 0; i < ListFlowControll->size(); ++i)
-        {
-            zw = (*ListFlowControll)[i]->getReadout();
-            if (zw.length() > 0)
-            {
-                if (result.length() == 0)
-                    result = zw;
-                else
-                    result = result + "\t" + zw;
-            }
-        }
-        MQTTPublish(topic, result, SetRetainFlag);
-    }
+    
+    /* Disabled because this is no longer a use case */
+    // else
+    // {
+    //     for (int i = 0; i < ListFlowControll->size(); ++i)
+    //     {
+    //         zw = (*ListFlowControll)[i]->getReadout();
+    //         if (zw.length() > 0)
+    //         {
+    //             if (result.length() == 0)
+    //                 result = zw;
+    //             else
+    //                 result = result + "\t" + zw;
+    //         }
+    //     }
+    //     MQTTPublish(topic, result, SetRetainFlag);
+    // }
    
    OldValue = result;
    
--- a/code/components/jomjol_helper/Helper.cpp
+++ b/code/components/jomjol_helper/Helper.cpp
@@ -304,7 +304,7 @@ size_t findDelimiterPos(string input, string delimiter)

 bool RenameFile(string from, string to)
 {
-//	ESP_LOGI(logTag, "Deleting file : %s", fn.c_str());
+//	ESP_LOGI(logTag, "Deleting file: %s", fn.c_str());
 	/* Delete file */
 	FILE* fpSourceFile = OpenFileAndWait(from.c_str(), "rb");
 	if (!fpSourceFile)	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
@@ -321,7 +321,7 @@ bool RenameFile(string from, string to)

 bool DeleteFile(string fn)
 {
-//	ESP_LOGI(logTag, "Deleting file : %s", fn.c_str());
+//	ESP_LOGI(logTag, "Deleting file: %s", fn.c_str());
 	/* Delete file */
 	FILE* fpSourceFile = OpenFileAndWait(fn.c_str(), "rb");
 	if (!fpSourceFile)	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
@@ -512,7 +512,7 @@ int removeFolder(const char* folderPath, const char* logTag) {

 	DIR *dir = opendir(folderPath);
    if (!dir) {
-        ESP_LOGE(logTag, "Failed to stat dir : %s", folderPath);
+        ESP_LOGE(logTag, "Failed to stat dir: %s", folderPath);
        return -1;
    }

@@ -525,7 +525,7 @@ int removeFolder(const char* folderPath, const char* logTag) {
 			if (unlink(path.c_str()) == 0) {
 				deleted ++;
 			} else {
-				ESP_LOGE(logTag, "can't delete file : %s", path.c_str());
+				ESP_LOGE(logTag, "can't delete file: %s", path.c_str());
 			}
        } else if (entry->d_type == DT_DIR) {
 			deleted += removeFolder(path.c_str(), logTag);
@@ -534,7 +534,7 @@ int removeFolder(const char* folderPath, const char* logTag) {
    
    closedir(dir);
 	if (rmdir(folderPath) != 0) {
-		ESP_LOGE(logTag, "can't delete folder : %s", folderPath);
+		ESP_LOGE(logTag, "can't delete folder: %s", folderPath);
 	}
 	ESP_LOGD(logTag, "%d files in folder %s deleted.", deleted, folderPath);

@@ -791,3 +791,14 @@ string getResetReason(void) {
 	}
    return reasonText;
 }
+
+const char* get404(void) {
+    return 
+"<pre>\n\n\n\n"
+"        _\n"
+"    .__(.)< ( oh oh! This page does not exist! )\n"
+"    \\___)\n"
+"\n\n"
+"                You could try your <a href=index.html target=_parent>luck</a> here!</pre>\n"
+"<script>document.cookie = \"page=overview.html\"</script>"; // Make sure we load the overview page
+}
--- a/code/components/jomjol_helper/Helper.h
+++ b/code/components/jomjol_helper/Helper.h
@@ -64,3 +64,5 @@ string getSDCardSectorSize();

 string getMac(void);
 string getResetReason(void);
+
+const char* get404(void);
--- a/code/components/jomjol_image_proc/CImageBasis.cpp
+++ b/code/components/jomjol_image_proc/CImageBasis.cpp
@@ -453,7 +453,7 @@ CImageBasis::CImageBasis(std::string _image)
    RGBImageRelease();

    zwld = esp_get_free_heap_size();
-    ESP_LOGD(TAG, "freeheapsize after : %ld", zwld);
+    ESP_LOGD(TAG, "freeheapsize after: %ld", zwld);

    std::string zw = "Image Load failed:" + _image;
    if (rgb_image == NULL)
--- a/code/components/jomjol_logfile/ClassLogFile.cpp
+++ b/code/components/jomjol_logfile/ClassLogFile.cpp
@@ -315,7 +315,7 @@ void ClassLogFile::RemoveOldLogFile()

    DIR *dir = opendir(logroot.c_str());
    if (!dir) {
-        ESP_LOGE(TAG, "Failed to stat dir : %s", logroot.c_str());
+        ESP_LOGE(TAG, "Failed to stat dir: %s", logroot.c_str());
        return;
    }

@@ -324,14 +324,14 @@ void ClassLogFile::RemoveOldLogFile()
    int notDeleted = 0;
    while ((entry = readdir(dir)) != NULL) {
        if (entry->d_type == DT_REG) {
-            //ESP_LOGD(TAG, "compare log file : %s to %s", entry->d_name, cmpfilename);
+            //ESP_LOGD(TAG, "compare log file: %s to %s", entry->d_name, cmpfilename);
            if ((strlen(entry->d_name) == strlen(cmpfilename)) && (strcmp(entry->d_name, cmpfilename) < 0)) {
-                //ESP_LOGD(TAG, "delete log file : %s", entry->d_name);
+                //ESP_LOGD(TAG, "delete log file: %s", entry->d_name);
                std::string filepath = logroot + "/" + entry->d_name; 
                if (unlink(filepath.c_str()) == 0) {
                    deleted ++;
                } else {
-                    ESP_LOGE(TAG, "can't delete file : %s", entry->d_name);
+                    ESP_LOGE(TAG, "can't delete file: %s", entry->d_name);
                    notDeleted ++;
                }
            } else {
@@ -366,7 +366,7 @@ void ClassLogFile::RemoveOldDataLog()

    DIR *dir = opendir(dataroot.c_str());
    if (!dir) {
-        ESP_LOGE(TAG, "Failed to stat dir : %s", dataroot.c_str());
+        ESP_LOGE(TAG, "Failed to stat dir: %s", dataroot.c_str());
        return;
    }

@@ -375,14 +375,14 @@ void ClassLogFile::RemoveOldDataLog()
    int notDeleted = 0;
    while ((entry = readdir(dir)) != NULL) {
        if (entry->d_type == DT_REG) {
-            //ESP_LOGD(TAG, "Compare data file : %s to %s", entry->d_name, cmpfilename);
+            //ESP_LOGD(TAG, "Compare data file: %s to %s", entry->d_name, cmpfilename);
            if ((strlen(entry->d_name) == strlen(cmpfilename)) && (strcmp(entry->d_name, cmpfilename) < 0)) {
-                //ESP_LOGD(TAG, "delete data file : %s", entry->d_name);
+                //ESP_LOGD(TAG, "delete data file: %s", entry->d_name);
                std::string filepath = dataroot + "/" + entry->d_name; 
                if (unlink(filepath.c_str()) == 0) {
                    deleted ++;
                } else {
-                    ESP_LOGE(TAG, "can't delete file : %s", entry->d_name);
+                    ESP_LOGE(TAG, "can't delete file: %s", entry->d_name);
                    notDeleted ++;
                }
            } else {
--- a/code/components/jomjol_mqtt/interface_mqtt.cpp
+++ b/code/components/jomjol_mqtt/interface_mqtt.cpp
@@ -176,7 +176,7 @@ bool MQTT_Init() {

    if ((client_id.length() == 0) || (lwt_topic.length() == 0))
    {
-        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, std::string("Init with no Client_ID or Topic. Abort Init!"));
+        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, std::string("Init with no Client_ID (" + client_id + ") or Last Will Topic (" + lwt_topic + "). Abort Init!"));
        return false;
    }
    
--- a/code/components/jomjol_mqtt/server_mqtt.cpp
+++ b/code/components/jomjol_mqtt/server_mqtt.cpp
@@ -162,7 +162,7 @@ void MQTThomeassistantDiscovery() {
 void publishSystemData() {
    char tmp_char[50];

-    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Publishing system MQTT topics...");
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Publishing system MQTT topics...");

    sprintf(tmp_char, "%ld", (long)getUpTime());
    MQTTPublish(maintopic + "/" + "uptime", std::string(tmp_char), retainFlag);
@@ -179,7 +179,7 @@ void publishSystemData() {


 void publishStaticData() {
-    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Publishing static MQTT topics...");
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Publishing static MQTT topics...");
    MQTTPublish(maintopic + "/" + "MAC", getMac(), retainFlag);
    MQTTPublish(maintopic + "/" + "IP", *getIPAddress(), retainFlag);
    MQTTPublish(maintopic + "/" + "hostname", hostname, retainFlag);
--- a/code/components/jomjol_tfliteclass/server_tflite.cpp
+++ b/code/components/jomjol_tfliteclass/server_tflite.cpp
@@ -736,7 +736,7 @@ void task_autodoFlow(void *pvParameter)
    while (auto_isrunning)
    {
        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "----------------------------------------------------------------"); // Clear separation between runs
-        std::string _zw = "task_autodoFlow - next round - Round #" + std::to_string(++countRounds);
+        std::string _zw = "task_autodoFlow - Starting Round #" + std::to_string(++countRounds);
        LogFile.WriteToFile(ESP_LOG_INFO, TAG, _zw); 
        fr_start = esp_timer_get_time();

@@ -760,13 +760,15 @@ void task_autodoFlow(void *pvParameter)
            LogFile.RemoveOldDataLog();
        }
        
-        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "task_autodoFlow - round #" + std::to_string(countRounds) + " done");
        //CPU Temp
        float cputmp = temperatureRead();
        std::stringstream stream;
        stream << std::fixed << std::setprecision(1) << cputmp;
        string zwtemp = "CPU Temperature: " + stream.str();
-        LogFile.WriteToFile(ESP_LOG_INFO, TAG, zwtemp); 
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zwtemp); 
+
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "task_autodoFlow - round #" + std::to_string(countRounds) + " completed");
+
        fr_delta_ms = (esp_timer_get_time() - fr_start) / 1000;
        if (auto_intervall > fr_delta_ms)
        {
--- a/code/main/main.cpp
+++ b/code/main/main.cpp
@@ -214,7 +214,6 @@ extern "C" void app_main(void)

    if (!setup_time()) {
        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "NTP Initialization failed!");
-        initSucessful = false;
    }

    setBootTime();
--- a/code/main/server_main.cpp
+++ b/code/main/server_main.cpp
@@ -241,8 +241,8 @@ esp_err_t hello_main_handler(httpd_req_t *req)

    if (!filename) {
        ESP_LOGE(TAG, "Filename is too long");
-        /* Respond with 500 Internal Server Error */
-        httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Filename too long");
+        /* Respond with 414 Error */
+        httpd_resp_send_err(req, HTTPD_414_URI_TOO_LONG, "Filename too long");
        return ESP_FAIL;
    }

--- a/code/sdkconfig.defaults
+++ b/code/sdkconfig.defaults
@@ -34,7 +34,7 @@ CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_USE_MALLOC=y
 CONFIG_SPIRAM_MEMTEST=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=40960
 CONFIG_SPIRAM_CACHE_WORKAROUND=y

 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
--- a/sd-card/html/index.html
+++ b/sd-card/html/index.html
@@ -15,7 +15,7 @@
 <script>
    async function loadPage(page) {
        console.log("loadPage(" + page + ")");
-        document.cookie = page;
+        document.cookie = "page="+page;
        document.getElementById('maincontent').src = page;

        [].forEach.call(document.querySelectorAll('.submenu'), function (el) {
@@ -28,6 +28,22 @@
            el.style.visibility = 'visible';
        });
    }
+    
+    function getCookie(cname) {
+      let name = cname + "=";
+      let decodedCookie = decodeURIComponent(document.cookie);
+      let ca = decodedCookie.split(';');
+      for(let i = 0; i <ca.length; i++) {
+        let c = ca[i];
+        while (c.charAt(0) == ' ') {
+          c = c.substring(1);
+        }
+        if (c.indexOf(name) == 0) {
+          return c.substring(name.length, c.length);
+        }
+      }
+      return "";
+    }        
 </script>

 </head>
@@ -63,7 +79,7 @@
        </li>
      </ul>

-    <li><a href="#" onclick="loadPage('wasserzaehler.html?full');">Recognition</a></li>
+    <li><a href="#" onclick="loadPage('value?full');">Recognition</a></li>
    <li><a href="#" onclick="loadPage('graph.html');">Data Graph</a></li>
    <li><a href="#" onclick="loadPage('fileserver/');">File Server</a></li>
    <li><a>System <i class="arrow down"></i></a>
@@ -88,11 +104,11 @@
  LoadFwVersion();
  LoadWebUiVersion();

-  if (document.cookie == "" || document.cookie == "reboot_page.html") {
-    document.cookie = "overview.html";
+  if (getCookie("page") == "" || getCookie("page") == "reboot_page.html") {
+    document.cookie = "page=overview.html";
  }
-  console.log("Loading page: " + document.cookie);
-  document.getElementById('maincontent').src = document.cookie;
+  console.log("Loading page: " + getCookie("page"));
+  document.getElementById('maincontent').src = getCookie("page");
 </script>

 </div>
--- a/sd-card/html/ota_page.html
+++ b/sd-card/html/ota_page.html
@@ -210,7 +210,7 @@ function extract() {
                document.getElementById("status").innerText = "Status: Update completed!";
                document.getElementById("doUpdate").disabled = true;
                document.getElementById("newfile").disabled = false;
-                document.cookie = "overview.html"; // Make sure after the reboot we go to the overview page
+                document.cookie = "page=overview.html"; // Make sure after the reboot we go to the overview page

                if (xhttp.responseText.startsWith("reboot"))
                {
--- a/sd-card/html/overview.html
+++ b/sd-card/html/overview.html
@@ -151,7 +151,7 @@ function refresh() {
 	}
 		
 	function loadValue(_type, _div, _style) {
-		url = basepath + '/wasserzaehler.html?all=true&type=' + _type;     
+		url = basepath + '/value?all=true&type=' + _type;     
 		var xhttp = new XMLHttpRequest();
 		xhttp.onreadystatechange = function() {
 			if (this.readyState == 4 && this.status == 200) {
--- a/sd-card/html/test.html
+++ b/sd-card/html/test.html
@@ -16,7 +16,7 @@
 	var basepath = "http://192.168.178.22"; 
 	function testinit(){
 		basepath = getbasepath();
-		url = basepath + '/wasserzaehler.html?all=true';     
+		url = basepath + '/value?all=true';     
 		var xhttp = new XMLHttpRequest();
 		xhttp.onreadystatechange = function() {
 			if (this.readyState == 4 && this.status == 200) {
Author	SHA1	Message	Date
jomjol	e23c89ae57	Update Changelog.md	2022-12-06 20:32:48 +01:00
Ralf Rachinger	53a764abc8	Don't autofail if NTP server can't be reached during initalization (#1498 ) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization.	2022-12-06 07:00:43 +01:00
CaCO3	4f07c88769	Fix cookie usage, use correct http response codes, add 404 page (#1495 ) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch>	2022-12-06 06:53:05 +01:00
CaCO3	fa406d8989	replace calls to /wasserzaehler.html with calls to /value (#1469 ) Co-authored-by: CaCO3 <caco@ruinelli.ch>	2022-12-06 06:52:25 +01:00
parhedberg	1ca54f39f8	Using named cookies to get a correct redirect (#1492 ) * Using named cookies * Prevent from deleting wlan.ini file * Missed " * Revert "Prevent from deleting wlan.ini file" This reverts commit `901b6998b6`. Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se>	2022-12-05 20:43:06 +01:00
CaCO3	5867e90f69	Extend mqtt json (#1489 ) * add whitespaces in JSON in MQTT * re-added pre-value Co-authored-by: CaCO3 <caco@ruinelli.ch>	2022-12-05 18:44:43 +01:00
CaCO3	e87b91f6eb	MQTT improvements (#1487 ) * removed no longer used code * updated logs * increased heap memory. this most likely was the reason that the MQTT init failed, see https://github.com/jomjol/AI-on-the-edge-device/issues/1455#issuecomment-1336450501 Co-authored-by: CaCO3 <caco@ruinelli.ch>	2022-12-05 06:55:08 +01:00
CaCO3	4b52e61755	De-init camera on startup. This solves init errors in cause it was already initialized in a prevous run (#1486 ) Co-authored-by: CaCO3 <caco@ruinelli.ch>	2022-12-05 06:53:48 +01:00
github-actions	eb48212630	Update Changelog.md for release	2022-12-04 14:58:57 +00:00