Merge pull request #69 from david-cermak/feat/two_stations_hosted

[v1.0]: Support local/remote coexistence

Author: david-cermak

.github/workflows/build.yml

@@ -47,7 +47,12 @@ jobs:
     strategy:
       matrix:
         idf_ver: ["latest"]
-        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" }]
+        example:
+          - { app: host, path: "examples/mqtt", bin: "build_esp32p4_p4" }
+          - { app: host_1, path: "examples/mqtt", bin: "build_esp32p4_p4_1" }
+          - { app: 2sta, path: "examples/two_stations", bin: "build_esp32s3_s3" }
+          - { app: slave, path: "examples/server", bin: "build_esp32c6_c6" }
+          - { app: slave_1, path: "examples/server", bin: "build_esp32c6_c6_1" }
 
     runs-on: ubuntu-latest
     container: espressif/idf:${{ matrix.idf_ver }}
@@ -90,6 +95,9 @@ jobs:
     strategy:
       matrix:
         idf_ver: ["latest"]
+        test_pair:
+          - { p4: "build_esp32p4_p4", c6: "build_esp32c6_c6" }
+          - { p4: "build_esp32p4_p4_1", c6: "build_esp32c6_c6_1" }
     runs-on: [self-hosted, wifi-remote]
     container:
       image: python:3.7-buster
@@ -100,18 +108,18 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
-          name: eppp_${{ matrix.idf_ver }}_build_esp32p4_p4
+          name: eppp_${{ matrix.idf_ver }}_${{ matrix.test_pair.p4 }}
           path: ${{ env.TEST_DIR }}/mqtt/
       - uses: actions/download-artifact@v4
         with:
-          name: eppp_${{ matrix.idf_ver }}_build_esp32c6_c6
+          name: eppp_${{ matrix.idf_ver }}_${{ matrix.test_pair.c6 }}
           path: ${{ env.TEST_DIR }}/server/
       - name: Run Test
         working-directory: ${{ env.TEST_DIR }}
         run: |
           python -m pip install pytest-embedded-serial-esp pytest-embedded-idf pytest-rerunfailures pytest-timeout pytest-ignore-test-results
           unzip server/artifacts.zip -d server/
-          mv server/build_esp32c6_c6/ server/build/
+          mv server/${{ matrix.test_pair.c6 }}/ server/build/
           unzip mqtt/artifacts.zip -d mqtt/
-          mv mqtt/build_esp32p4_p4/ mqtt/build/
+          mv mqtt/${{ matrix.test_pair.p4 }}/ mqtt/build/
           python -m pytest --log-cli-level DEBUG --target esp32p4,esp32c6

components/esp_wifi_remote/.cz.yaml

@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(wifi_remote): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py esp_wifi_remote
   tag_format: wifi_remote-v$version
-  version: 0.16.3
+  version: 1.0.0
   version_files:
   - idf_component.yml

components/esp_wifi_remote/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.0.0](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v1.0.0)
+
+### Features
+
+- Support two wifi interfaces for esp-hosted backend ([07b51b0](https://github.com/espressif/esp-wifi-remote/commit/07b51b0))
+
+### Bug Fixes
+
+- Update two-station example to set local/remote wifi on/off ([b4985aa](https://github.com/espressif/esp-wifi-remote/commit/b4985aa))
+- Make server CN configurable ([e5d3fb2](https://github.com/espressif/esp-wifi-remote/commit/e5d3fb2))
+- Update gitignore for external-components ([e8b5270](https://github.com/espressif/esp-wifi-remote/commit/e8b5270))
+
 ## [0.16.3](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v0.16.3)
 
 ### Bug Fixes

components/esp_wifi_remote/CMakeLists.txt

@@ -41,6 +41,9 @@ if(CONFIG_ESP_WIFI_REMOTE_LIBRARY_HOSTED)
     endif()
 endif()
 
+if(CONFIG_ESP_WIFI_ENABLED OR CONFIG_ESP_HOST_WIFI_ENABLED)
+    list(APPEND wifi_sources "esp_wifi_remote_net2.c")
+endif()
 
 target_include_directories(${COMPONENT_LIB} PUBLIC   ${IDF_VER_DIR}/include)
 target_sources(${COMPONENT_LIB}             PRIVATE  ${src_wifi_remote_weak}
@@ -56,6 +59,7 @@ endif()
 
 target_link_libraries(${wifi} PUBLIC ${COMPONENT_LIB})
 
+
 if(CONFIG_ESP_WIFI_REMOTE_EAP_ENABLED)
     idf_component_optional_requires(PRIVATE wpa_supplicant)
 endif()