Skip to content

Commit fe93ed1

Browse files
jason-maojason-mao
committed
Merge branch 'ci/support_idf_v5.5' into 'master'
feat(esp-idf): Support idf v5.5.1 See merge request adf/esp-adf-internal!1451
2 parents 6e79769 + c366c9f commit fe93ed1

File tree

114 files changed

+718
-167
lines changed

Some content is hidden

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

114 files changed

+718
-167
lines changed

‎.gitlab/ci/build-examples-v5-x.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
IDF_PATH: "$ADF_PATH/esp-idf"
1919
IDF_PATCH_DIR: "$ADF_PATH/idf_patches"
2020
SDKCFG_DEFAULTS: "sdkconfig.defaults.$IDF_TARGET"
21-
LATEST_IDF_VERSION: "v5.4"
21+
LATEST_IDF_VERSION: "v5.5.1"
2222
artifacts:
2323
paths:
2424
- "**/build*/size.json"
2525
- "**/build*/build_log.txt"
26-
- "**/build*/*.bin"
26+
- "**/build*/**/*.bin"
2727
# upload to s3 server to save the artifacts size
2828
# - "**/build*/*.map"
2929
# ttfw tests require elf files
@@ -74,13 +74,13 @@
7474
.matrix_template_esp32_s2_c3_s3: &matrix_template_esp32_s2_c3_s3
7575
parallel:
7676
matrix:
77-
- IDF_VERSION_TAG: ['v5.1', 'v5.2', 'v5.3', 'default']
77+
- IDF_VERSION_TAG: ['v5.1', 'v5.2', 'v5.3', 'v5.4', 'v5.5.1']
7878
parallel: [1/2, 2/2]
7979

8080
.matrix_template_c6_p4: &matrix_template_c6_p4
8181
parallel:
8282
matrix:
83-
- IDF_VERSION_TAG: ['default']
83+
- IDF_VERSION_TAG: ['v5.4', 'v5.5.1']
8484
parallel: [1/2, 2/2]
8585

8686
.build_examples_esp32_lyrat_v4_3:

‎.gitlab/ci/build-ut.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
.build_esp_adf_unit_test_template: &build_esp_adf_unit_test_template
1414
stage: build
15-
image: ciregistry.espressif.cn:8443/esp-env-v5.4:1
15+
image: ciregistry.espressif.cn:8443/esp-env-v5.5:3
1616
tags:
1717
- adf_build
1818
variables:
@@ -51,7 +51,7 @@ esp_adf_libs_components_test:
5151
- .rules:build:unit-test
5252
- .build_esp_adf_tests_make
5353
variables:
54-
IDF_VERSION_TAG: default
55-
IDF_TAG_FLAG: false
54+
IDF_VERSION_TAG: v5.5.1
55+
IDF_TAG_FLAG: true
5656
IDF_TARGET: esp32s3
5757
DEEP_CLONE: "true"

‎.gitlab/ci/rules.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,16 @@
7070
variables:
7171
IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.3:1"
7272

73-
.if-idf-version-tag-default: &if-idf-version-tag-default
74-
if: '$IDF_VERSION_TAG == "default"'
73+
.if-idf-version-tag-v5-4: &if-idf-version-tag-v5-4
74+
if: '$IDF_VERSION_TAG == "v5.4"'
7575
variables:
7676
IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.4:1"
7777

78+
.if-idf-version-tag-v5-5-1: &if-idf-version-tag-v5-5-1
79+
if: '$IDF_VERSION_TAG == "v5.5.1"'
80+
variables:
81+
IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.5:3"
82+
7883
.rules:build:enable-adf-example-test:
7984
rules:
8085
- <<: *if-open-merge-request
@@ -123,4 +128,5 @@
123128
- <<: *if-idf-version-tag-v5-1
124129
- <<: *if-idf-version-tag-v5-2
125130
- <<: *if-idf-version-tag-v5-3
126-
- <<: *if-idf-version-tag-default
131+
- <<: *if-idf-version-tag-v5-4
132+
- <<: *if-idf-version-tag-v5-5-1

‎.gitlab/ci/target-examples-test-v5-x.yml‎

Lines changed: 82 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@
3939
- pip install pytest pytest-embedded-idf pytest-embedded-serial-esp pytest-rerunfailures pytest-timeout
4040
- job_tags=$(python $ADF_PATH/tools/ci/gitlab_api.py get_job_tags $CI_PROJECT_ID --job_id $CI_JOB_ID)
4141
- markers=$(echo $job_tags | sed -e "s/,/ and /g")
42-
- echo $markers
42+
- eval $(python $ADF_PATH/tools/ci/apps_filter.py --target ${IDF_TARGET} --board ${AUDIO_BOARD} --idf_ver ${IDF_VERSION_TAG} --pytest-export)
43+
- test -n "$TEST_DIR" || exit 0
4344
- pytest $TEST_DIR --target ${IDF_TARGET} -m "${markers}" --junitxml=XUNIT_RESULT.xml --parallel-count 1 --parallel-index 1
4445
retry: 2
4546

4647
.pytest_examples_dir_template:
4748
extends:
4849
- .rules:build:enable-adf-example-test
4950
- .pytest_template
50-
variables:
51-
TEST_DIR: "$ADF_PATH/examples"
5251

5352
example_test_pytest_esp32_v5.1:
5453
extends:
5554
- .pytest_examples_dir_template
5655
variables:
5756
IDF_TARGET: esp32
5857
IDF_VERSION_TAG: v5.1
58+
AUDIO_BOARD: ESP_LYRAT_MINI_V1_1
5959
needs:
6060
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.1, 1/2]'
6161
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.1, 2/2]'
@@ -79,6 +79,7 @@ example_test_pytest_esp32s3_v5.1:
7979
variables:
8080
IDF_TARGET: esp32s3
8181
IDF_VERSION_TAG: v5.1
82+
AUDIO_BOARD: ESP32_S3_KORVO2_V3
8283
needs:
8384
- 'build_examples_esp32s3_korvo_v2: [v5.1, 1/2]'
8485
- 'build_examples_esp32s3_korvo_v2: [v5.1, 2/2]'
@@ -90,6 +91,7 @@ example_test_pytest_esp32_v5.2:
9091
variables:
9192
IDF_TARGET: esp32
9293
IDF_VERSION_TAG: v5.2
94+
AUDIO_BOARD: ESP_LYRAT_MINI_V1_1
9395
needs:
9496
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.2, 1/2]'
9597
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.2, 2/2]'
@@ -113,6 +115,7 @@ example_test_pytest_esp32s3_v5.2:
113115
variables:
114116
IDF_TARGET: esp32s3
115117
IDF_VERSION_TAG: v5.2
118+
AUDIO_BOARD: ESP32_S3_KORVO2_V3
116119
needs:
117120
- 'build_examples_esp32s3_korvo_v2: [v5.2, 1/2]'
118121
- 'build_examples_esp32s3_korvo_v2: [v5.2, 2/2]'
@@ -124,6 +127,7 @@ example_test_pytest_esp32_v5.3:
124127
variables:
125128
IDF_TARGET: esp32
126129
IDF_VERSION_TAG: v5.3
130+
AUDIO_BOARD: ESP_LYRAT_MINI_V1_1
127131
needs:
128132
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.3, 1/2]'
129133
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.3, 2/2]'
@@ -147,54 +151,106 @@ example_test_pytest_esp32s3_v5.3:
147151
variables:
148152
IDF_TARGET: esp32s3
149153
IDF_VERSION_TAG: v5.3
154+
AUDIO_BOARD: ESP32_S3_KORVO2_V3
150155
needs:
151156
- 'build_examples_esp32s3_korvo_v2: [v5.3, 1/2]'
152157
- 'build_examples_esp32s3_korvo_v2: [v5.3, 2/2]'
153158
tags: [ esp32s3, ADF_EXAMPLE_GENERIC ]
154159

155-
example_test_pytest_esp32_default:
160+
example_test_pytest_esp32_v5.4:
156161
extends:
157162
- .pytest_examples_dir_template
158163
variables:
159164
IDF_TARGET: esp32
160-
IDF_VERSION_TAG: default
165+
IDF_VERSION_TAG: v5.4
166+
AUDIO_BOARD: ESP_LYRAT_MINI_V1_1
161167
needs:
162-
- 'build_examples_esp32_lyrat_mini_v1_1: [default, 1/2]'
163-
- 'build_examples_esp32_lyrat_mini_v1_1: [default, 2/2]'
168+
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.4, 1/2]'
169+
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.4, 2/2]'
164170
tags: [ esp32, ADF_EXAMPLE_GENERIC ]
165171

166-
example_test_pytest_esp32s2_default:
172+
example_test_pytest_esp32s2_v5.4:
167173
extends:
168174
- .pytest_examples_dir_template
169175
variables:
170176
IDF_TARGET: esp32s2
171-
IDF_VERSION_TAG: default
177+
IDF_VERSION_TAG: v5.4
172178
AUDIO_BOARD: ESP32_S2_KALUGA_1_V1_2
173179
needs:
174-
- 'build_examples_esp32s2_kaluga_v1_2: [default, 1/2]'
175-
- 'build_examples_esp32s2_kaluga_v1_2: [default, 2/2]'
180+
- 'build_examples_esp32s2_kaluga_v1_2: [v5.4, 1/2]'
181+
- 'build_examples_esp32s2_kaluga_v1_2: [v5.4, 2/2]'
176182
tags: [ esp32s2, ADF_EXAMPLE_GENERIC ]
177183

178-
example_test_pytest_esp32s3_default:
184+
example_test_pytest_esp32s3_v5.4:
179185
extends:
180186
- .pytest_examples_dir_template
181187
variables:
182188
IDF_TARGET: esp32s3
183-
IDF_VERSION_TAG: default
189+
IDF_VERSION_TAG: v5.4
190+
AUDIO_BOARD: ESP32_S3_KORVO2_V3
184191
needs:
185-
- 'build_examples_esp32s3_korvo_v2: [default, 1/2]'
186-
- 'build_examples_esp32s3_korvo_v2: [default, 2/2]'
192+
- 'build_examples_esp32s3_korvo_v2: [v5.4, 1/2]'
193+
- 'build_examples_esp32s3_korvo_v2: [v5.4, 2/2]'
187194
tags: [ esp32s3, ADF_EXAMPLE_GENERIC ]
188195

189-
example_test_pytest_esp32p4_default:
196+
example_test_pytest_esp32p4_v5.4:
190197
extends:
191198
- .pytest_examples_dir_template
192199
variables:
193200
IDF_TARGET: esp32p4
194-
IDF_VERSION_TAG: default
201+
IDF_VERSION_TAG: v5.4
202+
AUDIO_BOARD: ESP32_P4_FUNCTION_EV
203+
needs:
204+
- 'build_examples_esp32p4_function_ev_board: [v5.4, 1/2]'
205+
- 'build_examples_esp32p4_function_ev_board: [v5.4, 2/2]'
206+
tags: [ esp32p4, ADF_EXAMPLE_GENERIC ]
207+
208+
example_test_pytest_esp32_v5.5.1:
209+
extends:
210+
- .pytest_examples_dir_template
211+
variables:
212+
IDF_TARGET: esp32
213+
IDF_VERSION_TAG: v5.5.1
214+
AUDIO_BOARD: ESP_LYRAT_MINI_V1_1
215+
needs:
216+
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.5.1, 1/2]'
217+
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.5.1, 2/2]'
218+
tags: [ esp32, ADF_EXAMPLE_GENERIC ]
219+
220+
example_test_pytest_esp32s2_v5.5.1:
221+
extends:
222+
- .pytest_examples_dir_template
223+
variables:
224+
IDF_TARGET: esp32s2
225+
IDF_VERSION_TAG: v5.5.1
226+
AUDIO_BOARD: ESP32_S2_KALUGA_1_V1_2
227+
needs:
228+
- 'build_examples_esp32s2_kaluga_v1_2: [v5.5.1, 1/2]'
229+
- 'build_examples_esp32s2_kaluga_v1_2: [v5.5.1, 2/2]'
230+
tags: [ esp32s2, ADF_EXAMPLE_GENERIC ]
231+
232+
example_test_pytest_esp32s3_v5.5.1:
233+
extends:
234+
- .pytest_examples_dir_template
235+
variables:
236+
IDF_TARGET: esp32s3
237+
IDF_VERSION_TAG: v5.5.1
238+
AUDIO_BOARD: ESP32_S3_KORVO2_V3
239+
needs:
240+
- 'build_examples_esp32s3_korvo_v2: [v5.5.1, 1/2]'
241+
- 'build_examples_esp32s3_korvo_v2: [v5.5.1, 2/2]'
242+
tags: [ esp32s3, ADF_EXAMPLE_GENERIC ]
243+
244+
example_test_pytest_esp32p4_v5.5.1:
245+
extends:
246+
- .pytest_examples_dir_template
247+
variables:
248+
IDF_TARGET: esp32p4
249+
IDF_VERSION_TAG: v5.5.1
250+
AUDIO_BOARD: ESP32_P4_FUNCTION_EV
195251
needs:
196-
- 'build_examples_esp32p4_function_ev_board: [default, 1/2]'
197-
- 'build_examples_esp32p4_function_ev_board: [default, 2/2]'
252+
- 'build_examples_esp32p4_function_ev_board: [v5.5.1, 1/2]'
253+
- 'build_examples_esp32p4_function_ev_board: [v5.5.1, 2/2]'
198254
tags: [ esp32p4, ADF_EXAMPLE_GENERIC ]
199255

200256
example_test_pytest_esp32_audio_loopback:
@@ -204,17 +260,21 @@ example_test_pytest_esp32_audio_loopback:
204260
variables:
205261
IDF_TARGET: esp32
206262
IDF_VERSION_TAG: v5.3
263+
AUDIO_BOARD: ESP_LYRAT_MINI_V1_1
207264
needs:
208265
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.3, 1/2]'
209266
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.3, 2/2]'
210-
- 'build_examples_esp32_lyrat_mini_v1_1: [default, 1/2]'
211-
- 'build_examples_esp32_lyrat_mini_v1_1: [default, 2/2]'
267+
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.4, 1/2]'
268+
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.4, 2/2]'
269+
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.5.1, 1/2]'
270+
- 'build_examples_esp32_lyrat_mini_v1_1: [v5.5.1, 2/2]'
212271
tags: [ esp32, AUDIO_LOOPBACK_ENV ]
213272
script:
214273
- export PYTHONPATH="/usr/local/lib/python3.9/dist-packages:$PYTHONPATH"
215274
- pip install pytest pytest-embedded-idf pytest-embedded-serial-esp pytest-rerunfailures pytest-timeout
216275
- arecord -l
217276
- job_tags=$(python $ADF_PATH/tools/ci/gitlab_api.py get_job_tags $CI_PROJECT_ID --job_id $CI_JOB_ID)
218277
- markers=$(echo $job_tags | sed -e "s/,/ and /g")
219-
- echo $markers
278+
- eval $(python $ADF_PATH/tools/ci/apps_filter.py --target ${IDF_TARGET} --board ${AUDIO_BOARD} --idf_ver ${IDF_VERSION_TAG} --pytest-export)
279+
- test -n "$TEST_DIR" || exit 0
220280
- pytest $TEST_DIR --target ${IDF_TARGET} -m "${markers}" --junitxml=XUNIT_RESULT.xml --parallel-count 1 --parallel-index 1

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ The ESP-IDF master branch is marked as not supported because the major feature c
3030
End of Life IDF branches are removed. See [IDF Supported Periods](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html#support-periods) for details.
3131

3232

33-
| | ESP-IDF <br> [Release/v5.0](https://docs.espressif.com/projects/esp-idf/zh_CN/release-v5.0/esp32/versions.html) | ESP-IDF <br> [Release/v5.1](https://docs.espressif.com/projects/esp-idf/zh_CN/release-v5.1/esp32/versions.html) | ESP-IDF <br> [Release/v5.2](https://docs.espressif.com/projects/esp-idf/zh_CN/release-v5.2/esp32/versions.html) | ESP-IDF <br> [Release/v5.3](https://docs.espressif.com/projects/esp-idf/zh_CN/release-v5.3/esp32/versions.html) | ESP-IDF <br> [Master](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32/versions.html) |
34-
|:----------- | :---------------------:|:---------------------: | :---------------------:| :---------------------:| :---------------------:|
35-
| ESP-ADF <br> Master | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/no-icon.png "not supported") |
36-
| ESP-ADF <br> Release/v2.7 | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/no-icon.png "not supported") |
37-
| ESP-ADF <br> Release/v2.6 | ![alt text](docs/_static/yes-checkm.png "supported")| ![alt text](docs/_static/yes-checkm.png "supported") |![alt text](docs/_static/no-icon.png "not supported") | ![alt text](docs/_static/no-icon.png "not supported") | ![alt text](docs/_static/no-icon.png "not supported") |
33+
| | ESP-IDF <br> [Release/v5.1](https://docs.espressif.com/projects/esp-idf/zh_CN/release-v5.1/esp32/versions.html) | ESP-IDF <br> [Release/v5.2](https://docs.espressif.com/projects/esp-idf/zh_CN/release-v5.2/esp32/versions.html) | ESP-IDF <br> [Release/v5.3](https://docs.espressif.com/projects/esp-idf/zh_CN/release-v5.3/esp32/versions.html) | ESP-IDF <br> [Release/v5.4](https://docs.espressif.com/projects/esp-idf/zh_CN/release-v5.4/esp32/versions.html) | ESP-IDF <br> [Release/v5.5](https://docs.espressif.com/projects/esp-idf/zh_CN/release-v5.5/esp32/versions.html) | ESP-IDF <br> [Master](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32/versions.html) |
34+
|:----------- |:---------------------: | :---------------------:| :---------------------:| :---------------------:| :---------------------:| :---------------------:|
35+
| ESP-ADF <br> Master | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") |![alt text](docs/_static/no-icon.png "not supported") |
36+
| ESP-ADF <br> Release/v2.7 | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/yes-checkm.png "supported") | ![alt text](docs/_static/no-icon.png "not supported") | ![alt text](docs/_static/no-icon.png "not supported") | ![alt text](docs/_static/no-icon.png "not supported") |
37+
| ESP-ADF <br> Release/v2.6 | ![alt text](docs/_static/yes-checkm.png "supported") |![alt text](docs/_static/no-icon.png "not supported") | ![alt text](docs/_static/no-icon.png "not supported") | ![alt text](docs/_static/no-icon.png "not supported") | ![alt text](docs/_static/no-icon.png "not supported") | ![alt text](docs/_static/no-icon.png "not supported") |
3838

3939

4040

‎components/esp-sr‎

Submodule esp-sr updated 247 files

‎examples/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ Compatibility of examples with Espressif audio boards is presented in tables bel
1212
## ESP32 Usage
1313

1414
- Start [CMake](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/build-system.html) build
15-
- Choose IDF branch at least [release/v5.0](https://github.com/espressif/esp-idf/tree/release/v5.0)
15+
- Choose IDF branch at least [release/v5.1](https://github.com/espressif/esp-idf/tree/release/v5.1)
1616

1717
## ESP32-S2 Usage
1818

1919
- Start [CMake](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-guides/build-system.html) build
20-
- Choose IDF branch at least [release/v5.0](https://github.com/espressif/esp-idf/tree/release/v5.0)
20+
- Choose IDF branch at least [release/v5.1](https://github.com/espressif/esp-idf/tree/release/v5.1)
2121

2222
## ESP32-S3 Usage
2323

2424
- Start [CMake](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-guides/build-system.html) build
25-
- Choose IDF branch at least [release/v5.0](https://github.com/espressif/esp-idf/tree/release/v5.0)
25+
- Choose IDF branch at least [release/v5.1](https://github.com/espressif/esp-idf/tree/release/v5.1)
2626

2727
## ESP32-C3 Usage
2828

2929
- Start [CMake](https://docs.espressif.com/projects/esp-idf/zh_CN/latest/esp32c3/api-guides/build-system.html) build
30-
- Choose IDF branch [release/v5.0](https://github.com/espressif/esp-idf/tree/release/v5.0) to build led_pixels
30+
- Choose IDF branch [release/v5.1](https://github.com/espressif/esp-idf/tree/release/v5.1) to build led_pixels
3131
- Choose IDF branch at least [release/v5.1](https://github.com/espressif/esp-idf/tree/release/v5.1) to build other examples
3232

3333
## ESP32-P4 Usage

‎examples/advanced_examples/audio_mixer_tone/main/audio_mixer_example.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ static void cli_setup_wifi()
356356
{
357357
ESP_LOGI(TAG, "Start Wi-Fi");
358358
periph_wifi_cfg_t wifi_cfg = {
359-
.disable_auto_reconnect = true,
359+
.disable_auto_reconnect = false,
360360
.wifi_config.sta.ssid = "",
361361
.wifi_config.sta.password = "",
362362
};

‎examples/advanced_examples/audio_mixer_tone/main/idf_component.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
dependencies:
22
espressif/esp_hosted:
3-
version: "~1.1"
3+
matches:
4+
- if: "idf_version <5.4.0"
5+
version: "~1.1"
6+
- if: "idf_version >=5.4.0"
7+
version: "^2.6.4"
48
rules:
59
- if: "target in [esp32p4]"
610
espressif/esp_wifi_remote:
711
matches:
8-
- if: "idf_version <=5.4.0 && target in [esp32p4]"
12+
- if: "idf_version <=5.4.0"
913
version: "~0.4"
10-
- if: "idf_version >5.4.0 && target in [esp32p4]"
14+
- if: "idf_version >5.4.0, <5.5.0"
1115
version: "~0.6"
16+
- if: "idf_version >=5.5.0"
17+
version: ">=0.10,<2.0"
18+
rules:
19+
- if: "target in [esp32p4]"

‎examples/advanced_examples/audio_mixer_tone/pytest_audio_mixer_tone.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
@pytest.mark.esp32
1717
@pytest.mark.esp32s3
1818
@pytest.mark.ADF_EXAMPLE_GENERIC
19-
def test_cli(dut: Dut)-> None:
19+
def test_audio_mixer_tone(dut: Dut)-> None:
2020
dut.expect(r'Returned from app_main', timeout=100)
2121

2222
dut.write('help')
2323
dut.expect(r'Get freertos all task states information')
2424

2525
dut.write('join Audio_CI esp123456')
26-
dut.expect(r'Got ip:')
26+
dut.expect(r'Got ip:', timeout=100)
2727

2828
dut.write('play file://sdcard/test.mp3#raw 1')
2929
dut.expect(r'ESP_AUDIO status is AEL_STATUS_STATE_RUNNING')

0 commit comments

Comments
 (0)