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

Renamed digital to digit #3219

Merged
merged 5 commits into from
Sep 29, 2024
Merged
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/label-commenter-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
labeled:
issue:
body: |
See [Digital Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
See [Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
If your type is not contained it can be added to our training material, see [here](https://jomjol.github.io/AI-on-the-edge-device-docs/collect-new-images/).
discussion:
body: |
See [Digital Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
See [Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
If your type is not contained it can be added to our training material, see [here](https://jomjol.github.io/AI-on-the-edge-device-docs/collect-new-images/).
50 changes: 25 additions & 25 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
- Add Firmware Version to MQTT

#### Bug Fixes
- Reverted "Implemented late analog / digital transition [#2778](https://github.com/jomjol/AI-on-the-edge-device/pull/2778) (introduced in `v15.5`) as is seems to cause issues for many users.
- Reverted "Implemented late analog / digit transition [#2778](https://github.com/jomjol/AI-on-the-edge-device/pull/2778) (introduced in `v15.5`) as is seems to cause issues for many users.


## [15.6.0] - 2024-02-09
Expand All @@ -42,7 +42,7 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/

- Update PlattformIO to v6.5.0, which means esp-idf to v5.1
- Enhance busy notification
- Implemented late analog / digital transition
- Implemented late analog / digit transition

#### Fixed

Expand Down Expand Up @@ -202,7 +202,7 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
:bangbang: **Attention:** Update your configuration!
- Hybrid CNN network to `dig-cont_0611_s3`
- Analog CNN network to `ana-cont-11.0.5` and `ana-clas100-1.5.7`
- Digital CNN network to `dig-class100-1.6.0`
- Digit CNN network to `dig-class100-1.6.0`
- Various Web interface Improvements/Enhancements:
- Restructured Menu (Needs cache clearing to be applied)
- Enhanced `Previous Value` page
Expand Down Expand Up @@ -338,7 +338,7 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
- Improved OTA Update mechanism (only working after installation for next update)
- Added data logging in `/log/data` - One day per file and each measurement is on one line
- Format: csv - comma separated
- Content: `time`, `name-of-number`, `raw-value`, `return-value`, `pre-value`, `change-rate`, `change-absolute`, `error-text`, `cnn-digital`, `cnn-analog`
- Content: `time`, `name-of-number`, `raw-value`, `return-value`, `pre-value`, `change-rate`, `change-absolute`, `error-text`, `cnn-digit`, `cnn-analog`
- Show graph of values direct in the user interface (thanks to [@rdmueller](https://github.com/rdmueller))

- Using new data logging (see above)
Expand All @@ -356,10 +356,10 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
- Updated OTA functionality (more robust, but not fully bullet prove yet)
- Updated Espressif library to `espressif32@v5.2.0`
- [#1176](https://github.com/jomjol/AI-on-the-edge-device/discussions/1176) accept minor negative values (-0.2) if extended resolution is enabled
- [#1143](https://github.com/jomjol/AI-on-the-edge-device/issues/1143) added config parameter `AnalogDigitalTransitionStart`. It can setup very early and very late digit transition starts.
- [#1143](https://github.com/jomjol/AI-on-the-edge-device/issues/1143) added config parameter `AnalogDigTransitionStart`. It can setup very early and very late digit transition starts.
- New version of `dig-class100` (v1.4.0): added images of heliowatt powermeter
- NEW v13.0.2: Update Tool "Logfile downloader and combiner" to handle the new csv file format.
- NEW v13.0.2: MQTT: Added MQTT topic `status` (Digitalization Status), Timezone to MQTT topic `timestamp`.#
- NEW v13.0.2: MQTT: Added MQTT topic `status` (Digitization Status), Timezone to MQTT topic `timestamp`.#
- NEW v13.0.2: Logging: Disable heap logs by default, cleanup
- NEW v13.0.7:
- log NTP server name
Expand Down Expand Up @@ -484,7 +484,7 @@ Intermediate Digits

- Updated analog neural network file (`ana-cont_11.3.0_s2.tflite` - default, `ana-class100_0120_s1_q.tflite`)

- Updated digital neural network file (`dig-cont_0570_s3.tflite` - default, `dig-class100_0120_s2_q.tflite`)
- Updated digit neural network file (`dig-cont_0570_s3.tflite` - default, `dig-class100_0120_s2_q.tflite`)

- Added automated filtering of tflite-file in the graphical configuration (thanks to @**[caco3](https://github.com/caco3)**)

Expand All @@ -496,8 +496,8 @@ Intermediate Digits

Intermediate Digits

- New and improved consistency check (especially with analog and digital counters mixed)
- Bug Fix: digital counter algorithm
- New and improved consistency check (especially with analog and digit counters mixed)
- Bug Fix: digit counter algorithm

## [11.0.1](https://github.com/jomjol/AI-on-the-edge-device/releases/tag/v11.0.1), 2022-08-18

Expand Down Expand Up @@ -537,7 +537,7 @@ Stability Increase

- `config.ini`: removal of modelsize (readout from tflite)

- Updated analog neural network file (`ana1000s2.tflite`) & digital neural network file (`dig1400s2q.tflite`)
- Updated analog neural network file (`ana1000s2.tflite`) & digit neural network file (`dig1400s2q.tflite`)

- TFMicro/Lite: Update (espressif Version 20220716)

Expand Down Expand Up @@ -573,7 +573,7 @@ Stability Increase
- In the future the new files will also be copied to the `firmware` directory of the repository
- Added Wifi RSSI to MQTT information
- Updated analog neural network file (`ana-s3-q-20220105.tflite`)
- Updated digital neural network file (`dig-s1-q-20220102.tflite`)
- Updated digit neural network file (`dig-s1-q-20220102.tflite`)
- Updated build environment to `Espressif 3.5.0`

## [10.3.0] - (2022-01-29)
Expand Down Expand Up @@ -639,7 +639,7 @@ Stability Increase

- Update analog neural network (ana-s3-q-20220105.tflite)

- Update digital neural network (dig-s1-q-20220102.tflite)
- Update digit neural network (dig-s1-q-20220102.tflite)

- Increased web-server buffers

Expand Down Expand Up @@ -676,7 +676,7 @@ External Illumination
- Direct JSON access: `http://IP-ADRESS/json`
- Error message in log file in case camera error during startup
- Upgrade analog CNN to v9.1.0
- Upgrade digital CNN to v13.3.0 (added new images)
- Upgrade digit CNN to v13.3.0 (added new images)
- html: support of different ports

## [9.1.1] - External Illumination (2021-11-16)
Expand All @@ -701,7 +701,7 @@ External Illumination

### Changed

- Upgrade digital CNN to v13.1.0 (added new images)
- Upgrade digit CNN to v13.1.0 (added new images)
- bug fix: wlan password with space, double digit output

## [8.4.0] - Multi Meter Support (2021-09-25)
Expand Down Expand Up @@ -731,7 +731,7 @@ External Illumination

### Changed

- Upgrade digital CNN to v12.1.0 (added new images)
- Upgrade digit CNN to v12.1.0 (added new images)
- Dedicated NaN handling, internal refactoring (CNN-Handling)
- HTML: confirmation after config.ini update
- Bug fixing
Expand All @@ -753,7 +753,7 @@ External Illumination
- GPIO: using the general mqtt main topic for GPIO


- Upgrade digital CNN to v12.0.0 (added new images)
- Upgrade digit CNN to v12.0.0 (added new images)
- Update tfmicro to new master (2021-08-07)
- Bug fix: remove text in mqtt value, remove connect limit in wlan reconnet

Expand Down Expand Up @@ -789,7 +789,7 @@ External Illumination

- Update wlan handling to esp-idf 4.1

- Upgrade digital CNN to v8.7.0 (added new images)
- Upgrade digit CNN to v8.7.0 (added new images)

- Bug fix: MQTT, WLAN, LED-Controll, GPIO usage, fixed IP, calculation flow rate

Expand All @@ -800,7 +800,7 @@ External Illumination
- NEW: 7.0.1: bug fix wlan password with "="


- Upgrade digital CNN to v8.5.0 (added new images)
- Upgrade digit CNN to v8.5.0 (added new images)

- New MQTT topics: flow rate (units/minute), time stamp (last correct read readout)

Expand All @@ -817,7 +817,7 @@ External Illumination

- NEW 6.7.1: Improved stability of camera (back to v6.6.1) - remove black strips and areas

- Upgrade digital CNN to v8.3.0 (added new type of digits)
- Upgrade digit CNN to v8.3.0 (added new type of digits)

- Internal update: TFlite (v2.5), esp32cam, startup sequence

Expand All @@ -838,7 +838,7 @@ External Illumination

### Changed

- Upgrade digital CNN to v8.2.0 (added new type of digits)
- Upgrade digit CNN to v8.2.0 (added new type of digits)


- Supporting alignment structures in ROI definition
Expand Down Expand Up @@ -874,7 +874,7 @@ External Illumination

- Determination of fixed illumination settings during startup - speed up of 5s in each run

- Update digital CNN to v8.1.1 (additional digital images trained)
- Update digit CNN to v8.1.1 (additional digit images trained)

- Extended error message in MQTT error message

Expand All @@ -886,7 +886,7 @@ External Illumination

### Changed

- Disabling of analog / digital counters in configuration
- Disabling of analog / digit counters in configuration


- Improved Alignment Algorithm (`AlignmentAlgo` = `Default`, `Accurate` , `Fast`)
Expand All @@ -906,7 +906,7 @@ External Illumination

- MQTT: Last Will Testament (LWT) implemented: "connection lost" in case of connection lost to `TopicError`
- Disabled `CheckDigitIncreaseConsistency` in default configuration - must now be explicit enabled if needed
- Update digital CNN to v7.2.1 (additional digital images trained)
- Update digit CNN to v7.2.1 (additional digit images trained)
- Setting of arbitrary time server in `config.ini`
- Option for fixed IP-, DNS-Settings in `wlan.ini`
- Increased stability (internal image and camera handling)
Expand Down Expand Up @@ -940,7 +940,7 @@ External Illumination

- standardized access to current logfile via `http://IP-ADRESS/logfileact`

- Update digital CNN to v7.2.0, analog CNN to 6.3.0
- Update digit CNN to v7.2.0, analog CNN to 6.3.0

- Bug fixing: truncation error, CheckDigitConsistency & PreValue implementation

Expand All @@ -959,7 +959,7 @@ External Illumination

### Changed

- Update digital CNN to v6.5.0 and HTML (Info to hostname, IP, ssid)
- Update digit CNN to v6.5.0 and HTML (Info to hostname, IP, ssid)

- New implementation of "checkDigitConsistency" also for digits

Expand Down
2 changes: 1 addition & 1 deletion code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ bool ClassFlowAlignment::doFlow(string time)
DrawRef(ImageTMP);
}

flowctrl.DigitalDrawROI(ImageTMP);
flowctrl.DigitDrawROI(ImageTMP);
flowctrl.AnalogDrawROI(ImageTMP);
ImageTMP->writeToMemoryAsJPG((ImageData *)AlgROI, 90);
}
Expand Down
Loading