Skip to content

Commit 085f256

Browse files
Merge branch 'rolling' into add-esp32-s3-support
2 parents f3a1791 + aad1a0e commit 085f256

File tree

135 files changed

+12619
-7743
lines changed

Some content is hidden

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

135 files changed

+12619
-7743
lines changed

.github/workflows/build.yml renamed to .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.yml renamed to .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.yml renamed to .github/workflows/reply-bot.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Reply Bot
2-
# It uses the configuration in .github/label-commenter-config.yml
2+
# It uses the configuration in .github/label-commenter-config.yaml
33
# See https://github.com/peaceiris/actions-label-commenter
44

55
name: Reply-Bot
@@ -20,12 +20,11 @@ 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)
28-
## Make sure to also add the reply message to .github/label-commenter-config.yml!
27+
## Make sure to also add the reply message to .github/label-commenter-config.yaml!
2928
## This currently seems no longer to work due to changes on the actions-cool/issues-helper!
3029
####################################################################
3130
# - name: Remove 'Logfile' label again (issues only)
@@ -69,11 +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
7776
uses: peaceiris/actions-label-commenter@c2d00660c86f2b9ed0fb35b372c451558eba85b3
7877
with:
79-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
78+
github_token: "${{ secrets.GITHUB_TOKEN }}"
79+
config_file: .github/label-commenter-config.yaml

Changelog.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
## [update] - 2024-03-30
2+
3+
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.6.0...v15.7.0)
4+
5+
#### Core Changes
6+
7+
- New tflite-Model for Analog (v13.0.0)
8+
- New tflite-Model for Digital Hybrid (v7.0.0)
9+
10+
#### Bug Fixes
11+
12+
- tbd
13+
14+
## [15.7.0] - 2024-02-17
15+
16+
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.6.0...v15.7.0)
17+
18+
#### Core Changes
19+
- Added new camera settings (See `Settings > Alignment > Reference Image and Camera Settings`). You might need to re-create the reference image and alignment marks. Note worthy:
20+
- You can now crop the image
21+
- Support to configure sharpness, grayscale, negatoive and exposure
22+
- Enhanced various WebUI pages with better explanations and usability
23+
- Add Firmware Version to MQTT
24+
25+
#### Bug Fixes
26+
- 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.
27+
28+
129
## [15.6.0] - 2024-02-09
230

331
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.5.0...v15.6.0)
@@ -42,6 +70,8 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
4270
- dig-class100-0167_s2_q.tflite
4371
- dig-class11_1700_s2.tflite
4472
- ana-cont_1208_s2_q.tflite
73+
74+
- Added config entries for MQTT TLS
4575

4676

4777
#### Fixed

0 commit comments

Comments
 (0)