From 0d48c526b8f1c408d489200c1bf1c42af8e07785 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Sun, 18 Dec 2022 11:19:37 +0100 Subject: [PATCH] Preparations for next Bugfix Release (#1615) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Merge branch 'rolling' (#1559) * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit 4f51ec79620734cac44c02025ded4a8171016814. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commit f68695a4c0bda6a7ee563511040c0c89f1fed0c6, reversing changes made to a096cf718223ca13b781fbf570e5fcbfb5689049. * Revert "test" This reverts commit a096cf718223ca13b781fbf570e5fcbfb5689049. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 * 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 * 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. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit 4f51ec79620734cac44c02025ded4a8171016814. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commit f68695a4c0bda6a7ee563511040c0c89f1fed0c6, reversing changes made to a096cf718223ca13b781fbf570e5fcbfb5689049. * Revert "test" This reverts commit a096cf718223ca13b781fbf570e5fcbfb5689049. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 Co-authored-by: Ralf Rachinger Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions Co-authored-by: parhedberg Co-authored-by: Pär Hedberg Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg Co-authored-by: Pär Hedberg Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 Co-authored-by: Frank Haverland Co-authored-by: github-actions Co-authored-by: Ralf Rachinger Co-authored-by: Nicolas Liaudat * Update Changelog.md for release Co-authored-by: parhedberg Co-authored-by: Pär Hedberg Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 Co-authored-by: Frank Haverland Co-authored-by: github-actions Co-authored-by: Ralf Rachinger Co-authored-by: Nicolas Liaudat --- Changelog.md | 16 ++++++++-------- .../ClassFlowPostProcessing.cpp | 1 + code/components/jomjol_mqtt/interface_mqtt.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2d9b53aee..98c65bfb4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,6 @@ ## [Unreleased] - ## [13.0.7] 2022-12-11 **Home Assistant MQTT Discovery Support** @@ -32,11 +31,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:///ota?task=update&file=` to enforce the extraction/flashing. + 1. Make sure the last run of the update completed the **Uploading** step. + 1. Call `http:///ota?task=update&file=` to enforce the extraction/flashing. **Initial Setup:** - 1\. Use the initial_esp32_setup.zip ( ) as alternative to have a clean install. + 1. Use the initial_esp32_setup.zip ( ) as alternative to have a clean install. ### Added @@ -97,7 +96,6 @@ If anything breaks you can try to enforce manual update as following: - **NEW Rolling**: - Fix Rate Problem ([#1578](https://github.com/jomjol/AI-on-the-edge-device/issues/1578), [#1572](https://github.com/jomjol/AI-on-the-edge-device/issues/1572)) - ### Removed - n.a. @@ -118,8 +116,8 @@ Improve **u**ser e**x**perience 5. Now you can reboot. If anything breaks you can try to -1\. Call `http:///ota?task=update&file=firmware.bin` resp. `http:///ota?task=update&file=html.zip` if the upload successed but the extraction failed. -1\. Use the initial_esp32_setup.zip ( ) as alternative. +1. Call `http:///ota?task=update&file=firmware.bin` resp. `http:///ota?task=update&file=html.zip` if the upload successed but the extraction failed. +1. Use the initial_esp32_setup.zip ( ) as alternative. ### Added @@ -771,7 +769,9 @@ External Illumination - Initial Version -[Unreleased]: https://github.com/jomjol/AI-on-the-edge-device/compare/13.0.5...HEAD +[Unreleased]: https://github.com/jomjol/AI-on-the-edge-device/compare/13.0.7...HEAD + +[13.0.7]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.7 [13.0.5]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.5 diff --git a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp index e0a7a53c9..6bc1f0104 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp @@ -859,6 +859,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText; LogFile.WriteToFile(ESP_LOG_INFO, TAG, _zw); + WriteDataLog(j); continue; } } diff --git a/code/components/jomjol_mqtt/interface_mqtt.h b/code/components/jomjol_mqtt/interface_mqtt.h index f93f182c8..23f678926 100644 --- a/code/components/jomjol_mqtt/interface_mqtt.h +++ b/code/components/jomjol_mqtt/interface_mqtt.h @@ -23,5 +23,6 @@ void MQTTregisterSubscribeFunction(std::string topic, std::function