Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #2073

Merged
merged 5 commits into from
Feb 24, 2023
Merged

Master #2073

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,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
Expand Down Expand Up @@ -391,7 +391,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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-update-webinstaller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
39 changes: 31 additions & 8 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

## [Unreleased]

**Rolling**
Expand All @@ -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

**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

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/components/jomjol_helper/Helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -960,6 +960,6 @@ std::string UrlDecode(const std::string& value)
result.push_back(ch);
}
}

return result;
}
1 change: 0 additions & 1 deletion code/components/jomjol_helper/Helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ std::string getFormatedUptime(bool compact);

const char* get404(void);


std::string UrlDecode(const std::string& value);

#endif //HELPER_H
14 changes: 6 additions & 8 deletions sd-card/html/edit_config_param.html
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,9 @@ <h4>
</td>
</tr>




<tr>
<td colspan="3" style="padding-left: 20px;">
<h4>
Expand Down Expand Up @@ -1596,11 +1599,6 @@ <h5>Enabling GPIO handler, disable by default integrated flash light.<br>Please
_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;
Expand Down Expand Up @@ -1905,11 +1903,11 @@ <h5>Enabling GPIO handler, disable by default integrated flash light.<br>Please
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");
Expand Down Expand Up @@ -2087,7 +2085,7 @@ <h5>Enabling GPIO handler, disable by default integrated flash light.<br>Please
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);
Expand Down
2 changes: 1 addition & 1 deletion sd-card/html/readconfigparam.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sd-card/html/wlan_config.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>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><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>
<button class="button" type="button" onclick="wr()">Write wlan.ini</button>
<input id="newfile" type="file">
Expand Down