Skip to content

Commit f3a1791

Browse files
argetlam-coderargetlam-coder
committed
Merge branch 'rolling' into add-esp32-s3-support
2 parents f5329da + 444dc0f commit f3a1791

File tree

155 files changed

+1915
-30813
lines changed

Some content is hidden

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

155 files changed

+1915
-30813
lines changed

‎.github/workflows/build.yml

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
concurrent_skipping: same_content_newer
1717

18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
with:
2020
submodules: recursive
2121

@@ -25,28 +25,28 @@ jobs:
2525
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
2626
2727
- name: Update PIP cache on every commit
28-
uses: actions/cache@v3.2.3
28+
uses: actions/cache@v4
2929
with:
3030
path: ~/.cache/pip
3131
key: pip-${{ github.run_id }}
3232
restore-keys: pip # 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
3333

3434
- name: Update PlatformIO cache on every commit
35-
uses: actions/cache@v3.2.3
35+
uses: actions/cache@v4
3636
with:
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
4040

4141
- name: Update Build cache on every commit
42-
uses: actions/cache@v3.2.3
42+
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
4747

4848
- name: Update generated-files cache on every commit
49-
uses: actions/cache@v3.2.3
49+
uses: actions/cache@v4
5050
with:
5151
path: |
5252
./code/.pio/build/esp32cam/firmware.bin
@@ -57,7 +57,7 @@ jobs:
5757
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
5858

5959
- name: Set up Python
60-
uses: actions/setup-python@v4
60+
uses: actions/setup-python@v5
6161
with:
6262
python-version: '3.10'
6363

@@ -70,7 +70,7 @@ jobs:
7070
#run: echo "Testing... ${{ github.ref_name }}, ${{ steps.vars.outputs.sha_short }}" > ./sd-card/html/version.txt; mkdir -p ./code/.pio/build/esp32cam/; cd ./code/.pio/build/esp32cam/; echo "${{ steps.vars.outputs.sha_short }}" > firmware.bin; cp firmware.bin partitions.bin; cp firmware.bin bootloader.bin # Testing
7171
run: cd code; platformio run --environment esp32cam
7272

73-
- name: Prepare Web UI (copy data from repo, generate tooltip pages and update hashes in all files)
73+
- name: Prepare Web UI (generate tooltip pages and update hashes in all files)
7474
run: |
7575
rm -rf ./html
7676
mkdir html
@@ -79,7 +79,7 @@ jobs:
7979
python -m pip install markdown
8080
mkdir html/param-tooltips
8181
cd tools/parameter-tooltip-generator
82-
bash generate-param-doc-tooltips.sh
82+
python generate-param-doc-tooltips.py
8383
cd ../..
8484
8585
cp -r ./sd-card/html/* ./html/
@@ -101,10 +101,10 @@ jobs:
101101
needs: build
102102

103103
steps:
104-
- uses: actions/checkout@v3
104+
- uses: actions/checkout@v4
105105

106106
- name: Update generated-files cache on every commit
107-
uses: actions/cache@v3.2.3
107+
uses: actions/cache@v4
108108
with:
109109
path: |
110110
./code/.pio/build/esp32cam/firmware.bin
@@ -115,7 +115,7 @@ jobs:
115115
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
116116

117117
- name: Update update cache on every commit
118-
uses: actions/cache@v3.2.3
118+
uses: actions/cache@v4
119119
with:
120120
path: update
121121
key: update-${{ github.run_id }}
@@ -144,7 +144,7 @@ jobs:
144144
cp ./sd-card/config/*.tflite ./update/config/ 2>/dev/null || true
145145
146146
- name: Upload update as update.zip artifact (Firmware + Web UI + CNN)
147-
uses: actions/upload-artifact@v3
147+
uses: actions/upload-artifact@v4
148148
with:
149149
name: "AI-on-the-edge-device__update__${{ steps.vars.outputs.branch }}_(${{ steps.vars.outputs.sha_short }})"
150150
path: ./update/*
@@ -164,10 +164,10 @@ jobs:
164164
needs: build
165165

166166
steps:
167-
- uses: actions/checkout@v3
167+
- uses: actions/checkout@v4
168168

169169
- name: Update generated-files cache on every commit
170-
uses: actions/cache@v3.2.3
170+
uses: actions/cache@v4
171171
with:
172172
path: |
173173
./code/.pio/build/esp32cam/firmware.bin
@@ -178,7 +178,7 @@ jobs:
178178
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
179179

180180
- name: Update remote_setup cache on every commit
181-
uses: actions/cache@v3.2.3
181+
uses: actions/cache@v4
182182
with:
183183
path: remote_setup
184184
key: remote_setup-${{ github.run_id }}
@@ -205,7 +205,7 @@ jobs:
205205
cp ./sd-card/config/* ./remote_setup/config/ 2>/dev/null || true
206206
207207
- name: Upload remote_setup as remote_setup.zip artifact (Firmware + Web UI + Config)
208-
uses: actions/upload-artifact@v3
208+
uses: actions/upload-artifact@v4
209209
with:
210210
name: "AI-on-the-edge-device__remote-setup__${{ steps.vars.outputs.branch }}_(${{ steps.vars.outputs.sha_short }})"
211211
path: ./remote_setup/*
@@ -220,10 +220,10 @@ jobs:
220220
needs: build
221221

222222
steps:
223-
- uses: actions/checkout@v3
223+
- uses: actions/checkout@v4
224224

225225
- name: Update generated-files cache on every commit
226-
uses: actions/cache@v3.2.3
226+
uses: actions/cache@v4
227227
with:
228228
path: |
229229
./code/.pio/build/esp32cam/firmware.bin
@@ -234,7 +234,7 @@ jobs:
234234
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
235235

236236
- name: Update manual_setup cache on every commit
237-
uses: actions/cache@v3.2.3
237+
uses: actions/cache@v4
238238
with:
239239
path: manual_setup
240240
key: manual_setup-${{ github.run_id }}
@@ -263,7 +263,7 @@ jobs:
263263
cd ./manual_setup
264264
265265
- name: Upload manual_setup.zip artifact (Firmware + Bootloader + Partitions + Web UI)
266-
uses: actions/upload-artifact@v3
266+
uses: actions/upload-artifact@v4
267267
with:
268268
name: "AI-on-the-edge-device__manual-setup__${{ steps.vars.outputs.branch }}_(${{ steps.vars.outputs.sha_short }})"
269269
path: ./manual_setup
@@ -284,24 +284,24 @@ jobs:
284284
id-token: write
285285

286286
steps:
287-
- uses: actions/checkout@v3
287+
- uses: actions/checkout@v4
288288

289289
- name: Update update cache on every commit
290-
uses: actions/cache@v3.2.3
290+
uses: actions/cache@v4
291291
with:
292292
path: update
293293
key: update-${{ github.run_id }}
294294
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
295295

296296
- name: Update remote_setup cache on every commit
297-
uses: actions/cache@v3.2.3
297+
uses: actions/cache@v4
298298
with:
299299
path: remote_setup
300300
key: remote_setup-${{ github.run_id }}
301301
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
302302

303303
- name: Update manual_setup cache on every commit
304-
uses: actions/cache@v3.2.3
304+
uses: actions/cache@v4
305305
with:
306306
path: manual_setup
307307
key: manual_setup-${{ github.run_id }}
@@ -396,7 +396,7 @@ jobs:
396396

397397
steps:
398398
- name: Checkout
399-
uses: actions/checkout@v3
399+
uses: actions/checkout@v4
400400

401401
- name: Get version of last release
402402
id: last_release
@@ -410,20 +410,21 @@ jobs:
410410
run: |
411411
echo "Updating Web installer to use firmware from ${{ steps.last_release.outputs.tag_name }}..."
412412
rm -f docs/binary/firmware.bin
413-
wget https://github.com/jomjol/AI-on-the-edge-device/releases/download/${{ steps.last_release.outputs.tag_name }}/AI-on-the-edge-device__update__${{ steps.last_release.outputs.tag_name }}.zip
413+
wget ${{ github.server_url }}/${{ github.repository }}/releases/download/${{ steps.last_release.outputs.tag_name }}/AI-on-the-edge-device__update__${{ steps.last_release.outputs.tag_name }}.zip
414414
unzip AI-on-the-edge-device__update__${{ steps.last_release.outputs.tag_name }}.zip
415415
cp -f firmware.bin docs/binary/firmware.bin
416416
echo "Updating index and manifest file..."
417417
sed -i 's/$VERSION/${{ steps.last_release.outputs.tag_name }}/g' docs/index.html
418418
sed -i 's/$VERSION/${{ steps.last_release.outputs.tag_name }}/g' docs/manifest.json
419+
419420
- name: Setup Pages
420-
uses: actions/configure-pages@v2
421+
uses: actions/configure-pages@v4
421422

422423
- name: Upload artifact
423-
uses: actions/upload-pages-artifact@v1
424+
uses: actions/upload-pages-artifact@v2
424425
with:
425426
path: 'docs'
426427

427428
- name: Deploy to GitHub Pages
428429
id: deployment
429-
uses: actions/deploy-pages@v1
430+
uses: actions/deploy-pages@v3 # Note: v4 does not work!

‎Changelog.md

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
1-
## [unreleased] - 2024-01-02
1+
## [15.6.0] - 2024-02-09
22

3-
### Changes
3+
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)
4+
5+
#### Fixed
6+
7+
* Fixed issues with the SD-Card initialization
8+
9+
## [15.5.0] - 2024-02-02
410

5-
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/rolling...v15.4.0)
11+
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.4.0...v15.5.0)
612

713
#### Changed
814

915
- Update PlattformIO to v6.5.0, which means esp-idf to v5.1
10-
16+
- Enhance busy notification
17+
- Implemented late analog / digital transition
1118

1219
#### Fixed
1320

1421
* ATA-TRIM: workaround for old SD-cards with no trim function to work with esp-idf v5.x
1522
* InfluxDB: Modified the time conversions to be more stable (UTC vs. local time shifts)
23+
* Fix negatives on extended resolution false
24+
* Show chip infos on info page
25+
* Fix memory leaks in tflite integration
1626

1727
## [15.4.0] - 2023-12-22
1828

19-
### Changes
20-
2129
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.3.0...v15.4.0)
2230

2331
#### Changed
@@ -43,13 +51,10 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
4351
* Minor html response bugfix
4452

4553
- Memory leakage (MQTT)
46-
4754

4855

4956
## [15.3.0] - 2023-07-22
5057

51-
### Changes
52-
5358
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.3.0...v15.2.4)
5459

5560
#### Changed
@@ -59,13 +64,8 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
5964
- ana-cont_1207_s2_q.tflite
6065
- dig-cont_0620_s3_q.tflite
6166

62-
63-
64-
6567
## [15.2.4] - 2023-05-02
6668

67-
### Changes
68-
6969
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.2.1...v15.2.4)
7070

7171
#### Changed
@@ -89,8 +89,6 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
8989

9090
## [15.2.0] - 2023-04-23
9191

92-
### Changes
93-
9492
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.1...v15.2.0)
9593

9694
#### Added
@@ -120,8 +118,6 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
120118

121119
## [15.1.1] - 2023-03-23
122120

123-
### Changes
124-
125121
For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.1.0...v15.1.1)
126122

127123
#### Added

‎code/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,6 @@ pio device monitor -p /dev/ttyUSB0
6969
- `pio run --target erase` to erase the flash
7070
- `pio run --target upload` this will upload the `bootloader.bin, partitions.bin,firmware.bin` from the `code/.pio/build/esp32cam/` folder.
7171
- `pio device monitor` to observe the logs via uart
72+
73+
# Update Parameters
74+
If you create or rename a parameter, make sure to update its documentation in `../param-docs/parameter-pages`! Check the `../param-docs/README.md` for more information.

‎code/components/esp-fatfs/CMakeLists.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)