Skip to content

Commit ca01f5a

Browse files
caco3jomjolSybexXhaverlandkub3let
authored
Prepare next release (#3267)
* Create dig-cont_0640_s3_q.tflite * Update edit_reference.html (#2924) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist * Update edit_config_template.html (#2925) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist + Kameraeinstellungen nicht nur in der config.ini speichern, sondern auch setzen * The parameter "negative" is processed on the MCU * Renamed menu entry Alignment -> References * renamed model file to make naming consistent * Fix test (#2933) * always reset change absolute (#2956) * Create dig-class11_1701_s2.tflite * Update tflite * Update tflite * Camera settings (#3029) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Fix minor typo and harmonize spaces (#3030) * Update edit_digits.html * Update edit_analog.html * Update overview.html * Update edit_reference.html --------- Co-authored-by: jomjol <[email protected]> * Source code formatting, ClassFlowPostProcessing.cpp * fix edit_config_template.html Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix readconfigparam.js Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix edit_config_template.html TakeImage_CamZoomMode_value1 was replaced by TakeImage_CamZoomSize_value1, but not deleted. This caused problems when saving the camera settings. * Update info.html function loadWLANSSID() was present three times * Update overview.html CamFrameSize is no longer needed/used for zoom * Update reply-bot.yaml * homeassistant service discovery: derive node_id when using nested topics (#3088) * derive correct node_id for homeassistant service discovery in nested topics (fixes #1792) * explicit use of std::string * move nodeId creation to separate function add unit-tests * add documentation about node_id generation for Home Assistant MQTT Service Discovery * add Prometheus/OpenMetrics exporter (#3081) * add prometheus endpoint * refine metrics implementation * move metrics generator to ClassFlowControll * add more metrics align prefix * add more metrics clean up * refine documentation * revert dependencies change * sanitize labels * create separate module for openmetrics * move openmetrics to separate folder * clean up * add basic unit-tests * work with const numbers add replaceAll for string replacement avoid opening std namespace adapt unit-tests * Update code/main/server_main.cpp --------- Co-authored-by: CaCO3 <[email protected]> * Typo * update platformIO to 6.7.0 (ESP IDF 5.2.1) (#3098) * update to platformio/espressif32 @ 6.7.0 * remove unused getReadout() as it throws errors (error: 'virtual std::string ClassFlow::getReadout()' was hidden). --------- Co-authored-by: CaCO3 <[email protected]> * Update reply-bot.yaml (#3107) * Fix actions-label-commenter * Update Helper.cpp * Update Helper.h * Update Helper.cpp * Update readconfigparam.js fix for: In the selected field the value '1' in the section 'TakeImage' in the field 'CamGainceiling' is invalid. PLEASE CHECK BEFORE SAVING! * proposal for renaming and documentation (#3115) * Update server_camera.cpp Fix building with -D DEBUG_DETAIL_ON better alternative to: #3160 * Update ClassFlowPostProcessing.cpp * Update ClassFlowAlignment.cpp * Fix building with `-D DEBUG_DETAIL_ON` (#3160) Building with `-D DEBUG_DETAIL_ON` has been broken since #3029. Co-authored-by: CaCO3 <[email protected]> * Handle empty prevalue.ini gracefully (#3162) Fixes #2149. * Bugfix for boot loop (#3175) * Add files via upload * Add files via upload * Add files via upload * Delete param-docs/parameter-pages/TakeImage/Aec2.md has been replaced by CamAec2.md * Delete param-docs/parameter-pages/TakeImage/AutoExposureLevel.md has been replaced by CamAeLevel.md * Delete param-docs/parameter-pages/TakeImage/Brightness.md has been replaced by CamBrightness.md * Delete param-docs/parameter-pages/TakeImage/Contrast.md has been replaced by CamContrast.md * Delete param-docs/parameter-pages/TakeImage/Grayscale.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Negative.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Saturation.md has been replaced by CamSaturation.md * Delete param-docs/parameter-pages/TakeImage/Sharpness.md has been replaced by CamSharpness.md * Delete param-docs/parameter-pages/TakeImage/ImageQuality.md has been replaced by CamQuality.md * Delete param-docs/parameter-pages/TakeImage/Zoom.md has been replaced by CamZoom.md * Delete param-docs/parameter-pages/TakeImage/ZoomMode.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetX.md has been replaced by CamZoomOffsetX.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetY.md has been replaced by CamZoomOffsetY.md * Delete param-docs/parameter-pages/TakeImage/ImageSize.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/FixedExposure.md has been replaced by CamAec.md * Delete param-docs/parameter-pages/Alignment/FlipImageSize.md has been replaced by CamVflip.md * Delete param-docs/parameter-pages/Alignment/InitialMirror.md has been replaced by CamHmirror.md * CamParameter documentation update #3185 * typo * add Webhook #3148 (#3163) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error --------- Co-authored-by: CaCO3 <[email protected]> * Bugfix for time stamp (#3180) * Update ClassFlowPostProcessing.cpp * Update ClassFlowDefineTypes.h * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update interface_webhook.cpp * Update readconfigcommon.js fix for: The same message("Image Contrast got enhanced") came up with "Update Marker" and "Enhance Image Contrast". * fix svg favicon The svg one got added in 33893eb but does not work on Firefox * Update platformIO to 6.8.1 (Contains ESP IDF 5.3) (#3196) * Update platformIO to 6.8.1 (ESP IDF 5.3) * removed now redundant typedef * updated IDF manifest hash * Add files via upload so it should work now * Update server_main.cpp --------- Co-authored-by: CaCO3 <[email protected]> Co-authored-by: michael <[email protected]> * Update MainFlowControl.cpp * Add support for OV5640 camera (#3063) * Add support for OV5640 camera * clean up sharpness handling * limit sharpness range to -2 and +2 * refactor * Fix OV3660 sharpness handling * refactor sharpness handling * fix OV3660 zoom mode * reinstate aspect ratio via imageSize * Changed OV5640 full frame size to match datasheet * various fixes * add denoise config and general clean up * fix line endings to LF * Support enabling red blue swap via web interface * update jpeg quality limits * remove color swap config; color swap workaround dependent on vflip * fix missing commit * fix gain ceiling * Update cam vflip param page * fix typo: camdenoise, not camsdenoise * fix compile errors * Update MainFlowControl.cpp * Add rate threshold parameter (#3195) * still needs to be tested #3143 * Update ClassFlowPostProcessing.cpp code formatting * Update ClassFlowDefineTypes.h code formatting * Update ClassFlowPostProcessing.h code formatting * Update edit_config_template.html * fix * Update config.ini * Update edit_config_template.html * Updated param doc * Rename parameters * Update edit_config_template.html * Update NUMBER.ChangeRateThreshold.md * Update NUMBER.ChangeRateThreshold.md --------- Co-authored-by: CaCO3 <[email protected]> * Update main.cpp * Update config.ini Adjusted camera settings to make the image brighter. * Update readconfigparam.js Adjusted camera settings to make the image brighter. * add optional ImageUpload for Webhook (#3174) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: add img upload * webhoop added config for imgupload * webhook html fixes * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error * add checkbox for Webhook_UploadImg * Update sd-card/html/edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * added a long timestamp to both webhook requests --------- Co-authored-by: CaCO3 <[email protected]> * Add files via upload (#3207) * Update ClassFlowPostProcessing.cpp deleted some unnecessary double entries RateType renamed to MaxRateType * Update ClassFlowDefineTypes.h RateType renamed to MaxRateType * Update text on recognition page * Update digital CNN * add a Delay between the WiFi reconnections (#3068) * add a Delay between the WiFi reconnections * log the delay between the WiFi reconnections move the delay after the log * cleanup * cleanup * cleanup * Update edit_alignment.html * cleanup * cleanup * Update platformIO to 6.9.0 (Contains ESP IDF 5.3.1) * Handle crash on corrupted model (#3220) * Upgrade esp-tflite-micro to 1.3.1 * Added log message to hint in case it crashes on loading a corrupted model --------- Co-authored-by: CaCO3 <[email protected]> * new dig-class100-173-s2-q on 23.800 images (#3257) * new dig-class100-173-s2-q on 23.800 images * platformio/espressif32 @ 6.8.1 for esp32cam-dev * Revert "platformio/espressif32 @ 6.8.1 for esp32cam-dev" This reverts commit cc9297d. * not using platformio 6.1.16 * Revert "not using platformio 6.1.16" This reverts commit ef18e4f. * moved number edit box styles into new file edit_style.css (#3262) changed input[type=number] from 60px to 3em, to show 3 digits with current font size. * added note about only TLS 1.2 is supported (#3213) * Renamed digital to digit (#3219) * renamed Digital to Digit * added param migration * Update .github/label-commenter-config.yaml * renamed AnalogDigitTransition* to AnalogToDigitTransition* --------- Co-authored-by: CaCO3 <[email protected]> * Update Changelog.md * Update Changelog.md --------- Co-authored-by: jomjol <[email protected]> Co-authored-by: michael <[email protected]> Co-authored-by: Frank Haverland <[email protected]> Co-authored-by: kub3let <[email protected]> Co-authored-by: Marco H <[email protected]> Co-authored-by: Henry Thasler <[email protected]> Co-authored-by: CaCO3 <[email protected]> Co-authored-by: Sebastian Lövdahl <[email protected]> Co-authored-by: Raphael Hehl <[email protected]> Co-authored-by: jasaw <[email protected]> Co-authored-by: Francesco Carnielli <[email protected]> Co-authored-by: kalwados <[email protected]>
1 parent 0d0b018 commit ca01f5a

File tree

151 files changed

+11377
-7570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+11377
-7570
lines changed

.github/label-commenter-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@
115115
labeled:
116116
issue:
117117
body: |
118-
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.
118+
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.
119119
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/).
120120
discussion:
121121
body: |
122-
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.
122+
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.
123123
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/).

.github/workflows/build.yaml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: fkirc/skip-duplicate-actions@v5
1515
with:
1616
concurrent_skipping: same_content_newer
17-
17+
1818
- uses: actions/checkout@v4
1919
with:
2020
submodules: recursive
@@ -37,14 +37,14 @@ jobs:
3737
path: ~/.platformio
3838
key: platformio-${{ github.run_id }}
3939
restore-keys: platformio # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
40-
40+
4141
- name: Update Build cache on every commit
4242
uses: actions/cache@v4
4343
with:
4444
path: ./code/.pio/
4545
key: build-${{ github.run_id }}
4646
restore-keys: build # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
47-
47+
4848
- name: Update generated-files cache on every commit
4949
uses: actions/cache@v4
5050
with:
@@ -86,7 +86,7 @@ jobs:
8686
8787
echo "Replacing variables..."
8888
cd html; find . -type f -exec sed -i 's/$COMMIT_HASH/${{ steps.vars.outputs.sha_short }}/g' {} \;
89-
89+
9090
9191
#########################################################################################
9292
## Pack for Update
@@ -120,7 +120,7 @@ jobs:
120120
path: update
121121
key: update-${{ github.run_id }}
122122
restore-keys: update # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
123-
123+
124124
- name: Set Variables
125125
id: vars
126126
run: |
@@ -150,7 +150,6 @@ jobs:
150150
path: ./update/*
151151

152152

153-
154153
#########################################################################################
155154
## Pack for Remote Setup
156155
#########################################################################################
@@ -176,7 +175,7 @@ jobs:
176175
./html/*
177176
key: generated-files-${{ github.run_id }}
178177
restore-keys: generated-files # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
179-
178+
180179
- name: Update remote_setup cache on every commit
181180
uses: actions/cache@v4
182181
with:
@@ -261,7 +260,7 @@ jobs:
261260
cp -r ./html ./sd-card/ # Overwrite the Web UI with the preprocessed files
262261
cd sd-card; zip -r ../manual_setup/sd-card.zip *; cd ..
263262
cd ./manual_setup
264-
263+
265264
- name: Upload manual_setup.zip artifact (Firmware + Bootloader + Partitions + Web UI)
266265
uses: actions/upload-artifact@v4
267266
with:
@@ -285,21 +284,21 @@ jobs:
285284

286285
steps:
287286
- uses: actions/checkout@v4
288-
287+
289288
- name: Update update cache on every commit
290289
uses: actions/cache@v4
291290
with:
292291
path: update
293292
key: update-${{ github.run_id }}
294293
restore-keys: update # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
295-
294+
296295
- name: Update remote_setup cache on every commit
297296
uses: actions/cache@v4
298297
with:
299298
path: remote_setup
300299
key: remote_setup-${{ github.run_id }}
301300
restore-keys: remote_setup # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
302-
301+
303302
- name: Update manual_setup cache on every commit
304303
uses: actions/cache@v4
305304
with:
@@ -342,7 +341,7 @@ jobs:
342341
# with:
343342
# changelogPath: Changelog.md
344343
# version: ${{ steps.get_version.outputs.version-without-v }}
345-
344+
346345
# # the release notes will be extracted from changelog
347346
# - name: Extract release notes
348347
# id: extract-release-notes
@@ -397,15 +396,15 @@ jobs:
397396
steps:
398397
- name: Checkout
399398
uses: actions/checkout@v4
400-
399+
401400
- name: Get version of last release
402401
id: last_release
403402
uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
404403
with:
405404
myToken: ${{ github.token }}
406405
exclude_types: "draft|prerelease"
407406
view_top: 1
408-
407+
409408
- name: Add binary to Web Installer and update manifest
410409
run: |
411410
echo "Updating Web installer to use firmware from ${{ steps.last_release.outputs.tag_name }}..."

.github/workflows/manual-update-webinstaller.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
# - rolling
1313
# paths:
1414
# - docs # The path filter somehow does not work, so lets run it on every change to rolling
15-
15+
1616
jobs:
1717
manually-update-web-installer:
1818
environment:
@@ -29,15 +29,15 @@ jobs:
2929
steps:
3030
- name: Checkout
3131
uses: actions/checkout@v3
32-
32+
3333
- name: Get version of last release
3434
id: last_release
3535
uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
3636
with:
3737
myToken: ${{ github.token }}
3838
exclude_types: "draft|prerelease"
3939
view_top: 1
40-
40+
4141
- name: Add binary to Web Installer and update manifest
4242
run: |
4343
echo "Updating Web installer to use firmware from ${{ steps.last_release.outputs.tag_name }}..."
@@ -60,4 +60,3 @@ jobs:
6060
- name: Deploy to GitHub Pages
6161
id: deployment
6262
uses: actions/deploy-pages@v1
63-

.github/workflows/reply-bot.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ jobs:
2020
comment:
2121
runs-on: ubuntu-20.04
2222
steps:
23-
- uses: actions/checkout@v3
24-
25-
23+
- uses: actions/checkout@v4
24+
2625
####################################################################
2726
## Remove labels again (issues only)
2827
## Make sure to also add the reply message to .github/label-commenter-config.yaml!
@@ -69,12 +68,12 @@ jobs:
6968
# with:
7069
# actions: 'remove-labels'
7170
# labels: 'bot-reply Show Trained Digits/Pointers'
72-
71+
7372
####################################################################
7473
## Write the response
7574
####################################################################
7675
- name: Write Response
77-
uses: peaceiris/actions-label-commenter@v1
76+
uses: peaceiris/actions-label-commenter@c2d00660c86f2b9ed0fb35b372c451558eba85b3
7877
with:
7978
github_token: "${{ secrets.GITHUB_TOKEN }}"
8079
config_file: .github/label-commenter-config.yaml

0 commit comments

Comments
 (0)