Skip to content

Commit 07b51b0

Browse files
committed
feat(wifi_remote): Support two wifi interfaces for esp-hosted backend
This adds support for an extra network interface on the host side (used for wifi-remote API if esp_wifi_remote is used on WiFi enabled chips)
1 parent cbdedb7 commit 07b51b0

File tree

12 files changed

+469
-18
lines changed

12 files changed

+469
-18
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ jobs:
4747
strategy:
4848
matrix:
4949
idf_ver: ["latest"]
50-
example: [ { app: host, path: "examples/mqtt", bin: "build_esp32p4_p4" } , { app: 2sta, path: "examples/two_stations", bin: "build_esp32s3_s3" }, { app: slave, path: "examples/server", bin: "build_esp32c6_c6" }]
50+
example:
51+
- { app: host, path: "examples/mqtt", bin: "build_esp32p4_p4" }
52+
- { app: host_1, path: "examples/mqtt", bin: "build_esp32p4_p4_1" }
53+
- { app: 2sta, path: "examples/two_stations", bin: "build_esp32s3_s3" }
54+
- { app: slave, path: "examples/server", bin: "build_esp32c6_c6" }
55+
- { app: slave_1, path: "examples/server", bin: "build_esp32c6_c6_1" }
5156

5257
runs-on: ubuntu-latest
5358
container: espressif/idf:${{ matrix.idf_ver }}
@@ -90,6 +95,9 @@ jobs:
9095
strategy:
9196
matrix:
9297
idf_ver: ["latest"]
98+
test_pair:
99+
- { p4: "build_esp32p4_p4", c6: "build_esp32c6_c6" }
100+
- { p4: "build_esp32p4_p4_1", c6: "build_esp32c6_c6_1" }
93101
runs-on: [self-hosted, wifi-remote]
94102
container:
95103
image: python:3.7-buster
@@ -100,18 +108,18 @@ jobs:
100108
- uses: actions/checkout@v4
101109
- uses: actions/download-artifact@v4
102110
with:
103-
name: eppp_${{ matrix.idf_ver }}_build_esp32p4_p4
111+
name: eppp_${{ matrix.idf_ver }}_${{ matrix.test_pair.p4 }}
104112
path: ${{ env.TEST_DIR }}/mqtt/
105113
- uses: actions/download-artifact@v4
106114
with:
107-
name: eppp_${{ matrix.idf_ver }}_build_esp32c6_c6
115+
name: eppp_${{ matrix.idf_ver }}_${{ matrix.test_pair.c6 }}
108116
path: ${{ env.TEST_DIR }}/server/
109117
- name: Run Test
110118
working-directory: ${{ env.TEST_DIR }}
111119
run: |
112120
python -m pip install pytest-embedded-serial-esp pytest-embedded-idf pytest-rerunfailures pytest-timeout pytest-ignore-test-results
113121
unzip server/artifacts.zip -d server/
114-
mv server/build_esp32c6_c6/ server/build/
122+
mv server/${{ matrix.test_pair.c6 }}/ server/build/
115123
unzip mqtt/artifacts.zip -d mqtt/
116-
mv mqtt/build_esp32p4_p4/ mqtt/build/
124+
mv mqtt/${{ matrix.test_pair.p4 }}/ mqtt/build/
117125
python -m pytest --log-cli-level DEBUG --target esp32p4,esp32c6

components/esp_wifi_remote/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ if(CONFIG_ESP_WIFI_REMOTE_LIBRARY_HOSTED)
4141
endif()
4242
endif()
4343

44+
if(CONFIG_ESP_WIFI_ENABLED OR CONFIG_ESP_HOST_WIFI_ENABLED)
45+
list(APPEND wifi_sources "esp_wifi_remote_net2.c")
46+
endif()
4447

4548
target_include_directories(${COMPONENT_LIB} PUBLIC ${IDF_VER_DIR}/include)
4649
target_sources(${COMPONENT_LIB} PRIVATE ${src_wifi_remote_weak}
@@ -56,6 +59,7 @@ endif()
5659

5760
target_link_libraries(${wifi} PUBLIC ${COMPONENT_LIB})
5861

62+
5963
if(CONFIG_ESP_WIFI_REMOTE_EAP_ENABLED)
6064
idf_component_optional_requires(PRIVATE wpa_supplicant)
6165
endif()

0 commit comments

Comments
 (0)