Skip to content

Commit ef558dc

Browse files
finger563finger563
authored
chore: Update to esp-idf v5.5.1 and update dependencies (#13)
1 parent bf4a442 commit ef558dc

File tree

3 files changed

+91
-50
lines changed

3 files changed

+91
-50
lines changed

‎.github/workflows/build.yml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ name: Build
22

33
on: [pull_request]
44

5+
env:
6+
APP_NAME: 'Software Defined Haptics'
7+
IDF_VERSION: 'v5.5.1'
8+
IDF_COMPONENT_MANAGER: "1" # whether to enable the component manager or not
9+
FLASH_TOTAL_OVERRIDE: '2097152' # 2MB flash app partition for main app
10+
511
jobs:
612
build:
713

@@ -11,10 +17,12 @@ jobs:
1117
matrix:
1218
build:
1319
- path: '.'
20+
name: 'test-stand'
1421
target: esp32s3
1522
command: |
1623
idf.py -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.test_stand" build
1724
- path: '.'
25+
name: 'motorgo'
1826
target: esp32s3
1927
command: |
2028
idf.py -DSDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.motorgo" build
@@ -26,7 +34,19 @@ jobs:
2634
- name: Build Examples
2735
uses: espressif/esp-idf-ci-action@v1
2836
with:
29-
esp_idf_version: release-v5.4
37+
esp_idf_version: ${{ env.IDF_VERSION }}
3038
target: ${{ matrix.build.target }}
3139
path: ${{ matrix.build.path }}
3240
command: ${{ matrix.build.command }}
41+
42+
- name: Determine Size Delta
43+
uses: esp-cpp/esp-idf-size-delta@v1
44+
# only run this on the motorgo build
45+
if: ${{ matrix.build.name == 'motorgo' }}
46+
with:
47+
app_name: ${{ env.APP_NAME }}
48+
app_path: '.'
49+
idf_target: ${{ matrix.build.target }}
50+
idf_version: ${{ env.IDF_VERSION }}
51+
idf_component_manager: ${{ env.IDF_COMPONENT_MANAGER }}
52+
flash_total_override: ${{ env.FLASH_TOTAL_OVERRIDE }}

‎.github/workflows/package_main.yml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ on:
77
types: [published]
88
workflow_dispatch:
99

10+
env:
11+
APP_NAME: 'Software Defined Haptics'
12+
IDF_VERSION: 'v5.5.1'
13+
IDF_COMPONENT_MANAGER: "1" # whether to enable the component manager or not
14+
FLASH_TOTAL_OVERRIDE: '2097152' # 2MB flash app partition for main app
15+
1016
jobs:
1117
build:
1218

@@ -34,7 +40,7 @@ jobs:
3440
- name: Build Main Code
3541
uses: espressif/esp-idf-ci-action@v1
3642
with:
37-
esp_idf_version: release-v5.4
43+
esp_idf_version: ${{ env.IDF_VERSION }}
3844
target: ${{ matrix.build.target }}
3945
path: ${{ matrix.build.path }}
4046
command: ${{ matrix.build.command }}
@@ -65,6 +71,19 @@ jobs:
6571
with:
6672
files: ${{ matrix.build.name }}.zip
6773

74+
- name: Determine Size Delta
75+
# only run this on the motorgo build and if the release is published
76+
if: ${{ github.event.release && github.event.action == 'published' && matrix.build.name == 'motorgo' }}
77+
uses: esp-cpp/esp-idf-size-delta@v1
78+
with:
79+
app_name: ${{ env.APP_NAME }}
80+
app_path: "."
81+
idf_target: ${{ matrix.build.target }}
82+
idf_version: ${{ env.IDF_VERSION }}
83+
idf_component_manager: ${{ env.IDF_COMPONENT_MANAGER }}
84+
flash_total_override: ${{ env.FLASH_TOTAL_OVERRIDE }}
85+
post_comment: 'false'
86+
6887
package:
6988
name: Package the binaries into an executables for Windows, MacOS, and Linux (Ubuntu)
7089
needs: build

‎dependencies.lock‎

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
espp/adc:
3-
component_hash: ddc044e9e275a773438d04a268e83e2d2c3ad13610b46815ff8dffec9128db99
3+
component_hash: 3227da5c700828845c2bacc4ce8e5ef49d2ebfe6db6e9378769ffb976f57b526
44
dependencies:
55
- name: espp/base_component
66
registry_url: https://components.espressif.com
@@ -16,9 +16,9 @@ dependencies:
1616
source:
1717
registry_url: https://components.espressif.com
1818
type: service
19-
version: 1.0.4
19+
version: 1.0.30
2020
espp/base_component:
21-
component_hash: a9d22731af1f5ba1a4e964580adf80aa4df396ab1aba84fe86f42e78e09382d0
21+
component_hash: 4eb622f2705843fc76215d51d834ee7297522e883378e706a998d4fa6e49f231
2222
dependencies:
2323
- name: espp/logger
2424
registry_url: https://components.espressif.com
@@ -30,9 +30,9 @@ dependencies:
3030
source:
3131
registry_url: https://components.espressif.com
3232
type: service
33-
version: 1.0.4
33+
version: 1.0.30
3434
espp/base_peripheral:
35-
component_hash: 176d533324b5b6751f9d61b395ea15514afa155d0621e97c6ff12841dd5dab16
35+
component_hash: d852ab634677571e03f7ab3e871260601c33d46b00c59c56f1361a764734fff6
3636
dependencies:
3737
- name: espp/base_component
3838
registry_url: https://components.espressif.com
@@ -44,9 +44,9 @@ dependencies:
4444
source:
4545
registry_url: https://components.espressif.com
4646
type: service
47-
version: 1.0.4
47+
version: 1.0.30
4848
espp/bldc_driver:
49-
component_hash: f8463ed4ddb86943bbfdfd23435220a10e1aae23566c6a667208eb38e8506348
49+
component_hash: e127988aacd8d7afdc7c057566e52fcd2476682e53f18b8fff7d2d33548c4c3c
5050
dependencies:
5151
- name: espp/base_component
5252
registry_url: https://components.espressif.com
@@ -58,9 +58,9 @@ dependencies:
5858
source:
5959
registry_url: https://components.espressif.com/
6060
type: service
61-
version: 1.0.4
61+
version: 1.0.30
6262
espp/bldc_haptics:
63-
component_hash: ef524abc695252b2a788aaf9cbc89418e8c32d5caf1e4b3e207e0677b09c088b
63+
component_hash: f496371f4f824a1aa7456ba73e8841cb7d0c26f78f8f81e9b59c473a1b2654f2
6464
dependencies:
6565
- name: espp/base_component
6666
registry_url: https://components.espressif.com
@@ -88,13 +88,10 @@ dependencies:
8888
source:
8989
registry_url: https://components.espressif.com/
9090
type: service
91-
version: 1.0.4
91+
version: 1.0.30
9292
espp/bldc_motor:
93-
component_hash: 6e393066b9eb8b5d3698c570a5db57bf3e80cb64fff129fe677f2d20c726482d
93+
component_hash: bffe8a5684fbb3c3c412e4e9028ff9635e9e034223aa2bdebbd902ba9f3367b8
9494
dependencies:
95-
- name: idf
96-
require: private
97-
version: '>=5.0'
9895
- name: espp/base_component
9996
registry_url: https://components.espressif.com
10097
require: private
@@ -111,12 +108,15 @@ dependencies:
111108
registry_url: https://components.espressif.com
112109
require: private
113110
version: '>=1.0'
111+
- name: idf
112+
require: private
113+
version: '>=5.0'
114114
source:
115115
registry_url: https://components.espressif.com/
116116
type: service
117-
version: 1.0.4
117+
version: 1.0.30
118118
espp/cli:
119-
component_hash: b8f300efa46d6a8c2ff9332f94f2fa283605c34f4f7f4da9c5c8dd2b5f669ef5
119+
component_hash: 3578f0bdeef0074284aee15d2dc3f3f6d8a36cd198d0c6e39a8c6cc9ebe3203e
120120
dependencies:
121121
- name: espp/logger
122122
registry_url: https://components.espressif.com
@@ -128,9 +128,9 @@ dependencies:
128128
source:
129129
registry_url: https://components.espressif.com/
130130
type: service
131-
version: 1.0.4
131+
version: 1.0.30
132132
espp/filters:
133-
component_hash: 27b6e084aae69247090ce9e904ea218a2f15afefe186ef0eae60c25dd1950e12
133+
component_hash: 4a1fcc942298babc57c12918237e7058658ac31af708fb214e3fea4682561809
134134
dependencies:
135135
- name: espp/format
136136
registry_url: https://components.espressif.com
@@ -150,19 +150,19 @@ dependencies:
150150
source:
151151
registry_url: https://components.espressif.com/
152152
type: service
153-
version: 1.0.4
153+
version: 1.0.30
154154
espp/format:
155-
component_hash: 3581dbbae616c2641a45037f2f844c31e7d05352339783ac06cadcb0b53d1403
155+
component_hash: a36e56d8620d28997f37a41f005bd0af70ccf025f38320738f148e2c9579f2f1
156156
dependencies:
157157
- name: idf
158158
require: private
159159
version: '>=5.0'
160160
source:
161161
registry_url: https://components.espressif.com
162162
type: service
163-
version: 1.0.4
163+
version: 1.0.30
164164
espp/i2c:
165-
component_hash: 235600292e09c9f4a1d313d7e0ae4304d9d6ca2753bac001bb5ff26936609b72
165+
component_hash: 3a2b9d4724627cacf0fd7311ceeb1a54e52dadb555664fb4d110262bee760730
166166
dependencies:
167167
- name: espp/base_component
168168
registry_url: https://components.espressif.com
@@ -182,27 +182,27 @@ dependencies:
182182
source:
183183
registry_url: https://components.espressif.com/
184184
type: service
185-
version: 1.0.4
185+
version: 1.0.30
186186
espp/interrupt:
187-
component_hash: 1ef551d0f7de1b6196e6277ca7a3fd8eaf5e513608e7a76cb50acaed5aac02f1
187+
component_hash: efe025b341ab8c5f6c46b165435270c40917fab4203417c040c93733772de65e
188188
dependencies:
189+
- name: espp/base_component
190+
registry_url: https://components.espressif.com
191+
require: private
192+
version: '>=1.0'
189193
- name: espp/task
190194
registry_url: https://components.espressif.com
191195
require: private
192196
version: '>=1.0'
193197
- name: idf
194198
require: private
195199
version: '>=5.0'
196-
- name: espp/base_component
197-
registry_url: https://components.espressif.com
198-
require: private
199-
version: '>=1.0'
200200
source:
201201
registry_url: https://components.espressif.com
202202
type: service
203-
version: 1.0.4
203+
version: 1.0.30
204204
espp/led:
205-
component_hash: b8856570ddf1cc93f7b96904a0e30169478e9ce9d9cdf6705e85ecd46dba2b96
205+
component_hash: 54b46f77c1b0a99abfad0b31c5543587413f0c32f5a86f1a4f24fbe561e3bcb2
206206
dependencies:
207207
- name: espp/base_component
208208
registry_url: https://components.espressif.com
@@ -218,9 +218,9 @@ dependencies:
218218
source:
219219
registry_url: https://components.espressif.com
220220
type: service
221-
version: 1.0.4
221+
version: 1.0.30
222222
espp/logger:
223-
component_hash: 493f2c761f562e2cb2b601263871dc3b67a492758f085444dbf2736d6ebc1c7f
223+
component_hash: 8e6fc4cb3ff9feabd726a5c6fa6465b3fafc704b7c8b283232f9bf98fa517bd8
224224
dependencies:
225225
- name: espp/format
226226
registry_url: https://components.espressif.com
@@ -232,9 +232,9 @@ dependencies:
232232
source:
233233
registry_url: https://components.espressif.com
234234
type: service
235-
version: 1.0.4
235+
version: 1.0.30
236236
espp/math:
237-
component_hash: b4e997b1d080c696bbb83e4c984aca2a0f8e9d3bf63d9577baf60e528ff8686d
237+
component_hash: 9fff8c6bcf2db4a715272a211a7f39738f36cad4f7bba90d03ef86429bce7fd8
238238
dependencies:
239239
- name: espp/format
240240
registry_url: https://components.espressif.com
@@ -246,9 +246,9 @@ dependencies:
246246
source:
247247
registry_url: https://components.espressif.com/
248248
type: service
249-
version: 1.0.4
249+
version: 1.0.30
250250
espp/motorgo-mini:
251-
component_hash: 70af02ad21b93e8160d759cbd824efdf9022790406f22ae3f2e03bca1772962c
251+
component_hash: 2a6f98d515818d4dd0160f04bebfe7c4c9761a4709522f8c2236e60b7031d89f
252252
dependencies:
253253
- name: espp/adc
254254
registry_url: https://components.espressif.com
@@ -304,9 +304,11 @@ dependencies:
304304
source:
305305
registry_url: https://components.espressif.com/
306306
type: service
307-
version: 1.0.4
307+
targets:
308+
- esp32s3
309+
version: 1.0.30
308310
espp/mt6701:
309-
component_hash: 62a3cda844e08f7d62e92d5db380b4980182965b6a4f6e3e72a515d5230f1141
311+
component_hash: 25664e665a80177e777d0a488e31892125ec0a3b3cd9d2f75c2c9793ed3e536d
310312
dependencies:
311313
- name: espp/base_peripheral
312314
registry_url: https://components.espressif.com
@@ -322,9 +324,9 @@ dependencies:
322324
source:
323325
registry_url: https://components.espressif.com/
324326
type: service
325-
version: 1.0.4
327+
version: 1.0.30
326328
espp/pid:
327-
component_hash: 6b2f5e3a5f424499ed85b65ea235d544e6963d20dcf3581096e4a9c0ed90cc52
329+
component_hash: 64299c9465f53d6093cd7da30b59965685683a3dcd8bebf3b5011bc5772d0bf3
328330
dependencies:
329331
- name: espp/base_component
330332
registry_url: https://components.espressif.com
@@ -336,9 +338,9 @@ dependencies:
336338
source:
337339
registry_url: https://components.espressif.com/
338340
type: service
339-
version: 1.0.4
341+
version: 1.0.30
340342
espp/task:
341-
component_hash: 87ee9724c85f353cdfdc8420c63b3c7d03852084adf2bd842f45308ab805e932
343+
component_hash: cd70ed978a323cd53b25862fc9b00a01eedaff32fbca8e422ae3ea921591d4c7
342344
dependencies:
343345
- name: espp/base_component
344346
registry_url: https://components.espressif.com
@@ -350,9 +352,9 @@ dependencies:
350352
source:
351353
registry_url: https://components.espressif.com
352354
type: service
353-
version: 1.0.4
355+
version: 1.0.30
354356
espp/timer:
355-
component_hash: 655bf9f6ec6209c5a62f293246b5e17d9db89787f78e33468a30f3ba941a8cf7
357+
component_hash: d73199de3cf51deb76bfb5887c79f59e42a44ea9ad5031d2deffaad2cbd0d7ec
356358
dependencies:
357359
- name: espp/task
358360
registry_url: https://components.espressif.com
@@ -364,21 +366,21 @@ dependencies:
364366
source:
365367
registry_url: https://components.espressif.com
366368
type: service
367-
version: 1.0.4
369+
version: 1.0.30
368370
espressif/esp-dsp:
369-
component_hash: ccfd6c9a7799cf66ee044d0239a0e9304431564495d80b3230083c58291a2a23
371+
component_hash: 42dce32d46ac93dc11f60d368e29a830e9661c7345d794b8a45c343479cae636
370372
dependencies:
371373
- name: idf
372374
require: private
373375
version: '>=4.2'
374376
source:
375377
registry_url: https://components.espressif.com
376378
type: service
377-
version: 1.6.4
379+
version: 1.7.0
378380
idf:
379381
source:
380382
type: idf
381-
version: 5.4.1
383+
version: 5.5.1
382384
direct_dependencies:
383385
- espp/bldc_driver
384386
- espp/bldc_haptics

0 commit comments

Comments
 (0)