소스 검색

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 <caco@ruinelli.ch>

* DataLogActive is true by default

* updated changelog

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>
CaCO3 2 년 전
부모
커밋
886cd4ffa5

+ 2 - 2
.github/workflows/build.yaml

@@ -333,7 +333,7 @@ jobs:
     # extract the version used in next step
     # extract the version used in next step
     - id: get_version
     - id: get_version
       if: startsWith(github.ref, 'refs/tags/') 
       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
 #    # the changelog [unreleased] will now be changed to the release version
 #    - name: Update changelog
 #    - name: Update changelog
@@ -400,7 +400,7 @@ jobs:
       
       
     - name: Get version of last release
     - name: Get version of last release
       id: last_release
       id: last_release
-      uses: InsonusK/get-latest-release@v1.0.1
+      uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
       with:
       with:
         myToken: ${{ github.token }}
         myToken: ${{ github.token }}
         exclude_types: "draft|prerelease"
         exclude_types: "draft|prerelease"

+ 1 - 1
.github/workflows/manual-update-webinstaller.yml

@@ -32,7 +32,7 @@ jobs:
       
       
     - name: Get version of last release
     - name: Get version of last release
       id: last_release
       id: last_release
-      uses: InsonusK/get-latest-release@v1.0.1
+      uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
       with:
       with:
         myToken: ${{ github.token }}
         myToken: ${{ github.token }}
         exclude_types: "draft|prerelease"
         exclude_types: "draft|prerelease"

+ 31 - 8
Changelog.md

@@ -1,4 +1,3 @@
-
 ## [Unreleased]
 ## [Unreleased]
 
 
 **Rolling**
 **Rolling**
@@ -18,20 +17,44 @@
 
 
 #### Fixed
 #### Fixed
 
 
--   [2036](https://github.com/jomjol/AI-on-the-edge-device/issues/2036) Initial AP-Mode now decodes the parameters correctly
+-   
 
 
 #### Removed
 #### Removed
 
 
 -   n.a.
 -   n.a.
 
 
 
 
-## [14.1.0] - 2023-02-21
+## [15.0.1] - 2023-02-23
+
+**Parameter Migration**
+
+### 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!
 
 
-This release only migrates some parameters, see https://github.com/jomjol/AI-on-the-edge-device/pull/2023.
+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
 
 
-It does not change any functionality of the device!
+-   [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
 ## [14.0.3] -2023-02-05
 
 
@@ -838,8 +861,8 @@ External Illumination
 -   Initial Version
 -   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.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.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
 [13.0.5]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.5

+ 3 - 3
code/components/jomjol_helper/Helper.cpp

@@ -939,11 +939,11 @@ std::string UrlDecode(const std::string& value)
 {
 {
     std::string result;
     std::string result;
     result.reserve(value.size());
     result.reserve(value.size());
-    
+
     for (std::size_t i = 0; i < value.size(); ++i)
     for (std::size_t i = 0; i < value.size(); ++i)
     {
     {
         auto ch = value[i];
         auto ch = value[i];
-        
+
         if (ch == '%' && (i + 2) < value.size())
         if (ch == '%' && (i + 2) < value.size())
         {
         {
             auto hex = value.substr(i + 1, 2);
             auto hex = value.substr(i + 1, 2);
@@ -960,6 +960,6 @@ std::string UrlDecode(const std::string& value)
             result.push_back(ch);
             result.push_back(ch);
         }
         }
     }
     }
-    
+
     return result;
     return result;
 }
 }

+ 0 - 1
code/components/jomjol_helper/Helper.h

@@ -93,7 +93,6 @@ std::string getFormatedUptime(bool compact);
 
 
 const char* get404(void);
 const char* get404(void);
 
 
-
 std::string UrlDecode(const std::string& value);
 std::string UrlDecode(const std::string& value);
 
 
 #endif //HELPER_H
 #endif //HELPER_H

+ 6 - 8
sd-card/html/edit_config_param.html

@@ -721,6 +721,9 @@ textarea {
 			<td>$TOOLTIP_InfluxDB_password</td>
 			<td>$TOOLTIP_InfluxDB_password</td>
 		</tr>
 		</tr>
 
 
+
+
+
 		<tr>
 		<tr>
 			<td colspan="3" style="padding-left: 20px;">
 			<td colspan="3" style="padding-left: 20px;">
 			    <h4>
 			    <h4>
@@ -1415,11 +1418,6 @@ function InitIndivParameter()
 		_indexInflux.remove(0);
 		_indexInflux.remove(0);
 
 
     for (var i = 0; i < NUMBERS.length; ++i){
     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");
 		var optionInflux = document.createElement("option");
         optionInflux.text = NUMBERS[i]["name"];
         optionInflux.text = NUMBERS[i]["name"];
         optionInflux.value = i;
         optionInflux.value = i;
@@ -1724,11 +1722,11 @@ function UpdateInputIndividual(sel)
 		ReadParameter(param, "PostProcessing", "DecimalShift", true, NUNBERSAkt)		
 		ReadParameter(param, "PostProcessing", "DecimalShift", true, NUNBERSAkt)		
 		ReadParameter(param, "PostProcessing", "AnalogDigitalTransitionStart", true, NUNBERSAkt)		
 		ReadParameter(param, "PostProcessing", "AnalogDigitalTransitionStart", true, NUNBERSAkt)		
 		ReadParameter(param, "PostProcessing", "MaxRateValue", 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", "ExtendedResolution", false, NUNBERSAkt)		
 		ReadParameter(param, "PostProcessing", "IgnoreLeadingNaN", false, NUNBERSAkt)		
 		ReadParameter(param, "PostProcessing", "IgnoreLeadingNaN", false, NUNBERSAkt)		
 		ReadParameter(param, "PostProcessing", "AllowNegativeRates", 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");
 //	var sel = document.getElementById("Numbers_value1");
@@ -1906,7 +1904,7 @@ function ReadParameterAll()
 	ReadParameter(param, "Analog", "ROIImagesLocation", true);		
 	ReadParameter(param, "Analog", "ROIImagesLocation", true);		
 	ReadParameter(param, "Analog", "ROIImagesRetention", true);		
 	ReadParameter(param, "Analog", "ROIImagesRetention", true);		
 
 
-	ReadParameter(param, "PostProcessing", "PreValueUse", false);		
+	ReadParameter(param, "PostProcessing", "PreValueUse", false);
 	ReadParameter(param, "PostProcessing", "PreValueAgeStartup", true);
 	ReadParameter(param, "PostProcessing", "PreValueAgeStartup", true);
 	ReadParameter(param, "PostProcessing", "ErrorMessage", false);
 	ReadParameter(param, "PostProcessing", "ErrorMessage", false);
 	ReadParameter(param, "PostProcessing", "CheckDigitIncreaseConsistency", false);
 	ReadParameter(param, "PostProcessing", "CheckDigitIncreaseConsistency", false);

+ 1 - 1
sd-card/html/readconfigparam.js

@@ -194,7 +194,7 @@ function ParseConfig() {
      ParamAddValue(param, catname, "Measurement");
      ParamAddValue(param, catname, "Measurement");
      ParamAddValue(param, catname, "user");
      ParamAddValue(param, catname, "user");
      ParamAddValue(param, catname, "password");
      ParamAddValue(param, catname, "password");
-    
+
      var catname = "InfluxDBv2";
      var catname = "InfluxDBv2";
      category[catname] = new Object(); 
      category[catname] = new Object(); 
      category[catname]["enabled"] = false;
      category[catname]["enabled"] = false;

+ 1 - 1
sd-card/html/wlan_config.html

@@ -13,7 +13,7 @@
 <tr><td>gateway</td><td><input type="text" name="gateway" id="gateway"></td><td>Leave emtpy if set by router</td></tr>
 <tr><td>gateway</td><td><input type="text" name="gateway" id="gateway"></td><td>Leave emtpy if set by router</td></tr>
 <tr><td>netmask</td><td><input type="text" name="netmask" id="netmask"></td><td>Leave emtpy if set by router</td>
 <tr><td>netmask</td><td><input type="text" name="netmask" id="netmask"></td><td>Leave emtpy if set by router</td>
 </tr><tr><td>DNS</td><td><input type="text" name="dns" id="dns"></td><td>Leave emtpy if set by router</td></tr>
 </tr><tr><td>DNS</td><td><input type="text" name="dns" id="dns"></td><td>Leave emtpy if set by router</td></tr>
-<tr><td>RSSI Threashold</td><td><input type="number" name="name" id="threashold" min="-100"  max="0" step="1" value = "0"></td><td>WLAN 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)</td></tr>
+<tr><td>RSSI Threshold</td><td><input type="number" name="name" id="threshold" min="-100"  max="0" step="1" value = "0"></td><td>WLAN 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)</td></tr>
 </table>
 </table>
 <button class="button" type="button" onclick="wr()">Write wlan.ini</button>
 <button class="button" type="button" onclick="wr()">Write wlan.ini</button>
 <input id="newfile" type="file">
 <input id="newfile" type="file">