From 886cd4ffa510984cc1e38702cb16ac8d6b1b2de0 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Fri, 24 Feb 2023 20:22:04 +0100 Subject: [PATCH] Master (#2073) * Replace deprecated actions (#2016) * Update build.yaml * Update build.yaml * Update manual-update-webinstaller.yml * Update manual-update-webinstaller.yml * Update manual-update-webinstaller.yml * Update manual-update-webinstaller.yml * Update build.yaml * preparations for v15.0 (#2063) * Migrated parameters, see https://github.com/jomjol/AI-on-the-edge-device/pull/2023 * remove no longer used "topic" parameter. This is a backport from https://github.com/jomjol/AI-on-the-edge-device/commit/b21e3c6c9d56555457e632bac9c5880e78c78eaf * Fix wrong url-encoding, see https://github.com/jomjol/AI-on-the-edge-device/issues/2036 resp. https://github.com/jomjol/AI-on-the-edge-device/issues/2036 * Threashold -> Threshold * updated changelog --------- Co-authored-by: CaCO3 * DataLogActive is true by default * updated changelog --------- Co-authored-by: CaCO3 --- .github/workflows/build.yaml | 4 +- .../workflows/manual-update-webinstaller.yml | 2 +- Changelog.md | 39 +++++++++++++++---- code/components/jomjol_helper/Helper.cpp | 6 +-- code/components/jomjol_helper/Helper.h | 1 - sd-card/html/edit_config_param.html | 14 +++---- sd-card/html/readconfigparam.js | 2 +- sd-card/html/wlan_config.html | 2 +- 8 files changed, 45 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c48406bd..ca94eef3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -333,7 +333,7 @@ jobs: # extract the version used in next step - id: get_version if: startsWith(github.ref, 'refs/tags/') - uses: battila7/get-version-action@v2 + uses: Simply007/get-version-action@v2 # # the changelog [unreleased] will now be changed to the release version # - name: Update changelog @@ -400,7 +400,7 @@ jobs: - name: Get version of last release id: last_release - uses: InsonusK/get-latest-release@v1.0.1 + uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321 with: myToken: ${{ github.token }} exclude_types: "draft|prerelease" diff --git a/.github/workflows/manual-update-webinstaller.yml b/.github/workflows/manual-update-webinstaller.yml index 7c36cdc0..a5956baf 100644 --- a/.github/workflows/manual-update-webinstaller.yml +++ b/.github/workflows/manual-update-webinstaller.yml @@ -32,7 +32,7 @@ jobs: - name: Get version of last release id: last_release - uses: InsonusK/get-latest-release@v1.0.1 + uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321 with: myToken: ${{ github.token }} exclude_types: "draft|prerelease" diff --git a/Changelog.md b/Changelog.md index 076f71bc..e4140754 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,3 @@ - ## [Unreleased] **Rolling** @@ -18,20 +17,44 @@ #### Fixed -- [2036](https://github.com/jomjol/AI-on-the-edge-device/issues/2036) Initial AP-Mode now decodes the parameters correctly +- #### Removed - n.a. -## [14.1.0] - 2023-02-21 +## [15.0.1] - 2023-02-23 -This release only migrates some parameters, see https://github.com/jomjol/AI-on-the-edge-device/pull/2023. +**Parameter Migration** -It does not change any functionality of the device! +### Update Procedure + +Update Procedure see [online documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/Installation/#update-ota-over-the-air) + +### Changes + +This release only migrates some parameters, see #2023 for details and a list of all parameter changes. +The parameter migration happens automatically on the next startup. No user interaction is required. +A backup of the config is stored on the SD-card as `config.bak`. + +Beside of the parameter change and the bugfix listed below, no changes are contained in this release! + +If you want to revert back to `v14` or earlier, you will have to revert the migration changes in `config.ini` manually! + +#### Added + +- n.a. + +#### Changed + +- [#2023](https://github.com/jomjol/AI-on-the-edge-device/pull/2023) Migrated Parameters +- Removed old `Topic` parameter, it is not used anymore + +#### Fixed + +- [2036](https://github.com/jomjol/AI-on-the-edge-device/issues/2036) Fix wrong url-encoding -If you want to revert from a future release to an older one, this is the first release using the new parameter naming. If you want to go to an older release than this `v14.1.0`, you have to update the `config.ini` manually to the old namings! ## [14.0.3] -2023-02-05 @@ -838,8 +861,8 @@ External Illumination - Initial Version -[14.1.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v14.0.3...v14.1.0 -[14.0.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/v13.0.8...v14.0.2 +[15.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v14.0.3...v15.0.1 +[14.0.3]: https://github.com/jomjol/AI-on-the-edge-device/compare/v13.0.8...v14.0.3 [13.0.8]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.8 [13.0.7]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.7 [13.0.5]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.5 diff --git a/code/components/jomjol_helper/Helper.cpp b/code/components/jomjol_helper/Helper.cpp index 4dce5e6b..b6151b2a 100644 --- a/code/components/jomjol_helper/Helper.cpp +++ b/code/components/jomjol_helper/Helper.cpp @@ -939,11 +939,11 @@ std::string UrlDecode(const std::string& value) { std::string result; result.reserve(value.size()); - + for (std::size_t i = 0; i < value.size(); ++i) { auto ch = value[i]; - + if (ch == '%' && (i + 2) < value.size()) { auto hex = value.substr(i + 1, 2); @@ -960,6 +960,6 @@ std::string UrlDecode(const std::string& value) result.push_back(ch); } } - + return result; } diff --git a/code/components/jomjol_helper/Helper.h b/code/components/jomjol_helper/Helper.h index 6aac032f..edb161fb 100644 --- a/code/components/jomjol_helper/Helper.h +++ b/code/components/jomjol_helper/Helper.h @@ -93,7 +93,6 @@ std::string getFormatedUptime(bool compact); const char* get404(void); - std::string UrlDecode(const std::string& value); #endif //HELPER_H diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index acfb5b06..8d1e97e9 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -721,6 +721,9 @@ textarea { $TOOLTIP_InfluxDB_password + + +

@@ -1415,11 +1418,6 @@ function InitIndivParameter() _indexInflux.remove(0); for (var i = 0; i < NUMBERS.length; ++i){ - var option = document.createElement("option"); - option.text = NUMBERS[i]["name"]; - option.value = i; - _index.add(option); - var optionInflux = document.createElement("option"); optionInflux.text = NUMBERS[i]["name"]; optionInflux.value = i; @@ -1724,11 +1722,11 @@ function UpdateInputIndividual(sel) ReadParameter(param, "PostProcessing", "DecimalShift", true, NUNBERSAkt) ReadParameter(param, "PostProcessing", "AnalogDigitalTransitionStart", true, NUNBERSAkt) ReadParameter(param, "PostProcessing", "MaxRateValue", true, NUNBERSAkt) - ReadParameter(param, "PostProcessing", "MaxRateType", true, NUNBERSAkt) + ReadParameter(param, "PostProcessing", "MaxRateType", true, NUNBERSAkt) ReadParameter(param, "PostProcessing", "ExtendedResolution", false, NUNBERSAkt) ReadParameter(param, "PostProcessing", "IgnoreLeadingNaN", false, NUNBERSAkt) ReadParameter(param, "PostProcessing", "AllowNegativeRates", false, NUNBERSAkt) - ReadParameter(param, "InfluxDBv2", "Fieldname", true, NUNBERSAkt) + ReadParameter(param, "InfluxDBv2", "Fieldname", true, NUNBERSAkt) } // var sel = document.getElementById("Numbers_value1"); @@ -1906,7 +1904,7 @@ function ReadParameterAll() ReadParameter(param, "Analog", "ROIImagesLocation", true); ReadParameter(param, "Analog", "ROIImagesRetention", true); - ReadParameter(param, "PostProcessing", "PreValueUse", false); + ReadParameter(param, "PostProcessing", "PreValueUse", false); ReadParameter(param, "PostProcessing", "PreValueAgeStartup", true); ReadParameter(param, "PostProcessing", "ErrorMessage", false); ReadParameter(param, "PostProcessing", "CheckDigitIncreaseConsistency", false); diff --git a/sd-card/html/readconfigparam.js b/sd-card/html/readconfigparam.js index fddc0f06..34c1b056 100644 --- a/sd-card/html/readconfigparam.js +++ b/sd-card/html/readconfigparam.js @@ -194,7 +194,7 @@ function ParseConfig() { ParamAddValue(param, catname, "Measurement"); ParamAddValue(param, catname, "user"); ParamAddValue(param, catname, "password"); - + var catname = "InfluxDBv2"; category[catname] = new Object(); category[catname]["enabled"] = false; diff --git a/sd-card/html/wlan_config.html b/sd-card/html/wlan_config.html index dc63afcf..f49828ae 100644 --- a/sd-card/html/wlan_config.html +++ b/sd-card/html/wlan_config.html @@ -13,7 +13,7 @@ gatewayLeave emtpy if set by router netmaskLeave emtpy if set by router DNSLeave emtpy if set by router -RSSI ThreasholdWLAN Mesh Parameter: Threashold for RSSI value to check for start switching access point in a mesh system.Possible values: -100 to 0, 0 = disabled - Value will be transfered to wlan.ini at next startup) +RSSI ThresholdWLAN Mesh Parameter: Threashold for RSSI value to check for start switching access point in a mesh system.Possible values: -100 to 0, 0 = disabled - Value will be transfered to wlan.ini at next startup)