Merge pull request #83 from david-cermak/update/v1.1.5

[v1.1.5]: Various changes on v5.4; v5.5; v6.0

Author: david-cermak

.github/workflows/build.yml

@@ -39,8 +39,8 @@ jobs:
           EXPECTED_WARNING: "Warning: Deprecated: Option"
         shell: bash
         run: |
+          ${IDF_PATH}/install.sh --enable-ci
           . ${IDF_PATH}/export.sh
-          pip install idf-component-manager idf-build-apps --upgrade
           python ./components/esp_wifi_remote/scripts/generate_slave_configs.py ./components/esp_wifi_remote/${{matrix.test.path}}
           python $GITHUB_WORKSPACE/protocols/ci/build_apps.py ./components/esp_wifi_remote/${{matrix.test.path}} -vv --preserve-all
 
@@ -79,8 +79,8 @@ jobs:
           EXPECTED_WARNING: "Warning: The smallest app partition is nearly full\nWarning: Deprecated: Option\n"
         shell: bash
         run: |
+          ${IDF_PATH}/install.sh --enable-ci
           . ${IDF_PATH}/export.sh
-          pip install idf-component-manager idf-build-apps --upgrade
           if [ "${{matrix.example.app}}" == "esp_hosted_slave" ]; then
             idf.py create-project-from-example "espressif/esp_hosted:slave"
             rm slave/sdkconfig.ci.*
@@ -112,7 +112,7 @@ jobs:
           - { p4: "build_esp32p4_hosted", c6: "build_esp32c6_hosted" }
     runs-on: [self-hosted, wifi-remote]
     container:
-      image: python:3.7-buster
+      image: python:3.11-bookworm
       options: --privileged # Privileged mode has access to serial ports
     env:
       TEST_DIR: components/esp_wifi_remote/examples

.github/workflows/build_at.yml

@@ -39,6 +39,7 @@ jobs:
           EXPECTED_WARNING: "Warning: Deprecated: Option"
         shell: bash
         run: |
+          $IDF_PATH/install.sh --enable-ci
           . ${IDF_PATH}/export.sh
           pip install idf-component-manager idf-build-apps --upgrade
           python $GITHUB_WORKSPACE/protocols/ci/build_apps.py ./components/wifi_remote_over_at/${{matrix.test.path}} -vv --preserve-all

.github/workflows/build_eppp.yml

@@ -39,8 +39,8 @@ jobs:
           EXPECTED_WARNING: "Warning: Deprecated: Option"
         shell: bash
         run: |
+          ${IDF_PATH}/install.sh --enable-ci
           . ${IDF_PATH}/export.sh
-          pip install idf-component-manager idf-build-apps --upgrade
           python $GITHUB_WORKSPACE/protocols/ci/build_apps.py ./components/wifi_remote_over_eppp/${{matrix.test.path}} -vv --preserve-all
           cd ./components/wifi_remote_over_eppp/${{matrix.test.path}}
           for dir in `ls -d build*/`; do

.github/workflows/smoke_compat.yml

@@ -23,8 +23,9 @@ jobs:
       - name: Check that headers are the same as generated
         shell: bash
         run: |
+          ${IDF_PATH}/install.sh --enable-ci
           . ${IDF_PATH}/export.sh
-          pip install idf-component-manager idf-build-apps --upgrade
+          echo "IDF commit SHA: $(cd ${IDF_PATH} && git rev-parse HEAD)"
           cp -r ./components/esp_wifi_remote ./components/esp_wifi_remote_base
           cd ./components/esp_wifi_remote/scripts
           python generate_and_check.py --base-dir ../../esp_wifi_remote_base
@@ -48,8 +49,8 @@ jobs:
       - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
         shell: bash
         run: |
+          ${IDF_PATH}/install.sh --enable-ci
           . ${IDF_PATH}/export.sh
-          pip install idf-component-manager idf-build-apps --upgrade
           export OVERRIDE_PATH=`pwd`/components/esp_wifi_remote
           echo ${OVERRIDE_PATH}
           if [ "${{matrix.test.app}}" = "wifi_enterprise" ]; then

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: 1.1.4
+  version: 1.1.5
   version_files:
   - idf_component.yml

components/esp_wifi_remote/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.1.5](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v1.1.5)
+
+### Bug Fixes
+
+- Fix issues when building the same file twice ([f195b64](https://github.com/espressif/esp-wifi-remote/commit/f195b64), [#84](https://github.com/espressif/esp-wifi-remote/issues/84))
+- Fix two-station example init issues ([2e7ae1b](https://github.com/espressif/esp-wifi-remote/commit/2e7ae1b))
+- Update per v6.0 changes ([12bff90](https://github.com/espressif/esp-wifi-remote/commit/12bff90))
+- Update per v5.4 changes ([88e1116](https://github.com/espressif/esp-wifi-remote/commit/88e1116))
+
 ## [1.1.4](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v1.1.4)
 
 ### Bug Fixes

components/esp_wifi_remote/CMakeLists.txt

@@ -1,15 +1,14 @@
 if(NOT CONFIG_ESP_WIFI_ENABLED AND NOT CONFIG_ESP_HOST_WIFI_ENABLED)
-    set(src_wifi_is_remote esp_wifi_remote.c esp_wifi_remote_net.c)
+    set(wifi_remote_sources esp_wifi_remote.c esp_wifi_remote_net.c)
+else()
+    set(wifi_remote_sources esp_wifi_remote_net2.c)
 endif()
 
 idf_component_register(INCLUDE_DIRS include
-                    SRCS ${src_wifi_is_remote}
-                         ${src_wifi_remote_eppp}
-                         dummy_src.c    # Prevents making this component potentially INTERFACE only
+                    SRCS ${wifi_remote_sources}
                     REQUIRES esp_event esp_netif
                     PRIV_REQUIRES esp_wifi esp-tls vfs)
 
-
 set(IDF_VER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")
 
 # Check if we're on tagged version of ESP-IDF and if we need to supply specific version
@@ -41,10 +40,6 @@ 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}
                                                      ${src_wifi_with_remote}

components/esp_wifi_remote/examples/two_stations/main/remote_station.c

@@ -45,6 +45,7 @@ static void event_handler_remote(void* arg, esp_event_base_t event_base,
 
 void wifi_init_remote_sta(void)
 {
+    s_wifi_event_group = xEventGroupCreate();
     esp_wifi_remote_create_default_sta();
 
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();

components/esp_wifi_remote/idf_component.yml

@@ -1,4 +1,4 @@
-version: 1.1.4
+version: 1.1.5
 url: https://github.com/espressif/esp-wifi-remote
 description: Utility wrapper for esp_wifi functionality on remote targets
 dependencies:

components/esp_wifi_remote/idf_v5.4/include/injected/esp_wifi.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */