Skip to content

Commit dfe2c46

Browse files
committed
Merge branch 'rolling'
2 parents 6e24b6f + bb92453 commit dfe2c46

File tree

3 files changed

+60
-73
lines changed

3 files changed

+60
-73
lines changed

Changelog.md

Lines changed: 60 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -2,119 +2,108 @@
22

33
## [Unreleased]
44

5-
## [12.0.0] - 2022-09-29
6-
7-
Improve **u**ser e**x**perience
5+
Improve **u**ser e**x**perience
86

97
:bangbang: The release breaks a few things in ota update :bangbang:
108

119
**Make sure to read the instructions below carfully!**.
1210

13-
1. Backup your configuration (use the `System > Backup/Restore` page)!
14-
2. You should update to `11.3.1` before you update to this release. All other migrations are not tested.
11+
1. Backup your configuration (use the `System > Backup/Restore` page)!
12+
2. You should update to `11.3.1` before you update to this release. All other migrations are not tested.
1513
Rolling newer than `11.3.1` can also be used, but no guaranty.
16-
3. Upload and update the `firmware.bin` file from this release. **but do not reboot**
17-
4. Upload the `html-from-11.3.1.zip` in html upload and update the web interface.
18-
5. Now you can reboot.
14+
3. Upload and update the `firmware.bin` file from this release. **but do not reboot**
15+
4. Upload the `html-from-11.3.1.zip` in html upload and update the web interface.
16+
5. Now you can reboot.
1917

2018
If anything bricks you can try to
21-
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.
22-
1\. Use the initial_esp32_setup.zip ( <https://github.com/jomjol/AI-on-the-edge-device/wiki/Installation> ) as alternative.
19+
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.
20+
1. Use the initial_esp32_setup.zip ( <https://github.com/jomjol/AI-on-the-edge-device/wiki/Installation> ) as alternative.
2321

2422
### Added
2523

26-
- Automatic release creation
27-
- Newest firmware of rolling branch now automatically build and provided in [Github Actions Output](https://github.com/jomjol/AI-on-the-edge-device/actions) (developers only)
28-
- [#1068](https://github.com/jomjol/AI-on-the-edge-device/issues/1068) New update mechanism:
29-
- Handling of all files (`zip`, `tfl`, `tflite`, `bin`) within in one common update interface
30-
- Using the `update.zip` from the [Release page](https://github.com/jomjol/AI-on-the-edge-device/releases)
31-
- Status (`upload`, `processing`, ...) displayed on Web Interface
32-
- Automatical detection and suggestion for reboot where needed (Web Interface uupdates only need a page refresh)
33-
- :bangbang: Best for OTA use Firefox. Chrome works with warnings. Safari stuck in upload.
24+
- Automatic release creation
25+
- Newest firmware of rolling branch now automatically build and provided in [Github Actions Output](https://github.com/jomjol/AI-on-the-edge-device/actions) (developers only)
26+
- [\#1068](https://github.com/jomjol/AI-on-the-edge-device/issues/1068) New update mechanism:
27+
- Handling of all files (`zip`, `tfl`, `tflite`, `bin`) within in one common update interface
28+
- Using the `update.zip` from the [Release page](https://github.com/jomjol/AI-on-the-edge-device/releases)
29+
- Status (`upload`, `processing`, ...) displayed on Web Interface
30+
- Automatical detection and suggestion for reboot where needed (Web Interface uupdates only need a page refresh)
31+
- :bangbang: Best for OTA use Firefox. Chrome works with warnings. Safari stuck in upload.
3432

3533
### Changed
36-
37-
- Integrated version info better shown on the Info page and in the log
38-
- Updated menu
39-
- Update used libraries (`tflite`, `esp32-cam`, `esp-nn`, as of 20220924)
40-
34+
- Integrated version info better shown on the Info page and in the log
35+
- Updated menu
36+
- Update used libraries (`tflite`, `esp32-cam`, `esp-nn`, as of 20220924)
4137
### Fixed
4238

43-
- [#1092](https://github.com/jomjol/AI-on-the-edge-device/issues/1092) censor passwords in log outputs
44-
- [#1029](https://github.com/jomjol/AI-on-the-edge-device/issues/1029) wrong change of `checkDigitConsistency` now working like releases before `11.3.1`
45-
- Spelling corrections (**[cristianmitran](https://github.com/cristianmitran)**)
39+
- [\#1092](https://github.com/jomjol/AI-on-the-edge-device/issues/1092) censor passwords in log outputs
40+
- [\#1029](https://github.com/jomjol/AI-on-the-edge-device/issues/1029) wrong change of `checkDigitConsistency` now working like releases before `11.3.1`
41+
- Spelling corrections (**[cristianmitran](https://github.com/cristianmitran)**)
4642

47-
### Removed
4843

49-
- Remove the folder `/firmware` from GitHub repository.
50-
If you want to get the latest `firmware.bin` and `html.zip` files, please download from the automated [build action](https://github.com/jomjol/AI-on-the-edge-device/actions) or [release page](https://github.com/jomjol/AI-on-the-edge-device/releases)
44+
### Removed
45+
- Remove the folder `/firmware` from GitHub repository.
46+
If you want to get the latest `firmware.bin` and `html.zip` files, please download from the automated [build action](https://github.com/jomjol/AI-on-the-edge-device/actions) or [release page](https://github.com/jomjol/AI-on-the-edge-device/releases)
5147

5248
## [11.3.1] - (2022-09-17)
53-
5449
Intermediate Digits
5550

56-
- **ATTENTION**:
57-
58-
- first update the `firmware.bin` and ensure that the new version is running
51+
- **ATTENTION**:
52+
- first update the `firmware.bin` and ensure that the new version is running
5953

60-
- Only afterwards update the `html.zip`
54+
- Only afterwards update the `html.zip`
55+
56+
- Otherwise the downwards compatibility of the new counter clockwise feature is not given and you end in a reboot loop, that needs manual flashing!
57+
6158

62-
- Otherwise the downwards compatibility of the new counter clockwise feature is not given and you end in a reboot loop, that needs manual flashing!
6359

64-
65-
- **NEW v11.3.1**: corrected corrupted asset `firmware.bin`
66-
- Increased precision (more than 6-7 digits)
67-
- Implements Counter Clockwise Analog Pointers
68-
- Improved post processing algorithm
69-
- Debugging: intensive use of testcases
70-
- MQTT: improved handling, extended logging, automated reconnect
71-
- HTML: Backup Option for Configuration
72-
- HTML: Improved Reboot
73-
- HTML: Update WebUI (Reboot, Infos, CPU Temp, RSSI)
74-
- This version is largely also based on the work of **[caco3](https://github.com/caco3)**, **[adellafave](https://github.com/adellafave)**, **[haverland](https://github.com/haverland)**, **[stefanbode](https://github.com/stefanbode)**, **[PLCHome](https://github.com/PLCHome)**
60+
- **NEW v11.3.1**: corrected corrupted asset `firmware.bin`
61+
- Increased precision (more than 6-7 digits)
62+
- Implements Counter Clockwise Analog Pointers
63+
- Improved post processing algorithm
64+
- Debugging: intensive use of testcases
65+
- MQTT: improved handling, extended logging, automated reconnect
66+
- HTML: Backup Option for Configuration
67+
- HTML: Improved Reboot
68+
- HTML: Update WebUI (Reboot, Infos, CPU Temp, RSSI)
69+
- This version is largely also based on the work of **[caco3](https://github.com/caco3)**, **[adellafave](https://github.com/adellafave)**, **[haverland](https://github.com/haverland)**, **[stefanbode](https://github.com/stefanbode)**, **[PLCHome](https://github.com/PLCHome)**
7570

7671
## [11.2.0] - (2022-08-28)
77-
7872
Intermediate Digits
7973

80-
- Updated Tensorflow / TFlite to newest tflite (version as of 2022-07-27)
74+
- Updated Tensorflow / TFlite to newest tflite (version as of 2022-07-27)
75+
- Updated analog neural network file (`ana-cont_11.3.0_s2.tflite` - default, `ana-class100_0120_s1_q.tflite`)
76+
- Updated digital neural network file (`dig-cont_0570_s3.tflite` - default, `dig-class100_0120_s2_q.tflite`)
8177

82-
- Updated analog neural network file (`ana-cont_11.3.0_s2.tflite` - default, `ana-class100_0120_s1_q.tflite`)
83-
84-
- Updated digital neural network file (`dig-cont_0570_s3.tflite` - default, `dig-class100_0120_s2_q.tflite`)
85-
86-
- Added automated filtering of tflite-file in the graphical configuration (thanks to @**[caco3](https://github.com/caco3)**)
87-
88-
- Updated consistency algorithm & test cases
89-
90-
- HTML: added favicon and system name, Improved reboot dialog (thanks to @**[caco3](https://github.com/caco3)**)
78+
- Added automated filtering of tflite-file in the graphical configuration (thanks to @**[caco3](https://github.com/caco3)**)
79+
- Updated consistency algorithm & test cases
80+
- HTML: added favicon and system name, Improved reboot dialog (thanks to @**[caco3](https://github.com/caco3)**)
9181

9282
## [11.1.1] - (2022-08-22)
93-
9483
Intermediate Digits
9584

96-
- New and improved consistency check (especially with analog and digital counters mixed)
97-
- Bug Fix: digital counter algorithm
85+
- New and improved consistency check (especially with analog and digital counters mixed)
86+
- Bug Fix: digital counter algorithm
9887

9988
## [11.0.1] - (2022-08-18)
100-
10189
Intermediate Digits
10290

103-
- **NEW v11.0.1**: Bug Fix InfluxDB configuration (only update of html.zip necessary)
91+
- **NEW v11.0.1**: Bug Fix InfluxDB configuration (only update of html.zip necessary)
10492

105-
- Implementation of new CNN types to detect intermediate values of digits with rolling numbers
93+
- Implementation of new CNN types to detect intermediate values of digits with rolling numbers
10694

107-
- By default the old algo (0, 1, ..., 9, "N") is active (due to the limited types of digits trained so far)
108-
- Activation can be done by selection a tflite file with the new trained model in the 'config.ini'
109-
- **Details can be found in the [wiki](https://github.com/jomjol/AI-on-the-edge-device/wiki/Neural-Network-Types)** (different types, trained image types, naming convention)
95+
- By default the old algo (0, 1, ..., 9, "N") is active (due to the limited types of digits trained so far)
96+
- Activation can be done by selection a tflite file with the new trained model in the 'config.ini'
97+
- **Details can be found in the [wiki](https://github.com/jomjol/AI-on-the-edge-device/wiki/Neural-Network-Types)** (different types, trained image types, naming convention)
11098

111-
- Updated neural network files (and adaption to new naming convention)
99+
- Updated neural network files (and adaption to new naming convention)
112100

113-
- Published a tool to download and combine log files - **Thanks to **
101+
- Published a tool to download and combine log files - **Thanks to **
114102

115-
- Files see ['/tools/logfile-tool'](tbd), How-to see [wiki](https://github.com/jomjol/AI-on-the-edge-device/wiki/Gasmeter-Log-Downloader)
103+
- Files see ['/tools/logfile-tool'](tbd), How-to see [wiki](https://github.com/jomjol/AI-on-the-edge-device/wiki/Gasmeter-Log-Downloader)
104+
105+
- Bug Fix: InfluxDB enabling in grahic configuration
116106

117-
- Bug Fix: InfluxDB enabling in grahic configuration
118107

119108
## [10.6.2] - (2022-07-24)
120109

@@ -671,9 +660,7 @@ External Illumination
671660

672661
- Initial Version
673662

674-
[Unreleased]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.0...HEAD
675-
676-
[12.0.0]: https://github.com/jomjol/AI-on-the-edge-device/compare/11.3.1...12.0.0
663+
[Unreleased]: https://github.com/haverland/AI-on-the-edge-device/compare/11.4.3...HEAD
677664

678665
[11.4.3]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.4.3
679666

-94.7 KB
Binary file not shown.
348 KB
Binary file not shown.

0 commit comments

Comments
 (0)