fix(modem): Fix other clang-tidy warnings

.github/workflows/clang-tidy.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - test_clang_tidy
 
 jobs:
   build:
@@ -42,7 +42,7 @@ jobs:
           export PATH=$PWD:$PATH
           ./clang-tidy-sarif -o results.sarif.raw warnings.txt
           python3 filter_sarif.py -o results.sarif --include-prefix ${GITHUB_WORKSPACE}/ results.sarif.raw
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v2
         with:
           path: |
             warnings.txt

.github/workflows/examples_build-host-test.yml

@@ -14,17 +14,12 @@ jobs:
     strategy:
       matrix:
         idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3"]
-        include:
-          - idf_ver: "latest"
-            warning: "Warning: The smallest app partition is nearly full"
     runs-on: ubuntu-22.04
     container: espressif/idf:${{ matrix.idf_ver }}
     steps:
       - name: Checkout esp-protocols
         uses: actions/checkout@v4
       - name: Build with IDF-${{ matrix.idf_ver }}
-        env:
-          EXPECTED_WARNING: ${{ matrix.warning }}
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh

.github/workflows/mdns__host-tests.yml

@@ -10,30 +10,27 @@ on:
 jobs:
   host_test_mdns:
     if: contains(github.event.pull_request.labels.*.name, 'mdns') || github.event_name == 'push'
-    name: Host test build
+    name: Host test
     runs-on: ubuntu-22.04
-    container: espressif/idf:release-v5.3
+    container: espressif/idf:release-v5.1
 
     steps:
       - name: Checkout esp-protocols
         uses: actions/checkout@v4
         with:
-          path: protocols
+          path: esp-protocols
 
       - name: Build and Test
         shell: bash
         run: |
+          apt-get update && apt-get install -y dnsutils gcc g++
           . ${IDF_PATH}/export.sh
-          python -m pip install idf-build-apps dnspython pytest pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf
-          cd $GITHUB_WORKSPACE/protocols
-          # Build host tests app (with all configs and targets supported)
-          python ./ci/build_apps.py components/mdns/tests/host_test/
-          cd components/mdns/tests/host_test
-          # First run the linux_app and send a quick A query and a reverse query
-          ./build_linux_app/mdns_host.elf &
-          python dnsfixture.py A myesp.local --ip_only | xargs python dnsfixture.py X
-          # Next we run the pytest (using the console app)
-          pytest
+          cd $GITHUB_WORKSPACE/esp-protocols/components/mdns/tests/host_test
+          idf.py build
+          ./build/mdns_host.elf &
+          dig +short -p 5353 @224.0.0.251 myesp.local > ip.txt
+          cat ip.txt | xargs dig +short -p 5353 @224.0.0.251 -x
+          cat ip.txt
 
   build_afl_host_test_mdns:
     if: contains(github.event.pull_request.labels.*.name, 'mdns') || github.event_name == 'push'

.github/workflows/modem__target-test.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         idf_ver: ["latest"]
         idf_target: ["esp32c3"]
-        test: [ { app: pppd, path: test/target }, { app: pppd_chap_auth, path: test/target }, { app: sim800_c3, path: examples/pppos_client }, { app: sim800_cmux, path: examples/simple_cmux_client } ]
+        test: [ { app: pppd, path: test/target }, { app: sim800_c3, path: examples/pppos_client }, { app: sim800_cmux, path: examples/simple_cmux_client } ]
         include:
           - idf_ver: "latest"
             idf_target: "esp32s2"
@@ -58,7 +58,7 @@ jobs:
       matrix:
         idf_ver: ["latest"]
         idf_target: ["esp32c3"]
-        test: [ { app: pppd, path: test/target }, { app: pppd_chap_auth, path: test/target }, { app: sim800_c3, path: examples/pppos_client }, { app: sim800_cmux, path: examples/simple_cmux_client } ]
+        test: [ { app: pppd, path: test/target }, { app: sim800_c3, path: examples/pppos_client }, { app: sim800_cmux, path: examples/simple_cmux_client } ]
         include:
           - idf_ver: "latest"
             idf_target: "esp32s2"
@@ -69,11 +69,9 @@ jobs:
       - modem
     env:
       TEST_DIR: components/esp_modem/${{ matrix.test.path }}
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     steps:
       - name: Clear repository
-        run: |
-          sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE
+        run: sudo rm -fr $GITHUB_WORKSPACE && mkdir $GITHUB_WORKSPACE
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
         with:

.github/workflows/mosq__build.yml

@@ -1,72 +0,0 @@
-name: "mosq: build-tests"
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-
-jobs:
-  build_mosq:
-    if: contains(github.event.pull_request.labels.*.name, 'mosquitto') || github.event_name == 'push'
-    name: Mosquitto build
-    strategy:
-      matrix:
-        idf_ver: ["latest", "release-v5.3"]
-    runs-on: ubuntu-22.04
-    container: espressif/idf:${{ matrix.idf_ver }}
-    env:
-      TEST_DIR: components/mosquitto/examples/broker
-      TARGET_TEST_DIR: build_esp32_default
-    steps:
-      - name: Checkout esp-protocols
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Build with IDF-${{ matrix.idf_ver }}
-        shell: bash
-        run: |
-          . ${IDF_PATH}/export.sh
-          pip install idf-component-manager idf-build-apps --upgrade
-          python ci/build_apps.py ${TEST_DIR}
-          cd ${TEST_DIR}
-          ${GITHUB_WORKSPACE}/ci/clean_build_artifacts.sh `pwd`/${TARGET_TEST_DIR}
-          zip -qur artifacts.zip ${TARGET_TEST_DIR}
-      - uses: actions/upload-artifact@v4
-        with:
-          name: mosq_target_esp32_${{ matrix.idf_ver }}
-          path: ${{ env.TEST_DIR }}/artifacts.zip
-          if-no-files-found: error
-
-  test_mosq:
-    # Skip running on forks since it won't have access to secrets
-    if: |
-      github.repository == 'espressif/esp-protocols' &&
-      ( contains(github.event.pull_request.labels.*.name, 'mosquitto') || github.event_name == 'push' )
-    name: Mosquitto target test
-    needs: build_mosq
-    strategy:
-      matrix:
-        idf_ver: ["latest", "release-v5.3"]
-    runs-on:
-      - self-hosted
-      - ESP32-ETHERNET-KIT
-    env:
-      TEST_DIR: components/mosquitto/examples/broker
-      TARGET_TEST_DIR: build_esp32_default
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          name: mosq_target_esp32_${{ matrix.idf_ver }}
-          path: ${{ env.TEST_DIR }}/ci/
-      - name: Run Test
-        working-directory: ${{ env.TEST_DIR }}
-        run: |
-          unzip ci/artifacts.zip -d ci
-          for dir in `ls -d ci/build_*`; do
-          rm -rf build sdkconfig.defaults
-          mv $dir build
-          python -m pytest --log-cli-level DEBUG --junit-xml=./results_esp32_${{ matrix.idf_ver }}_${dir#"ci/build_"}.xml --target=esp32
-          done

.github/workflows/pre_commit_check.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Python environment
         uses: actions/setup-python@master
         with:
-          python-version: v3.8
+          python-version: v3.7
       - name: Install python packages
         run: |
           pip install pre-commit

.github/workflows/wifi_remote__build.yml

@@ -13,7 +13,7 @@ jobs:
     name: Check API compatibility of WiFi Remote
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.3"]
+        idf_ver: ["latest"]
     runs-on: ubuntu-20.04
     container: espressif/idf:${{ matrix.idf_ver }}
     steps:
@@ -24,16 +24,15 @@ jobs:
         run: |
           . ${IDF_PATH}/export.sh
           pip install idf-component-manager idf-build-apps --upgrade
-          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
+          python generate_and_check.py
 
   build_wifi_remote:
     if: contains(github.event.pull_request.labels.*.name, 'wifi_remote') || github.event_name == 'push'
     name: Build WiFi Remote Test
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.3"]
+        idf_ver: ["latest"]
         test: [ { app: smoke_test, path: "test/smoke_test" }]
     runs-on: ubuntu-20.04
     container: espressif/idf:${{ matrix.idf_ver }}
@@ -49,7 +48,6 @@ jobs:
         run: |
           . ${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 ./ci/build_apps.py ./components/esp_wifi_remote/${{matrix.test.path}} -vv --preserve-all
 
   build_wifi_remote_example:
@@ -77,36 +75,3 @@ jobs:
           . ${IDF_PATH}/export.sh
           pip install idf-component-manager idf-build-apps --upgrade
           python ./ci/build_apps.py ./components/esp_wifi_remote/${{matrix.example.path}} -vv --preserve-all
-
-  build_idf_examples_with_wifi_remote:
-    if: contains(github.event.pull_request.labels.*.name, 'wifi_remote') || github.event_name == 'push'
-    name: Build IDF examples with WiFi Remote
-    strategy:
-      matrix:
-        idf_ver: ["latest", "release-v5.3"]
-        idf_target: ["esp32p4", "esp32h2", "esp32s3"]
-        test: [ { app: idf_mqtt_example, path: "examples/protocols/mqtt/tcp" }]
-    runs-on: ubuntu-20.04
-    container: espressif/idf:${{ matrix.idf_ver }}
-    steps:
-      - name: Checkout esp-protocols
-        uses: actions/checkout@v3
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-            key: ${{ matrix.idf_ver }}
-      - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
-        shell: bash
-        run: |
-          . ${IDF_PATH}/export.sh
-          pip install idf-component-manager idf-build-apps --upgrade
-          export OVERRIDE_PATH=`pwd`/components/esp_wifi_remote
-          echo ${OVERRIDE_PATH}
-          sed -i '/espressif\/esp_wifi_remote:/a \ \ \ \ override_path: "${OVERRIDE_PATH}"' ${IDF_PATH}/${{matrix.test.path}}/main/idf_component.yml
-          cat ${IDF_PATH}/${{matrix.test.path}}/main/idf_component.yml
-          export PEDANTIC_FLAGS="-DIDF_CI_BUILD -Werror -Werror=deprecated-declarations -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function"
-          export EXTRA_CFLAGS="${PEDANTIC_FLAGS} -Wstrict-prototypes"
-          export EXTRA_CXXFLAGS="${PEDANTIC_FLAGS}"
-          cd ${IDF_PATH}/${{matrix.test.path}}
-          idf-build-apps find --config sdkconfig.ci* -vv --target ${{ matrix.idf_target }}
-          idf-build-apps build --config sdkconfig.ci* -vv --target ${{ matrix.idf_target }}

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "components/asio/asio"]
 	path = components/asio/asio
 	url = https://github.com/espressif/asio
-[submodule "components/mosquitto/mosquitto"]
-	path = components/mosquitto/mosquitto
-	url = https://github.com/eclipse/mosquitto

.pre-commit-config.yaml

@@ -48,7 +48,7 @@ repos:
       - id: check-copyright
         args: ['--ignore', 'ci/check_copyright_ignore.txt', '--config', 'ci/check_copyright_config.yaml']
   - repo: https://github.com/igrr/astyle_py.git
-    rev: v1.0.5
+    rev: c0013808882a15a0c0c2c1a9b5c903866c53a653
     hooks:
     -   id: astyle_py
         args: ['--style=otbs', '--attach-namespaces', '--attach-classes', '--indent=spaces=4', '--convert-tabs', '--align-pointer=name', '--align-reference=name', '--keep-one-line-statements', '--pad-header', '--pad-oper', '--exclude-list=ci/ignore_astyle.txt']
@@ -62,7 +62,7 @@ repos:
     hooks:
       - id: commit message scopes
         name: "commit message must be scoped with: mdns, modem, websocket, asio, mqtt_cxx, console, common, eppp, wifi_remote, tls_cxx"
-        entry: '\A(?!(feat|fix|ci|bump|test|docs)\((mdns|modem|common|console|websocket|asio|mqtt_cxx|examples|eppp|wifi_remote|tls_cxx|mosq)\)\:)'
+        entry: '\A(?!(feat|fix|ci|bump|test|docs)\((mdns|modem|common|console|websocket|asio|mqtt_cxx|examples|eppp|wifi_remote|tls_cxx)\)\:)'
         language: pygrep
         args: [--multiline]
         stages: [commit-msg]

ci/build_apps.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 """
 This file is used in CI for esp-protocols build tests
@@ -10,6 +10,8 @@ import sys
 
 from idf_build_apps import build_apps, find_apps, setup_logging
 from idf_build_apps.constants import SUPPORTED_TARGETS
+from packaging import version
+from pkg_resources import get_distribution
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(
@@ -49,24 +51,43 @@ if __name__ == '__main__':
         SUPPORTED_TARGETS.append('linux')
         ignore_warning = 'warning: '  # Ignore all common warnings on linux builds
     setup_logging(2)
-    apps = find_apps(
-        args.paths,
-        recursive=args.recursive,
-        target=args.target,
-        build_dir='build_@t_@w',
-        config_rules_str=args.rules,
-        build_log_filename='build_log.txt',
-        size_json_filename='size.json' if not args.linux else None,
-        check_warnings=True,
-        manifest_files=args.manifests,
-        default_build_targets=SUPPORTED_TARGETS,
-        manifest_rootpath='.',
-    )
+    if version.parse(get_distribution('idf_build_apps').version) >= version.parse('2.0.0'):
+        apps = find_apps(
+            args.paths,
+            recursive=args.recursive,
+            target=args.target,
+            build_dir='build_@t_@w',
+            config_rules_str=args.rules,
+            build_log_filename='build_log.txt',
+            size_json_filename='size.json' if not args.linux else None,
+            check_warnings=True,
+            preserve=not args.delete,
+            manifest_files=args.manifests,
+            default_build_targets=SUPPORTED_TARGETS,
+            manifest_rootpath='.',
+        )
+    else:
+        apps = find_apps(
+            args.paths,
+            recursive=args.recursive,
+            target=args.target,
+            build_dir='build_@t_@w',
+            config_rules_str=args.rules,
+            build_log_path='build_log.txt',
+            size_json_path='size.json' if not args.linux else None,
+            check_warnings=True,
+            preserve=not args.delete,
+            manifest_files=args.manifests,
+            default_build_targets=SUPPORTED_TARGETS,
+            manifest_rootpath='.',
+        )
+
+    for app in apps:
+        print(app)
 
     sys.exit(
         build_apps(apps,
                    dry_run=False,
                    keep_going=False,
-                   no_preserve=args.delete,
                    ignore_warning_strs=ignore_warning)
     )

ci/check_copyright_config.yaml

@@ -47,13 +47,6 @@ asio_component:
     - Apache-2.0
     - BSL-1.0
 
-mosquitto_component:
-  include:
-    - 'components/mosquitto/port/**'
-  allowed_licenses:
-    - EPL-2.0
-    - Apache-2.0
-
 slim_modem_examples:
   include:
     - 'examples/esp_netif/slip_custom_netif/**'

ci/detect_component_bump

@@ -22,11 +22,7 @@ if git log -1 -m --name-only --pretty="" | grep -q components/${comp}/idf_compon
     if [ $(git tag -l "$tag") ]; then
         echo "${comp}: version (${tag}) already exits"
     else
-        # skip components that do not have changelog
-        [ -f components/${comp}/CHANGELOG.md ] || continue
-
         echo "${comp}: Component version has been updated to ${version}"
-
         # creates release notes from the last entry (between first two "## sections")
         awk '/^## \[/{a++};{if(a==1){print}}' components/${comp}/CHANGELOG.md > release_notes.md
 

common_components/linux_compat/esp_ringbuf/CMakeLists.txt

@@ -1 +0,0 @@
-idf_component_register()

common_components/linux_compat/freertos/freertos_linux.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,24 +12,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "osal/osal_api.h"
-#include <semaphore.h>
-
-typedef struct task_notifiers {
-    sem_t sem;
-    TaskHandle_t id;
-} task_notifiers_t;
-
-typedef struct pthread_params {
-    void *const param;
-    TaskFunction_t task;
-    bool started;
-    TaskHandle_t handle;
-} pthread_params_t;
 
 static uint64_t s_semaphore_data = 0;
-static task_notifiers_t *s_notifiers;
-static int s_threads = 0;
-pthread_mutex_t s_mutex;
 
 typedef enum queue_type_tag {
     MUTEX_REC,
@@ -105,7 +89,6 @@ BaseType_t xSemaphoreGiveRecursive( QueueHandle_t xQueue)
     }
     return pdFALSE;
 }
-
 BaseType_t xSemaphoreTake( QueueHandle_t xQueue, TickType_t pvTask )
 {
     struct generic_queue_handle *h = xQueue;
@@ -116,6 +99,7 @@ BaseType_t xSemaphoreTake( QueueHandle_t xQueue, TickType_t pvTask )
     return xQueueReceive(xQueue, &s_semaphore_data, portMAX_DELAY);
 }
 
+
 BaseType_t xSemaphoreTakeRecursive( QueueHandle_t xQueue, TickType_t pvTask )
 {
     struct generic_queue_handle *h = xQueue;
@@ -126,6 +110,9 @@ BaseType_t xSemaphoreTakeRecursive( QueueHandle_t xQueue, TickType_t pvTask )
     return pdFALSE;
 }
 
+
+
+
 void vQueueDelete( QueueHandle_t xQueue )
 {
     struct generic_queue_handle *h = xQueue;
@@ -141,7 +128,8 @@ void vQueueDelete( QueueHandle_t xQueue )
 
 QueueHandle_t xSemaphoreCreateBinary(void)
 {
-    return xQueueCreate(1, 1);
+    QueueHandle_t sempaphore =  xQueueCreate(1, 1);
+    return sempaphore;
 }
 
 QueueHandle_t xSemaphoreCreateMutex(void)
@@ -157,13 +145,6 @@ QueueHandle_t xSemaphoreCreateRecursiveMutex(void)
 
 void vTaskDelete(TaskHandle_t *task)
 {
-    for (int i = 0; i < s_threads; ++i) {
-        if (task == s_notifiers[i].id) {
-            sem_destroy(&s_notifiers[i].sem);
-            s_notifiers[i].id = 0;
-        }
-    }
-
     if (task == NULL) {
         pthread_exit(0);
     }
@@ -190,21 +171,14 @@ void vTaskDelay( const TickType_t xTicksToDelay )
 
 void *pthread_task(void *params)
 {
-    pthread_params_t *pthread_params = params;
+    struct {
+        void *const param;
+        TaskFunction_t task;
+        bool started;
+    } *pthread_params = params;
 
     void *const param = pthread_params->param;
     TaskFunction_t task = pthread_params->task;
-
-    pthread_params->handle = xTaskGetCurrentTaskHandle();
-    if (s_threads == 0) {
-        pthread_mutex_init(&s_mutex, NULL);
-    }
-    pthread_mutex_lock(&s_mutex);
-    s_notifiers = realloc(s_notifiers, sizeof(struct task_notifiers) * (++s_threads));
-    assert(s_notifiers);
-    s_notifiers[s_threads - 1].id = pthread_params->handle;
-    sem_init(&s_notifiers[s_threads - 1].sem, 0, 0);
-    pthread_mutex_unlock(&s_mutex);
     pthread_params->started = true;
 
     task(param);
@@ -224,12 +198,16 @@ BaseType_t xTaskCreatePinnedToCore( TaskFunction_t pvTaskCode,
     return pdTRUE;
 }
 
+
 BaseType_t xTaskCreate(TaskFunction_t pvTaskCode, const char *const pcName, const uint32_t usStackDepth, void *const pvParameters, UBaseType_t uxPriority, TaskHandle_t *const pvCreatedTask)
 {
     pthread_t new_thread = (pthread_t)NULL;
     pthread_attr_t attr;
-    pthread_params_t pthread_params = { .param = pvParameters, .task = pvTaskCode};
-
+    struct {
+        void *const param;
+        TaskFunction_t task;
+        bool started;
+    } pthread_params = { .param = pvParameters, .task = pvTaskCode};
     int res = pthread_attr_init(&attr);
     assert(res == 0);
     res = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
@@ -237,33 +215,20 @@ BaseType_t xTaskCreate(TaskFunction_t pvTaskCode, const char *const pcName, cons
     res = pthread_create(&new_thread, &attr, pthread_task, &pthread_params);
     assert(res == 0);
 
+    if (pvCreatedTask) {
+        *pvCreatedTask = (void *)new_thread;
+    }
+
     // just wait till the task started so we can unwind params from the stack
     while (pthread_params.started == false) {
         usleep(1000);
     }
-    if (pvCreatedTask) {
-        *pvCreatedTask = pthread_params.handle;
-    }
-
     return pdTRUE;
 }
 
 void xTaskNotifyGive(TaskHandle_t task)
 {
-    int i = 0;
-    while (true) {
-        pthread_mutex_lock(&s_mutex);
-        if (task == s_notifiers[i].id) {
-            sem_post(&s_notifiers[i].sem);
-            pthread_mutex_unlock(&s_mutex);
-            return;
-        }
-        pthread_mutex_unlock(&s_mutex);
-        if (++i == s_threads) {
-            i = 0;
-        }
-        usleep(1000);
-    }
+
 }
 
 BaseType_t xTaskNotifyWait(uint32_t bits_entry_clear, uint32_t bits_exit_clear, uint32_t *value, TickType_t wait_time )
@@ -273,7 +238,7 @@ BaseType_t xTaskNotifyWait(uint32_t bits_entry_clear, uint32_t bits_exit_clear,
 
 TaskHandle_t xTaskGetCurrentTaskHandle(void)
 {
-    return (TaskHandle_t)pthread_self();
+    return NULL;
 }
 
 EventGroupHandle_t xEventGroupCreate( void )
@@ -305,22 +270,3 @@ EventBits_t xEventGroupWaitBits( EventGroupHandle_t xEventGroup, const EventBits
 {
     return osal_signal_wait(xEventGroup, uxBitsToWaitFor, xWaitForAllBits, xTicksToWait);
 }
-
-void ulTaskNotifyTake(bool clear_on_exit, uint32_t xTicksToWait)
-{
-    TaskHandle_t task = xTaskGetCurrentTaskHandle();
-    int i = 0;
-    while (true) {
-        pthread_mutex_lock(&s_mutex);
-        if (task == s_notifiers[i].id) {
-            pthread_mutex_unlock(&s_mutex);
-            sem_wait(&s_notifiers[i].sem);
-            return;
-        }
-        pthread_mutex_unlock(&s_mutex);
-        if (++i == s_threads) {
-            i = 0;
-        }
-        usleep(1000);
-    }
-}

common_components/linux_compat/freertos/include/freertos/FreeRTOS.h

@@ -5,7 +5,6 @@
  */
 #pragma once
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>

common_components/linux_compat/freertos/include/freertos/list.h

@@ -1,6 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Unlicense OR CC0-1.0
- */
-#pragma once

common_components/linux_compat/freertos/include/freertos/task.h

@@ -11,7 +11,6 @@
 extern "C" {
 #endif
 
-#define tskNO_AFFINITY      ( ( BaseType_t ) 0x7FFFFFFF )
 #define TaskHandle_t TaskHandle_t
 #define vSemaphoreDelete( xSemaphore ) vQueueDelete( ( QueueHandle_t ) ( xSemaphore ) )
 
@@ -19,8 +18,6 @@ void vTaskDelay( const TickType_t xTicksToDelay );
 
 void xTaskNotifyGive(TaskHandle_t task);
 
-void ulTaskNotifyTake(bool stuff, uint32_t timeout);
-
 TaskHandle_t xTaskGetCurrentTaskHandle(void);
 
 BaseType_t xTaskNotifyWait(uint32_t bits_entry_clear, uint32_t bits_exit_clear, uint32_t *value, TickType_t wait_time );

components/console_cmd_ping/.cz.yaml

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

components/console_cmd_ping/CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## [1.1.0](https://github.com/espressif/esp-protocols/commits/console_cmd_ping-v1.1.0)
-
-### Features
-
-- Added command getaddrinfo, set/get dnsserver to console_cmd_ping ([b80c19d7](https://github.com/espressif/esp-protocols/commit/b80c19d7))
-
 ## [1.0.0](https://github.com/espressif/esp-protocols/commits/console_cmd_ping-v1.0.0)
 
 ### Features

components/console_cmd_ping/CMakeLists.txt

@@ -1,10 +1,4 @@
-idf_component_register(SRCS "console_ping.c" "console_getaddrinfo.c" "console_getsetdnsserver.c"
+idf_component_register(SRCS "console_ping.c"
                     INCLUDE_DIRS "."
-                    PRIV_REQUIRES esp_netif console)
-
-if(CONFIG_PING_CMD_AUTO_REGISTRATION)
-    target_link_libraries(${COMPONENT_LIB} "-u console_cmd_ping_register")
-    target_link_libraries(${COMPONENT_LIB} "-u console_cmd_getaddrinfo_register")
-    target_link_libraries(${COMPONENT_LIB} "-u console_cmd_setdnsserver_register")
-    target_link_libraries(${COMPONENT_LIB} "-u console_cmd_getdnsserver_register")
-endif()
+                    PRIV_REQUIRES esp_netif console
+                    WHOLE_ARCHIVE)

components/console_cmd_ping/Kconfig.projbuild

@@ -1,9 +0,0 @@
-menu "Ping command Configuration"
-
-    config PING_CMD_AUTO_REGISTRATION
-        bool "Enable Console command ping/dns Auto-registration"
-        default y
-        help
-            Enabling this allows for the autoregistration of the ping and dns commands.
-
-endmenu

components/console_cmd_ping/README.md

@@ -1,5 +1,5 @@
-# Console command ping and DNS server configuration
-The component provides a console where the 'ping' command, 'getaddrinfo', and DNS server configuration commands can be executed.
+# Console command ping
+The component provides a console where the 'ping' command can be executed.
 
 ## API
 
@@ -27,11 +27,8 @@ The component provides a console where the 'ping' command, 'getaddrinfo', and DN
     // Register all plugin command added to your project
     ESP_ERROR_CHECK(console_cmd_all_register());
 
-    // To register only ping/dns command skip calling console_cmd_all_register()
+    // To register only ifconfig command skip calling console_cmd_all_register()
     ESP_ERROR_CHECK(console_cmd_ping_register());
-    ESP_ERROR_CHECK(console_cmd_getaddrinfo_register());
-    ESP_ERROR_CHECK(console_cmd_setdnsserver_register());
-    ESP_ERROR_CHECK(console_cmd_getdnsserver_register());
 
     ESP_ERROR_CHECK(console_cmd_start());    // Start console
     ```
@@ -39,8 +36,6 @@ The component provides a console where the 'ping' command, 'getaddrinfo', and DN
 ### Adding a plugin command or component:
 To add a plugin command or any component from IDF component manager into your project, simply include an entry within the `idf_component.yml` file.
 
-Note: **Auto-registration** of a specific plugin command can be disabled from menuconfig.
-
 For more details refer [IDF Component Manager](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-component-manager.html)
 
 
@@ -57,72 +52,4 @@ ping  [-W <t>] [-i <t>] [-s <n>] [-c <n>] [-Q <n>] [-T <n>] <host>
   -Q, --tos=<n>  Set Type of Service related bits in IP datagrams
   -T, --ttl=<n>  Set Time to Live related bits in IP datagrams
         <host>  Host address
-
-getaddrinfo  [-f <AF>] [-F <FLAGS>]... [-p <port>] <hostname>
-  Usage: getaddrinfo [options] <hostname> [service]
-  -f, --family=<AF>  Address family (AF_INET, AF_INET6, AF_UNSPEC).
-  -F, --flags=<FLAGS>  Special flags (AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST, AI_V4MAPPED, AI_ALL).
-  -p, --port=<port>  String containing a numeric port number.
-    <hostname>  Host address
-
-setdnsserver  <main> [backup] [fallback]
-  Usage: setdnsserver <main> [backup] [fallback]
-        <main>  The main DNS server IP address.
-        backup  The secondary DNS server IP address (optional).
-      fallback  The fallback DNS server IP address (optional).
-
-getdnsserver
-  Usage: getdnsserver
-```
-These commands allow you to configure and retrieve DNS server settings on your ESP32 device, in addition to the existing ping functionality.
-
-## Usage
-### Using the setdnsserver command:
-1. To set the main DNS server:
-```
-setdnsserver 8.8.8.8
-```
-
-2. To set the main and backup DNS servers:
-
-```
-setdnsserver 8.8.8.8 fe80::b0be:83ff:fe77:dd64
-```
-
-3. To set the main, backup, and fallback DNS servers:
-
-```
-setdnsserver 8.8.8.8 fe80::b0be:83ff:fe77:dd64 www.xyz.com
-```
-
-### Using the getdnsserver command:
-To get the current DNS server settings:
-```
-getdnsserver
-```
-
-### Using the getaddrinfo command:
-1. To get address information for a hostname:
-
-```
-getaddrinfo www.example.com
-```
-
-2. To specify additional options:
-
-```
-getaddrinfo -f AF_INET -F AI_PASSIVE www.example.com
-```
-
-### Using the ping command:
-1. To ping a host:
-
-```
-ping www.example.com
-```
-
-2. To specify additional options, such as timeout, interval, packet size, etc.:
-
-```
-ping -W 5 -i 1 -s 64 -c 4 -Q 0x10 -T 64 www.example.com
 ```

components/console_cmd_ping/console_getaddrinfo.c

@@ -1,180 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <stdio.h>
-#include <string.h>
-#include "sdkconfig.h"
-#include "lwip/inet.h"
-#include "lwip/netdb.h"
-#include "lwip/sockets.h"
-#include "esp_console.h"
-#include "esp_log.h"
-#include "argtable3/argtable3.h"
-#include <netdb.h>
-#include "console_ping.h"
-
-
-static const char *TAG = "console_getaddrinfo";
-
-#if CONFIG_PING_CMD_AUTO_REGISTRATION
-/**
- * @brief  Static registration of the getaddrinfo command plugin.
- *
- * This section registers the plugin description structure and places it into
- * the .console_cmd_desc section, as determined by the linker.lf file in the
- * 'plugins' component.
- */
-static const console_cmd_plugin_desc_t __attribute__((section(".console_cmd_desc"), used)) PLUGIN = {
-    .name = "console_cmd_getddrinfo",
-    .plugin_regd_fn = &console_cmd_getaddrinfo_register
-};
-#endif
-
-/**
- * @brief Structure to hold arguments for the getaddrinfo command.
- */
-static struct {
-    struct arg_str *family;
-    struct arg_str *flags;
-    struct arg_str *port_nr;
-    struct arg_str *hostname;
-    struct arg_end *end;
-} getddrinfo_args;
-
-/**
- * @brief Executes the getaddrinfo command.
- *
- * This function parses arguments, sets hints for address resolution, and calls
- * getaddrinfo to resolve the hostname. It then prints the resolved IP addresses
- * and associated information.
- *
- * @param argc Argument count
- * @param argv Argument vector
- *
- * @return int Returns 0 on success, 1 on error.
- */
-static int do_getddrinfo_cmd(int argc, char **argv)
-{
-    char ip_str[INET6_ADDRSTRLEN];
-    struct addrinfo hint = {0};
-    struct addrinfo *res = NULL, *res_tmp = NULL;
-    const char *port_nr_str = NULL;
-    int ret = 0;
-
-    int nerrors = arg_parse(argc, argv, (void **)&getddrinfo_args);
-    if (nerrors != 0) {
-        arg_print_errors(stderr, getddrinfo_args.end, argv[0]);
-        return 1;
-    }
-
-    /* Set the address family */
-    if (getddrinfo_args.family->count > 0) {
-        if (strcmp(getddrinfo_args.family->sval[0], "AF_INET") == 0) {
-            hint.ai_family = AF_INET;
-        } else if (strcmp(getddrinfo_args.family->sval[0], "AF_INET6") == 0) {
-            hint.ai_family = AF_INET6;
-        } else if (strcmp(getddrinfo_args.family->sval[0], "AF_UNSPEC") == 0) {
-            hint.ai_family = AF_UNSPEC;
-        } else {
-            ESP_LOGE(TAG, "Unknown family");
-            return 1;
-        }
-    }
-
-    /* Set the flags */
-    if (getddrinfo_args.flags->count > 0) {
-        for (int i = 0; i < getddrinfo_args.flags->count; i++) {
-            if (strcmp(getddrinfo_args.flags->sval[i], "AI_PASSIVE") == 0) {
-                hint.ai_flags |= AI_PASSIVE;
-            } else if (strcmp(getddrinfo_args.flags->sval[i], "AI_CANONNAME") == 0) {
-                hint.ai_flags |= AI_CANONNAME;
-            } else if (strcmp(getddrinfo_args.flags->sval[i], "AI_NUMERICHOST") == 0) {
-                hint.ai_flags |= AI_NUMERICHOST;
-            } else if (strcmp(getddrinfo_args.flags->sval[i], "AI_V4MAPPED") == 0) {
-                hint.ai_flags |= AI_V4MAPPED;
-            } else if (strcmp(getddrinfo_args.flags->sval[i], "AI_ALL") == 0) {
-                hint.ai_flags |= AI_ALL;
-            } else {
-                ESP_LOGE(TAG, "Unknown flag: %s", getddrinfo_args.flags->sval[i]);
-                return 1;
-            }
-        }
-    }
-
-    if (getddrinfo_args.port_nr->count > 0) {
-        port_nr_str = getddrinfo_args.port_nr->sval[0];
-    }
-
-    /* Convert hostname to IP address */
-    if (!strcmp(getddrinfo_args.hostname->sval[0], "NULL")) {
-        ret = getaddrinfo(NULL, port_nr_str, &hint, &res);
-    } else {
-        ret = getaddrinfo(getddrinfo_args.hostname->sval[0], port_nr_str, &hint, &res);
-    }
-
-    if (ret != 0) {
-        printf("getddrinfo: Failure host:%s(ERROR: %d)\n", getddrinfo_args.hostname->sval[0], ret);
-        ESP_LOGE(TAG, "Failure host");
-        return 1;
-    }
-
-    /* Iterate through the results from getaddrinfo */
-    for (res_tmp = res; res_tmp != NULL; res_tmp = res_tmp->ai_next) {
-
-        if (res_tmp->ai_family == AF_INET) {
-            inet_ntop(AF_INET, &((struct sockaddr_in *)res_tmp->ai_addr)->sin_addr, ip_str, INET_ADDRSTRLEN);
-            printf("\tIP Address: %s\n", ip_str);
-            printf("\tAddress Family: AF_INET\n");
-        } else if (res_tmp->ai_family == AF_INET6) {
-            inet_ntop(AF_INET6, &((struct sockaddr_in6 *)res_tmp->ai_addr)->sin6_addr, ip_str, INET6_ADDRSTRLEN);
-            printf("\tIP Address: %s\n", ip_str);
-            printf("\tAddress Family: AF_INET6\n");
-        } else {
-            ESP_LOGE(TAG, "ai_family Unknown: %d\n", res_tmp->ai_family);
-        }
-
-        /* Print the protocol used */
-        printf("\tProtocol: %d\n", res_tmp->ai_protocol);
-
-        /* Print the canonical name if available */
-        if (res_tmp->ai_canonname) {
-            printf("\tCanonical Name: %s\n", res_tmp->ai_canonname);
-        }
-    }
-
-    freeaddrinfo(res);
-
-    return 0;
-}
-
-/**
- * @brief Registers the getaddrinfo command.
- *
- * @return esp_err_t Returns ESP_OK on success, or an error code on failure.
- */
-esp_err_t console_cmd_getaddrinfo_register(void)
-{
-    esp_err_t ret;
-
-    getddrinfo_args.family = arg_str0("f", "family", "<AF>", "Address family (AF_INET, AF_INET6, AF_UNSPEC).");
-    getddrinfo_args.flags = arg_strn("F", "flags", "<FLAGS>", 0, 5, "Special flags (AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST, AI_V4MAPPED, AI_ALL).");
-    getddrinfo_args.port_nr = arg_str0("p", "port", "<port>", "String containing a numeric port number.");
-    getddrinfo_args.hostname = arg_str1(NULL, NULL, "<hostname>", "Host address");
-    getddrinfo_args.end = arg_end(1);
-    const esp_console_cmd_t getddrinfo_cmd = {
-        .command = "getaddrinfo",
-        .help = "Usage: getaddrinfo [options] <hostname> [service]",
-        .hint = NULL,
-        .func = &do_getddrinfo_cmd,
-        .argtable = &getddrinfo_args
-    };
-
-    ret = esp_console_cmd_register(&getddrinfo_cmd);
-    if (ret) {
-        ESP_LOGE(TAG, "Unable to register getddrinfo");
-    }
-
-    return ret;
-}

components/console_cmd_ping/console_getsetdnsserver.c

@@ -1,279 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <stdio.h>
-#include <string.h>
-#include "sdkconfig.h"
-#include "lwip/inet.h"
-#include "lwip/netdb.h"
-#include "lwip/sockets.h"
-#include "esp_console.h"
-#include "esp_netif.h"
-#include "lwip/netdb.h"
-#include "esp_log.h"
-#include "argtable3/argtable3.h"
-#include <netdb.h>
-#include "console_ping.h"
-
-
-static const char *TAG = "console_setdnsserver";
-
-#if CONFIG_PING_CMD_AUTO_REGISTRATION
-static esp_err_t console_cmd_dnscmd_register(void);
-
-/**
- * @brief  Static registration of the getaddrinfo command plugin.
- *
- * This section registers the plugin description structure and places it into
- * the .console_cmd_desc section, as determined by the linker.lf file in the
- * 'plugins' component.
- */
-static const console_cmd_plugin_desc_t __attribute__((section(".console_cmd_desc"), used)) PLUGIN = {
-    .name = "console_cmd_dnscmd",
-    .plugin_regd_fn = &console_cmd_dnscmd_register
-};
-
-
-/**
- * @brief Registers the DNS commands (setdnsserver and getdnsserver) with the console.
- *
- * @return esp_err_t Returns ESP_OK.
- */
-static esp_err_t console_cmd_dnscmd_register(void)
-{
-    console_cmd_setdnsserver_register();
-    console_cmd_getdnsserver_register();
-
-    return ESP_OK;
-}
-#endif
-
-/**
- * @brief Structure to hold arguments for the setdnsserver command.
- */
-static struct {
-    struct arg_str *main;
-    struct arg_str *backup;
-    struct arg_str *fallback;
-    struct arg_end *end;
-} setdnsserver_args;
-
-/**
- * @brief Sets the DNS server address for all network interfaces.
- *
- * This function iterates over all network interfaces available on the ESP32 device
- * and sets the DNS server address for the specified DNS type (main, backup, or fallback).
- * The DNS address is only set if a valid address is provided (non-zero and not equal to IPADDR_NONE).
- *
- * @param server IP address of the DNS server.
- * @param type Type of the DNS server (main, backup, fallback).
- *
- * @return esp_err_t Returns ESP_OK on success, or an error code on failure.
- */
-static esp_err_t set_dns_server(const char *server, esp_netif_dns_type_t type)
-{
-    int ret = 0;
-    struct addrinfo hint = {0};
-    struct addrinfo *res = NULL, *res_tmp = NULL;
-    esp_netif_t *esp_netif = NULL;
-    esp_netif_dns_info_t dns;
-    int addr_cnt = 0;
-
-    ret = getaddrinfo(server, NULL, &hint, &res);
-    if (ret != 0) {
-        printf("setdnsserver: Failure host:%s(ERROR: %d)\n", server, ret);
-        ESP_LOGE(TAG, "Failure host");
-        return 1;
-    }
-
-    for (res_tmp = res; res_tmp != NULL; res_tmp = res_tmp->ai_next) {
-
-        if (addr_cnt == 0) {
-            if (res_tmp->ai_family == AF_INET) {
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
-                while ((esp_netif = esp_netif_next_unsafe(esp_netif)) != NULL) {
-#else
-                while ((esp_netif = esp_netif_next(esp_netif)) != NULL) {
-#endif
-                    struct sockaddr_in *ipv4 = (struct sockaddr_in *)res_tmp->ai_addr;
-                    dns.ip.u_addr.ip4.addr = ipv4->sin_addr.s_addr;
-                    dns.ip.type = IPADDR_TYPE_V4;
-                    ESP_ERROR_CHECK(esp_netif_set_dns_info(esp_netif, type, &dns));
-                }
-            } else if (res_tmp->ai_family == AF_INET6) {
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
-                while ((esp_netif = esp_netif_next_unsafe(esp_netif)) != NULL) {
-#else
-                while ((esp_netif = esp_netif_next(esp_netif)) != NULL) {
-#endif
-                    struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)res_tmp->ai_addr;
-                    memcpy(dns.ip.u_addr.ip6.addr, &ipv6->sin6_addr, sizeof(dns.ip.u_addr.ip6.addr));
-                    dns.ip.type = IPADDR_TYPE_V6;
-                    ESP_ERROR_CHECK(esp_netif_set_dns_info(esp_netif, type, &dns));
-                }
-            } else {
-                ESP_LOGE(TAG, "ai_family Unknown: %d\n", res_tmp->ai_family);
-            }
-        }
-        addr_cnt++;
-    }
-
-    freeaddrinfo(res);
-
-    return ESP_OK;
-}
-
-/**
- * @brief Command handler for setting DNS server addresses.
- *
- * @param argc Argument count.
- * @param argv Argument values.
- *
- * @return int: 0 on success, 1 on error.
- */
-static int do_setdnsserver_cmd(int argc, char **argv)
-{
-    int nerrors = arg_parse(argc, argv, (void **)&setdnsserver_args);
-    if (nerrors != 0) {
-        arg_print_errors(stderr, setdnsserver_args.end, argv[0]);
-        return 1;
-    }
-
-    set_dns_server(setdnsserver_args.main->sval[0], ESP_NETIF_DNS_MAIN);
-
-    if (setdnsserver_args.backup->count > 0) {
-        set_dns_server(setdnsserver_args.backup->sval[0], ESP_NETIF_DNS_BACKUP);
-    }
-
-    if (setdnsserver_args.fallback->count > 0) {
-        set_dns_server(setdnsserver_args.fallback->sval[0], ESP_NETIF_DNS_FALLBACK);
-    }
-
-    return 0;
-}
-
-
-/**
- * @brief Registers the setdnsserver command.
- *
- * @return esp_err_t Returns ESP_OK on success, or an error code on failure.
- */
-esp_err_t console_cmd_setdnsserver_register(void)
-{
-    esp_err_t ret;
-
-    setdnsserver_args.main = arg_str1(NULL, NULL, "<main>", "The main DNS server IP address.");
-    setdnsserver_args.backup = arg_str0(NULL, NULL, "backup", "The secondary DNS server IP address (optional).");
-    setdnsserver_args.fallback = arg_str0(NULL, NULL, "fallback", "The fallback DNS server IP address (optional).");
-    setdnsserver_args.end = arg_end(1);
-    const esp_console_cmd_t setdnsserver_cmd = {
-        .command = "setdnsserver",
-        .help = "Usage: setdnsserver <main> [backup] [fallback]",
-        .hint = NULL,
-        .func = &do_setdnsserver_cmd,
-        .argtable = &setdnsserver_args
-    };
-
-    ret = esp_console_cmd_register(&setdnsserver_cmd);
-    if (ret) {
-        ESP_LOGE(TAG, "Unable to register setdnsserver");
-    }
-
-    return ret;
-}
-
-
-/**
- * @brief Structure to hold arguments for the getdnsserver command.
- */
-static struct {
-    struct arg_end *end;
-} getdnsserver_args;
-
-/**
- * @brief Command handler for getting DNS server addresses.
- *
- * @param argc Argument count.
- * @param argv Argument values.
- *
- * @return int: 0 on success, 1 on error.
- */
-static int do_getdnsserver_cmd(int argc, char **argv)
-{
-    esp_netif_t *esp_netif = NULL;
-    esp_netif_dns_info_t dns_info;
-    char interface[10];
-    esp_err_t ret = ESP_FAIL;
-
-    int nerrors = arg_parse(argc, argv, (void **)&getdnsserver_args);
-    if (nerrors != 0) {
-        arg_print_errors(stderr, getdnsserver_args.end, argv[0]);
-        return 1;
-    }
-
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)
-    while ((esp_netif = esp_netif_next_unsafe(esp_netif)) != NULL) {
-#else
-    while ((esp_netif = esp_netif_next(esp_netif)) != NULL) {
-#endif
-
-        /* Print Interface Name and Number */
-        ret = esp_netif_get_netif_impl_name(esp_netif, interface);
-        if ((ESP_FAIL == ret) || (NULL == esp_netif)) {
-            ESP_LOGE(TAG, "No interface available");
-            return 1;
-        }
-
-        printf("Interface Name: %s\n", interface);
-        ESP_ERROR_CHECK(esp_netif_get_dns_info(esp_netif, ESP_NETIF_DNS_MAIN, &dns_info));
-        if (dns_info.ip.type == ESP_IPADDR_TYPE_V4) {
-            printf("Main DNS server : " IPSTR "\n", IP2STR(&dns_info.ip.u_addr.ip4));
-        } else if (dns_info.ip.type == ESP_IPADDR_TYPE_V6) {
-            printf("Main DNS server : " IPV6STR "\n", IPV62STR(dns_info.ip.u_addr.ip6));
-        }
-
-        ESP_ERROR_CHECK(esp_netif_get_dns_info(esp_netif, ESP_NETIF_DNS_BACKUP, &dns_info));
-        if (dns_info.ip.type == ESP_IPADDR_TYPE_V4) {
-            printf("Backup DNS server : " IPSTR "\n", IP2STR(&dns_info.ip.u_addr.ip4));
-        } else if (dns_info.ip.type == ESP_IPADDR_TYPE_V6) {
-            printf("Backup DNS server : " IPV6STR "\n", IPV62STR(dns_info.ip.u_addr.ip6));
-        }
-
-        ESP_ERROR_CHECK(esp_netif_get_dns_info(esp_netif, ESP_NETIF_DNS_FALLBACK, &dns_info));
-        if (dns_info.ip.type == ESP_IPADDR_TYPE_V4) {
-            printf("Fallback DNS server : " IPSTR "\n", IP2STR(&dns_info.ip.u_addr.ip4));
-        } else if (dns_info.ip.type == ESP_IPADDR_TYPE_V6) {
-            printf("Fallback DNS server : " IPV6STR "\n", IPV62STR(dns_info.ip.u_addr.ip6));
-        }
-    }
-
-    return 0;
-}
-
-/**
- * @brief Registers the getdnsserver command.
- *
- * @return esp_err_t Returns ESP_OK on success, or an error code on failure.
- */
-esp_err_t console_cmd_getdnsserver_register(void)
-{
-    esp_err_t ret;
-
-    getdnsserver_args.end = arg_end(1);
-    const esp_console_cmd_t getdnsserver_cmd = {
-        .command = "getdnsserver",
-        .help = "Usage: getdnsserver",
-        .hint = NULL,
-        .func = &do_getdnsserver_cmd,
-        .argtable = &getdnsserver_args
-    };
-
-    ret = esp_console_cmd_register(&getdnsserver_cmd);
-    if (ret) {
-        ESP_LOGE(TAG, "Unable to register getdnsserver");
-    }
-
-    return ret;
-}

components/console_cmd_ping/console_ping.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -20,7 +20,7 @@
 static const char *TAG = "console_ping";
 SemaphoreHandle_t sync_semaphore;
 
-#if CONFIG_PING_CMD_AUTO_REGISTRATION
+
 /**
  * Static registration of this plugin is achieved by defining the plugin description
  * structure and placing it into .console_cmd_desc section.
@@ -30,7 +30,7 @@ static const console_cmd_plugin_desc_t __attribute__((section(".console_cmd_desc
     .name = "console_cmd_ping",
     .plugin_regd_fn = &console_cmd_ping_register
 };
-#endif
+
 
 static void cmd_ping_on_ping_success(esp_ping_handle_t hdl, void *args)
 {
@@ -75,13 +75,9 @@ static void cmd_ping_on_ping_end(esp_ping_handle_t hdl, void *args)
         loss = 0;
     }
     if (IP_IS_V4(&target_addr)) {
-#if CONFIG_LWIP_IPV4
         printf("\n--- %s ping statistics ---\n", inet_ntoa(*ip_2_ip4(&target_addr)));
-#endif
     } else {
-#if CONFIG_LWIP_IPV6
         printf("\n--- %s ping statistics ---\n", inet6_ntoa(*ip_2_ip6(&target_addr)));
-#endif
     }
     printf("%" PRIu32 " packets transmitted, %" PRIu32 " received, %" PRIu32 "%% packet loss, time %" PRIu32 "ms\n",
            transmitted, received, loss, total_time_ms);
@@ -154,15 +150,11 @@ static int do_ping_cmd(int argc, char **argv)
             return 1;
         }
         if (res->ai_family == AF_INET) {
-#if CONFIG_LWIP_IPV4
             struct in_addr addr4 = ((struct sockaddr_in *) (res->ai_addr))->sin_addr;
             inet_addr_to_ip4addr(ip_2_ip4(&target_addr), &addr4);
-#endif
         } else {
-#if CONFIG_LWIP_IPV6
             struct in6_addr addr6 = ((struct sockaddr_in6 *) (res->ai_addr))->sin6_addr;
             inet6_addr_to_ip6addr(ip_2_ip6(&target_addr), &addr6);
-#endif
         }
         freeaddrinfo(res);
     }

components/console_cmd_ping/console_ping.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -20,30 +20,6 @@ extern "C" {
  */
 esp_err_t console_cmd_ping_register(void);
 
-/**
- * @brief Registers the getddrinfo command.
- *
- * @return
- *          - esp_err_t
- */
-esp_err_t console_cmd_getaddrinfo_register(void);
-
-/**
- * @brief Registers the setdnsserver command.
- *
- * @return
- *          - esp_err_t
- */
-esp_err_t console_cmd_setdnsserver_register(void);
-
-/**
- * @brief Registers the setdnsserver command.
- *
- * @return
- *          - esp_err_t
- */
-esp_err_t console_cmd_getdnsserver_register(void);
-
 #ifdef __cplusplus
 }
 #endif

components/console_cmd_ping/idf_component.yml

@@ -1,4 +1,4 @@
-version: 1.1.0
+version: 1.0.0
 url: https://github.com/espressif/esp-protocols/tree/master/components/console_cmd_ping
 description: The component provides a console where the 'ping' command can be executed.
 dependencies:

components/console_cmd_wifi/.cz.yaml

@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(console): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py console_cmd_wifi
   tag_format: console_cmd_wifi-v$version
-  version: 1.1.0
+  version: 1.0.1
   version_files:
   - idf_component.yml

components/console_cmd_wifi/CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## [1.1.0](https://github.com/espressif/esp-protocols/commits/console_cmd_wifi-v1.1.0)
-
-### Features
-
-- Added support to join pre-configured network ([bdbf16c1](https://github.com/espressif/esp-protocols/commit/bdbf16c1))
-
 ## [1.0.1](https://github.com/espressif/esp-protocols/commits/console_cmd_wifi-v1.0.1)
 
 ### Features

components/console_cmd_wifi/CMakeLists.txt

@@ -1,8 +1,4 @@
 idf_component_register(SRCS "console_wifi.c"
-                    INCLUDE_DIRS "include"
-                    REQUIRES lwip
-                    PRIV_REQUIRES esp_netif console esp_wifi esp_timer)
-
-if(CONFIG_WIFI_CMD_AUTO_REGISTRATION)
-    target_link_libraries(${COMPONENT_LIB} "-u console_cmd_wifi_register")
-endif()
+                    INCLUDE_DIRS "."
+                    PRIV_REQUIRES esp_netif console esp_wifi
+                    WHOLE_ARCHIVE)

components/console_cmd_wifi/Kconfig.projbuild

@@ -1,22 +0,0 @@
-menu "Wifi command Configuration"
-
-    config WIFI_CMD_AUTO_REGISTRATION
-        bool "Enable Console command wifi Auto-registration"
-        default y
-        help
-            Enabling this allows for the autoregistration of the wifi command.
-
-    config WIFI_CMD_NETWORK_SSID
-        string "WiFi SSID"
-        default "myssid"
-        help
-            SSID (network name) to connect to.
-
-    config WIFI_CMD_NETWORK_PASSWORD
-        string "WiFi Password"
-        default "mypassword"
-        help
-            WiFi password (WPA or WPA2) to use.
-            Can be left blank if the network has no security set.
-
-endmenu

components/console_cmd_wifi/README.md

@@ -33,16 +33,12 @@ The component offers a console with a command that enables runtime wifi configur
     ESP_ERROR_CHECK(console_cmd_start());    // Start console
     ```
 
-Note: Auto-registration of a specific plugin command can be disabled from menuconfig.
-
 ## Suported command:
 
 ### wifi:
-```
- wifi help: Prints the help text for all wifi commands
- wifi show network/sta: Scans and displays all available wifi APs./ Shows the details of wifi station.
- wifi sta join <network ssid> <password>: Station joins the given wifi network.
- wifi sta join <network ssid>: Station joins the given unsecured wifi network.
- wifi sta join: Station joins the pre-configured wifi network.
- wifi sta leave: Station leaves the wifi network.
- ```
+* ```wifi help```: Prints the help text for all wifi commands
+* ```wifi show network```: Scans and displays upto 10 available wifi networks.
+* ```wifi show sta```: Shows the details of wifi station.
+* ```wifi sta join <network ssid> <password>```: Station joins the given wifi network.
+* ```wifi sta join <network ssid>```: Station joins the given unsecured wifi network.
+* ```wifi sta leave```: Station leaves the wifi network.

components/console_cmd_wifi/console_wifi.c

@@ -21,7 +21,6 @@
 
 #define DEFAULT_SCAN_LIST_SIZE 10
 
-#if CONFIG_WIFI_CMD_AUTO_REGISTRATION
 /**
  * Static registration of this plugin is achieved by defining the plugin description
  * structure and placing it into .console_cmd_desc section.
@@ -31,7 +30,6 @@ static const console_cmd_plugin_desc_t __attribute__((section(".console_cmd_desc
     .name = "console_cmd_wifi",
     .plugin_regd_fn = &console_cmd_wifi_register
 };
-#endif
 
 typedef struct wifi_op_t {
     char *name;
@@ -57,9 +55,8 @@ static const int CONNECTED_BIT = BIT1;
 static wifi_op_t cmd_list[] = {
     {.name = "help", .operation = wifi_help_op, .arg_cnt = 2, .start_index = 1, .help = "wifi help: Prints the help text for all wifi commands"},
     {.name = "show", .operation = wifi_show_op, .arg_cnt = 3, .start_index = 1, .help = "wifi show network/sta: Scans and displays all available wifi APs./ Shows the details of wifi station."},
-    {.name = "join",  .operation = wifi_sta_join_op,  .arg_cnt = 5, .start_index = 2, .help = "wifi sta join <network ssid> <password>: Station joins the given wifi network."},
-    {.name = "join",  .operation = wifi_sta_join_op,  .arg_cnt = 4, .start_index = 2, .help = "wifi sta join <network ssid>: Station joins the given unsecured wifi network."},
-    {.name = "join",  .operation = wifi_sta_join_op,  .arg_cnt = 3, .start_index = 2, .help = "wifi sta join: Station joins the pre-configured wifi network."},
+    {.name = "join",  .operation = wifi_sta_join_op,  .arg_cnt = 4, .start_index = 2, .help = "wifi sta join <network ssid> <password>: Station joins the given wifi network."},
+    {.name = "join",  .operation = wifi_sta_join_op,  .arg_cnt = 5, .start_index = 2, .help = "wifi sta join <network ssid>: Station joins the given unsecured wifi network."},
     {.name = "leave", .operation = wifi_sta_leave_op,  .arg_cnt = 3, .start_index = 2, .help = "wifi sta leave: Station leaves the wifi network."},
 };
 
@@ -165,6 +162,7 @@ static esp_err_t wifi_show_op(wifi_op_t *self, int argc, char *argv[])
             ESP_LOGI(TAG, "Showing Joind AP details:");
             ESP_LOGI(TAG, "*************************");
             ESP_LOGI(TAG, "SSID: %s", wifi_config.sta.ssid);
+            ESP_LOGI(TAG, "Password: %s", wifi_config.sta.password);
             ESP_LOGI(TAG, "Channel: %d", wifi_config.sta.channel);
             ESP_LOGI(TAG, "bssid: %02x:%02x:%02x:%02x:%02x:%02x", wifi_config.sta.bssid[0],
                      wifi_config.sta.bssid[1], wifi_config.sta.bssid[2], wifi_config.sta.bssid[3],
@@ -186,13 +184,7 @@ static esp_err_t wifi_sta_join_op(wifi_op_t *self, int argc, char *argv[])
         return ESP_FAIL;
     }
 
-    if (self->arg_cnt == 3) {
-        strlcpy((char *) wifi_config.sta.ssid, CONFIG_WIFI_CMD_NETWORK_SSID, sizeof(wifi_config.sta.ssid));
-        strlcpy((char *) wifi_config.sta.password, CONFIG_WIFI_CMD_NETWORK_PASSWORD, sizeof(wifi_config.sta.password));
-    } else {
-        strlcpy((char *) wifi_config.sta.ssid, argv[self->start_index + 1], sizeof(wifi_config.sta.ssid));
-    }
-
+    strlcpy((char *) wifi_config.sta.ssid, argv[self->start_index + 1], sizeof(wifi_config.sta.ssid));
     if (self->arg_cnt == 5) {
         strlcpy((char *) wifi_config.sta.password, argv[self->start_index + 2], sizeof(wifi_config.sta.password));
     }
@@ -268,7 +260,7 @@ static esp_err_t do_cmd_wifi(int argc, char **argv)
  */
 esp_err_t console_cmd_wifi_register(void)
 {
-    esp_err_t ret = ESP_OK;
+    esp_err_t ret;
     esp_console_cmd_t command = {
         .command = "wifi",
         .help = "Command for wifi configuration and monitoring\n For more info run 'wifi help'",

components/console_cmd_wifi/idf_component.yml

@@ -1,4 +1,4 @@
-version: 1.1.0
+version: 1.0.1
 url: https://github.com/espressif/esp-protocols/tree/master/components/console_cmd_wifi
 description: The component offers a console that enables runtime wifi configuration and monitoring.
 dependencies:

components/eppp_link/.cz.yaml

@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(eppp): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py eppp_link
   tag_format: eppp-v$version
-  version: 0.2.0
+  version: 0.1.1
   version_files:
   - idf_component.yml

components/eppp_link/CHANGELOG.md

@@ -1,16 +1,5 @@
 # Changelog
 
-## [0.2.0](https://github.com/espressif/esp-protocols/commits/eppp-v0.2.0)
-
-### Features
-
-- Add support for SDIO transport ([085dd790](https://github.com/espressif/esp-protocols/commit/085dd790))
-
-### Bug Fixes
-
-- Fixed strict prototype API decl issue in SDIO ([eb09e426](https://github.com/espressif/esp-protocols/commit/eb09e426))
-- Fix SIDO host to check/clear interrupts atomically ([402176c9](https://github.com/espressif/esp-protocols/commit/402176c9))
-
 ## [0.1.1](https://github.com/espressif/esp-protocols/commits/eppp-v0.1.1)
 
 ### Bug Fixes

components/eppp_link/CMakeLists.txt

@@ -1,3 +1,3 @@
-idf_component_register(SRCS eppp_link.c eppp_sdio_slave.c eppp_sdio_host.c
+idf_component_register(SRCS "eppp_link.c"
                     INCLUDE_DIRS "include"
                     PRIV_REQUIRES esp_netif esp_driver_spi esp_driver_gpio esp_timer driver)

components/eppp_link/Kconfig

@@ -21,13 +21,6 @@ menu "eppp_link"
             bool "SPI"
             help
                 Use SPI.
-
-        config EPPP_LINK_DEVICE_SDIO
-            bool "SDIO"
-            depends on SOC_SDMMC_HOST_SUPPORTED || SOC_SDIO_SLAVE_SUPPORTED
-            help
-                Use SDIO.
-
     endchoice
 
     config EPPP_LINK_CONN_MAX_RETRY
@@ -41,30 +34,8 @@ menu "eppp_link"
     config EPPP_LINK_PACKET_QUEUE_SIZE
         int "Packet queue size"
         default 64
-        depends on EPPP_LINK_DEVICE_SPI
         help
             Size of the Tx packet queue.
             You can decrease the number for slower bit rates.
 
-    choice EPPP_LINK_SDIO_ROLE
-        prompt "Choose SDIO host or slave"
-        depends on EPPP_LINK_DEVICE_SDIO
-        default EPPP_LINK_DEVICE_SDIO_HOST if SOC_SDMMC_HOST_SUPPORTED
-        help
-            Select which either SDIO host or slave
-
-        config EPPP_LINK_DEVICE_SDIO_HOST
-            bool "Host"
-            depends on SOC_SDMMC_HOST_SUPPORTED
-            help
-                Use SDIO host.
-
-        config EPPP_LINK_DEVICE_SDIO_SLAVE
-            bool "SLAVE"
-            depends on SOC_SDIO_SLAVE_SUPPORTED
-            help
-                Use SDIO slave.
-
-    endchoice
-
 endmenu

components/eppp_link/README.md

@@ -14,7 +14,7 @@ brings in the WiFi connectivity from the "SLAVE" microcontroller.
              SLAVE micro                                  HOST micro
     \|/  +----------------+                           +----------------+
      |   |                |          serial line      |                |
-     +---+ WiFi NAT PPPoS |=== UART / SPI / SDIO =====| PPPoS client   |
+     +---+ WiFi NAT PPPoS |======== UART / SPI =======| PPPoS client   |
          |        (server)|                           |                |
          +----------------+                           +----------------+
 ```
@@ -39,19 +39,14 @@ brings in the WiFi connectivity from the "SLAVE" microcontroller.
 
 ## Throughput
 
-Tested with WiFi-NAPT example
+Tested with WiFi-NAPT example, no IRAM optimizations
 
 ### UART @ 3Mbauds
 
 * TCP - 2Mbits/s
 * UDP - 2Mbits/s
 
-### SPI @ 16MHz
+### SPI @ 20MHz
 
-* TCP - 5Mbits/s
-* UDP - 8Mbits/s
-
-### SDIO
-
-* TCP - 9Mbits/s
-* UDP - 11Mbits/s
+* TCP - 6Mbits/s
+* UDP - 10Mbits/s

components/eppp_link/eppp_link.c

@@ -12,7 +12,6 @@
 #include "esp_event.h"
 #include "esp_netif_ppp.h"
 #include "eppp_link.h"
-#include "esp_serial_slave_link/essl_sdio.h"
 
 #if CONFIG_EPPP_LINK_DEVICE_SPI
 #include "driver/spi_master.h"
@@ -87,18 +86,7 @@ struct eppp_handle {
     bool netif_stop;
 };
 
-typedef esp_err_t (*transmit_t)(void *h, void *buffer, size_t len);
 
-#if CONFIG_EPPP_LINK_DEVICE_SDIO
-esp_err_t eppp_sdio_host_tx(void *h, void *buffer, size_t len);
-esp_err_t eppp_sdio_host_rx(esp_netif_t *netif);
-esp_err_t eppp_sdio_slave_rx(esp_netif_t *netif);
-esp_err_t eppp_sdio_slave_tx(void *h, void *buffer, size_t len);
-esp_err_t eppp_sdio_host_init(struct eppp_config_sdio_s *config);
-esp_err_t eppp_sdio_slave_init(void);
-void eppp_sdio_slave_deinit(void);
-void eppp_sdio_host_deinit(void);
-#else
 static esp_err_t transmit(void *h, void *buffer, size_t len)
 {
     struct eppp_handle *handle = h;
@@ -137,10 +125,9 @@ static esp_err_t transmit(void *h, void *buffer, size_t len)
 #elif CONFIG_EPPP_LINK_DEVICE_UART
     ESP_LOG_BUFFER_HEXDUMP("ppp_uart_send", buffer, len, ESP_LOG_VERBOSE);
     uart_write_bytes(handle->uart_port, buffer, len);
-#endif // DEVICE UART or SPI
+#endif
     return ESP_OK;
 }
-#endif
 
 static void netif_deinit(esp_netif_t *netif)
 {
@@ -222,11 +209,7 @@ static esp_netif_t *netif_init(eppp_type_t role, eppp_config_t *eppp_config)
 
     esp_netif_driver_ifconfig_t driver_cfg = {
         .handle = h,
-#if CONFIG_EPPP_LINK_DEVICE_SDIO
-        .transmit = role == EPPP_CLIENT ? eppp_sdio_host_tx : eppp_sdio_slave_tx,
-#else
         .transmit = transmit,
-#endif
     };
     const esp_netif_driver_ifconfig_t *ppp_driver_cfg = &driver_cfg;
 
@@ -674,20 +657,6 @@ esp_err_t eppp_perform(esp_netif_t *netif)
     }
     return ESP_OK;
 }
-#elif CONFIG_EPPP_LINK_DEVICE_SDIO
-
-esp_err_t eppp_perform(esp_netif_t *netif)
-{
-    struct eppp_handle *h = esp_netif_get_io_driver(netif);
-    if (h->stop) {
-        return ESP_ERR_TIMEOUT;
-    }
-    if (h->role == EPPP_SERVER) {
-        return eppp_sdio_slave_rx(netif);
-    } else {
-        return eppp_sdio_host_rx(netif);
-    }
-}
 
 #endif // CONFIG_EPPP_LINK_DEVICE_SPI / UART
 
@@ -731,13 +700,6 @@ void eppp_deinit(esp_netif_t *netif)
     }
 #elif CONFIG_EPPP_LINK_DEVICE_UART
     deinit_uart(esp_netif_get_io_driver(netif));
-#elif CONFIG_EPPP_LINK_DEVICE_SDIO
-    struct eppp_handle *h = esp_netif_get_io_driver(netif);
-    if (h->role == EPPP_CLIENT) {
-        eppp_sdio_host_deinit();
-    } else {
-        eppp_sdio_slave_deinit();
-    }
 #endif
     netif_deinit(netif);
 }
@@ -752,6 +714,7 @@ esp_netif_t *eppp_init(eppp_type_t role, eppp_config_t *config)
     esp_netif_t *netif = netif_init(role, config);
     if (!netif) {
         ESP_LOGE(TAG, "Failed to initialize PPP netif");
+        remove_handlers();
         return NULL;
     }
     esp_netif_ppp_config_t netif_params;
@@ -769,18 +732,6 @@ esp_netif_t *eppp_init(eppp_type_t role, eppp_config_t *config)
     }
 #elif CONFIG_EPPP_LINK_DEVICE_UART
     init_uart(esp_netif_get_io_driver(netif), config);
-#elif CONFIG_EPPP_LINK_DEVICE_SDIO
-    esp_err_t ret;
-    if (role == EPPP_SERVER) {
-        ret = eppp_sdio_slave_init();
-    } else {
-        ret = eppp_sdio_host_init(&config->sdio);
-    }
-
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "Failed to initialize SDIO %d", ret);
-        return NULL;
-    }
 #endif
     return netif;
 }
@@ -803,12 +754,6 @@ esp_netif_t *eppp_open(eppp_type_t role, eppp_config_t *config, int connect_time
         return NULL;
     }
 #endif
-#if CONFIG_EPPP_LINK_DEVICE_SDIO
-    if (config->transport != EPPP_TRANSPORT_SDIO) {
-        ESP_LOGE(TAG, "Invalid transport: SDIO device must be enabled in Kconfig");
-        return NULL;
-    }
-#endif
 
     if (config->task.run_task == false) {
         ESP_LOGE(TAG, "task.run_task == false is invalid in this API. Please use eppp_init()");

components/eppp_link/eppp_sdio.h

@@ -1,19 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-
-#define MAX_SDIO_PAYLOAD 1500
-#define SDIO_ALIGN(size) (((size) + 3U) & ~(3U))
-#define SDIO_PAYLOAD SDIO_ALIGN(MAX_SDIO_PAYLOAD)
-#define PPP_SOF 0x7E
-
-// Interrupts and registers
-#define SLAVE_INTR      0
-#define SLAVE_REG_REQ   0
-
-// Requests from host to slave
-#define REQ_RESET 1
-#define REQ_INIT  2

components/eppp_link/eppp_sdio_host.c

@@ -1,200 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <string.h>
-#include <stdint.h>
-#include "sdkconfig.h"
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "driver/sdio_slave.h"
-#include "esp_serial_slave_link/essl_sdio.h"
-#include "eppp_sdio.h"
-#include "driver/sdmmc_host.h"
-#include "sdmmc_cmd.h"
-#include "esp_check.h"
-#include "eppp_link.h"
-
-#if CONFIG_EPPP_LINK_DEVICE_SDIO_HOST
-
-// For blocking operations
-#define TIMEOUT_MAX   UINT32_MAX
-// Short timeout for sending/receiving ESSL packets
-#define PACKET_TIMEOUT_MS   50
-
-static const char *TAG = "eppp_sdio_host";
-static SemaphoreHandle_t s_essl_mutex = NULL;
-static essl_handle_t s_essl = NULL;
-static sdmmc_card_t *s_card = NULL;
-
-static DRAM_DMA_ALIGNED_ATTR uint8_t send_buffer[SDIO_PAYLOAD];
-static DMA_ATTR uint8_t rcv_buffer[SDIO_PAYLOAD];
-
-esp_err_t eppp_sdio_host_tx(void *h, void *buffer, size_t len)
-{
-    if (s_essl == NULL || s_essl_mutex == NULL) {
-        // silently skip the Tx if the SDIO not fully initialized
-        return ESP_OK;
-    }
-
-    memcpy(send_buffer, buffer, len);
-    size_t send_len = SDIO_ALIGN(len);
-    if (send_len > len) {
-        // pad with SOF's
-        memset(&send_buffer[len], PPP_SOF, send_len - len);
-    }
-    xSemaphoreTake(s_essl_mutex, portMAX_DELAY);
-    esp_err_t ret = essl_send_packet(s_essl, send_buffer, send_len, PACKET_TIMEOUT_MS);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "Slave not ready to receive packet %x", ret);
-        vTaskDelay(pdMS_TO_TICKS(1000));
-        ret = ESP_ERR_NO_MEM; // to inform the upper layers
-    }
-    ESP_LOG_BUFFER_HEXDUMP(TAG, send_buffer, send_len, ESP_LOG_VERBOSE);
-    xSemaphoreGive(s_essl_mutex);
-    return ret;
-}
-
-static esp_err_t request_slave_reset(void)
-{
-    esp_err_t ret = ESP_OK;
-    ESP_LOGI(TAG, "send reset to slave...");
-    ESP_GOTO_ON_ERROR(essl_write_reg(s_essl, SLAVE_REG_REQ, REQ_RESET, NULL, TIMEOUT_MAX), err, TAG, "write-reg failed");
-    ESP_GOTO_ON_ERROR(essl_send_slave_intr(s_essl, BIT(SLAVE_INTR), TIMEOUT_MAX), err, TAG, "send-intr failed");
-    vTaskDelay(pdMS_TO_TICKS(PACKET_TIMEOUT_MS));
-    ESP_GOTO_ON_ERROR(essl_wait_for_ready(s_essl, TIMEOUT_MAX), err, TAG, "wait-for-ready failed");
-    ESP_LOGI(TAG, "slave io ready");
-err:
-    return ret;
-}
-
-esp_err_t eppp_sdio_host_init(struct eppp_config_sdio_s *eppp_config)
-{
-    esp_err_t ret = ESP_OK;
-
-    ESP_GOTO_ON_ERROR(sdmmc_host_init(), err, TAG, "sdmmc host init failed");
-
-    // configure SDIO interface and slot
-    sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
-    slot_config.width = eppp_config->width;
-#ifdef CONFIG_SOC_SDMMC_USE_GPIO_MATRIX
-    slot_config.clk = eppp_config->clk;
-    slot_config.cmd = eppp_config->cmd;
-    slot_config.d0  = eppp_config->d0;
-    slot_config.d1  = eppp_config->d1;
-    slot_config.d2  = eppp_config->d2;
-    slot_config.d3  = eppp_config->d3;
-#endif
-
-    ESP_GOTO_ON_ERROR(sdmmc_host_init_slot(SDMMC_HOST_SLOT_1, &slot_config), err, TAG, "init sdmmc host slot failed");
-
-    sdmmc_host_t config = SDMMC_HOST_DEFAULT();
-    config.flags = SDMMC_HOST_FLAG_4BIT;
-    config.flags |= SDMMC_HOST_FLAG_ALLOC_ALIGNED_BUF;
-    config.max_freq_khz = SDMMC_FREQ_HIGHSPEED;
-
-    s_card = (sdmmc_card_t *)malloc(sizeof(sdmmc_card_t));
-    ESP_GOTO_ON_FALSE(s_card, ESP_ERR_NO_MEM, err, TAG, "card allocation failed");
-    ESP_GOTO_ON_ERROR(sdmmc_card_init(&config, s_card), err, TAG, "sdmmc card init failed");
-
-    essl_sdio_config_t ser_config = {
-        .card = s_card,
-        .recv_buffer_size = SDIO_PAYLOAD,
-    };
-    ESP_GOTO_ON_FALSE(essl_sdio_init_dev(&s_essl, &ser_config) == ESP_OK && s_essl, ESP_FAIL, err, TAG, "essl_sdio_init_dev failed");
-    ESP_GOTO_ON_ERROR(essl_init(s_essl, TIMEOUT_MAX), err, TAG, "essl-init failed");
-    ESP_GOTO_ON_ERROR(request_slave_reset(), err, TAG, "failed to reset the slave");
-    ESP_GOTO_ON_FALSE((s_essl_mutex = xSemaphoreCreateMutex()), ESP_ERR_NO_MEM, err, TAG, "failed to create semaphore");
-    return ret;
-
-err:
-    essl_sdio_deinit_dev(s_essl);
-    s_essl = NULL;
-    return ret;
-}
-
-static esp_err_t get_intr(uint32_t *out_raw)
-{
-    esp_err_t ret = ESP_OK;
-    ESP_GOTO_ON_ERROR(essl_get_intr(s_essl, out_raw, NULL, 0), err, TAG, "essl-get-int failed");
-    ESP_GOTO_ON_ERROR(essl_clear_intr(s_essl, *out_raw, 0), err, TAG, "essl-clear-int failed");
-    ESP_LOGD(TAG, "intr: %08"PRIX32, *out_raw);
-err:
-    return ret;
-}
-
-esp_err_t eppp_sdio_host_rx(esp_netif_t *netif)
-{
-    uint32_t intr;
-    esp_err_t err = essl_wait_int(s_essl, TIMEOUT_MAX);
-    if (err == ESP_ERR_TIMEOUT) {
-        return ESP_OK;
-    }
-    xSemaphoreTake(s_essl_mutex, portMAX_DELAY);
-    err = get_intr(&intr);
-    if (err == ESP_ERR_TIMEOUT) {
-        xSemaphoreGive(s_essl_mutex);
-        return ESP_OK;
-    }
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "failed to check for interrupts %d", err);
-        xSemaphoreGive(s_essl_mutex);
-        return ESP_FAIL;
-    }
-    if (intr & ESSL_SDIO_DEF_ESP32.new_packet_intr_mask) {
-        esp_err_t ret;
-        do {
-            size_t size_read = SDIO_PAYLOAD;
-            ret = essl_get_packet(s_essl, rcv_buffer, SDIO_PAYLOAD, &size_read, PACKET_TIMEOUT_MS);
-            if (ret == ESP_ERR_NOT_FOUND) {
-                ESP_LOGE(TAG, "interrupt but no data can be read");
-                break;
-            } else if (ret == ESP_OK) {
-                ESP_LOGD(TAG, "receive data, size: %d", size_read);
-                ESP_LOG_BUFFER_HEXDUMP(TAG, rcv_buffer, size_read, ESP_LOG_VERBOSE);
-                esp_netif_receive(netif, rcv_buffer, size_read, NULL);
-                break;
-            } else {
-                ESP_LOGE(TAG, "rx packet error: %08X", ret);
-                if (request_slave_reset() != ESP_OK) {
-                    ESP_LOGE(TAG, "Failed to request slave reset %x", ret);
-                    break;
-                }
-            }
-        } while (ret == ESP_ERR_NOT_FINISHED);
-    }
-    xSemaphoreGive(s_essl_mutex);
-    return ESP_OK;
-}
-
-void eppp_sdio_host_deinit(void)
-{
-    essl_sdio_deinit_dev(s_essl);
-    sdmmc_host_deinit();
-    free(s_card);
-    s_card = NULL;
-    s_essl = NULL;
-}
-
-#else // SDMMC_HOST NOT-SUPPORTED
-
-esp_err_t eppp_sdio_host_tx(void *handle, void *buffer, size_t len)
-{
-    return ESP_ERR_NOT_SUPPORTED;
-}
-
-esp_err_t eppp_sdio_host_rx(esp_netif_t *netif)
-{
-    return ESP_ERR_NOT_SUPPORTED;
-}
-
-void eppp_sdio_host_deinit(void)
-{
-}
-
-esp_err_t eppp_sdio_host_init(struct eppp_config_sdio_s *config)
-{
-    return ESP_ERR_NOT_SUPPORTED;
-}
-#endif // CONFIG_SOC_SDIO_SLAVE_SUPPORTED

components/eppp_link/eppp_sdio_slave.c

@@ -1,174 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <string.h>
-#include <stdint.h>
-#include "sdkconfig.h"
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "driver/sdio_slave.h"
-#include "eppp_sdio.h"
-#include "esp_check.h"
-
-#if CONFIG_EPPP_LINK_DEVICE_SDIO_SLAVE
-#define BUFFER_NUM 4
-#define BUFFER_SIZE SDIO_PAYLOAD
-static const char *TAG = "eppp_sdio_slave";
-static DMA_ATTR uint8_t sdio_slave_rx_buffer[BUFFER_NUM][BUFFER_SIZE];
-static DMA_ATTR uint8_t sdio_slave_tx_buffer[SDIO_PAYLOAD];
-static int s_slave_request = 0;
-
-esp_err_t eppp_sdio_slave_tx(void *h, void *buffer, size_t len)
-{
-    if (s_slave_request != REQ_INIT) {
-        // silently skip the Tx if the SDIO not fully initialized
-        return ESP_OK;
-    }
-    memcpy(sdio_slave_tx_buffer, buffer, len);
-    size_t send_len = SDIO_ALIGN(len);
-    if (send_len > len) {
-        // pad with SOF's if the size is not 4 bytes aligned
-        memset(&sdio_slave_tx_buffer[len], PPP_SOF, send_len - len);
-    }
-
-    ESP_LOG_BUFFER_HEXDUMP(TAG, sdio_slave_tx_buffer, send_len, ESP_LOG_VERBOSE);
-    esp_err_t ret = sdio_slave_transmit(sdio_slave_tx_buffer, send_len);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "sdio slave transmit error, ret : 0x%x", ret);
-        // to inform the upper layers
-        return ESP_ERR_NO_MEM;
-    }
-    return ESP_OK;
-}
-
-static esp_err_t slave_reset(void)
-{
-    esp_err_t ret = ESP_OK;
-    ESP_LOGI(TAG, "SDIO slave reset");
-    sdio_slave_stop();
-    ESP_GOTO_ON_ERROR(sdio_slave_reset(), err, TAG, "slave reset failed");
-    ESP_GOTO_ON_ERROR(sdio_slave_start(), err, TAG, "slave start failed");
-
-    while (1) {
-        sdio_slave_buf_handle_t handle;
-        ret = sdio_slave_send_get_finished(&handle, 0);
-        if (ret == ESP_ERR_TIMEOUT) {
-            break;
-        }
-        ESP_GOTO_ON_ERROR(ret, err, TAG, "slave-get-finished failed");
-        ESP_GOTO_ON_ERROR(sdio_slave_recv_load_buf(handle), err, TAG, "slave-load-buf failed");
-    }
-err:
-    return ret;
-}
-
-esp_err_t eppp_sdio_slave_rx(esp_netif_t *netif)
-{
-    if (s_slave_request == REQ_RESET) {
-        ESP_LOGD(TAG, "request: %x", s_slave_request);
-        slave_reset();
-        s_slave_request = REQ_INIT;
-    }
-    sdio_slave_buf_handle_t handle;
-    size_t length;
-    uint8_t *ptr;
-    esp_err_t ret = sdio_slave_recv_packet(&handle, pdMS_TO_TICKS(1000));
-    if (ret == ESP_ERR_TIMEOUT) {
-        return ESP_OK;
-    }
-    if (ret == ESP_ERR_NOT_FINISHED || ret == ESP_OK) {
-again:
-        ptr = sdio_slave_recv_get_buf(handle, &length);
-        esp_netif_receive(netif, ptr, length, NULL);
-        if (sdio_slave_recv_load_buf(handle) != ESP_OK) {
-            ESP_LOGE(TAG, "Failed to recycle packet buffer");
-            return ESP_FAIL;
-        }
-        if (ret == ESP_ERR_NOT_FINISHED) {
-            ret = sdio_slave_recv_packet(&handle, 0);
-            if (ret == ESP_ERR_NOT_FINISHED || ret == ESP_OK) {
-                goto again;
-            }
-        }
-        ESP_LOG_BUFFER_HEXDUMP(TAG, ptr, length, ESP_LOG_VERBOSE);
-        return ESP_OK;
-    }
-    ESP_LOGE(TAG, "Error when receiving packet %d", ret);
-    return ESP_FAIL;
-}
-
-
-static void event_cb(uint8_t pos)
-{
-    ESP_EARLY_LOGI(TAG, "SDIO event: %d", pos);
-    if (pos == SLAVE_INTR) {
-        s_slave_request = sdio_slave_read_reg(SLAVE_REG_REQ);
-        sdio_slave_write_reg(SLAVE_REG_REQ, 0);
-    }
-}
-
-esp_err_t eppp_sdio_slave_init(void)
-{
-    sdio_slave_config_t config = {
-        .sending_mode       = SDIO_SLAVE_SEND_PACKET,
-        .send_queue_size    = BUFFER_NUM,
-        .recv_buffer_size   = BUFFER_SIZE,
-        .event_cb           = event_cb,
-    };
-    esp_err_t ret = sdio_slave_initialize(&config);
-    if (ret != ESP_OK) {
-        return ret;
-    }
-
-    for (int i = 0; i < BUFFER_NUM; i++) {
-        sdio_slave_buf_handle_t handle = sdio_slave_recv_register_buf(sdio_slave_rx_buffer[i]);
-        if (handle == NULL) {
-            sdio_slave_deinit();
-            return ESP_FAIL;
-        }
-        ret = sdio_slave_recv_load_buf(handle);
-        if (ret != ESP_OK) {
-            sdio_slave_deinit();
-            return ESP_FAIL;
-        }
-    }
-
-    sdio_slave_set_host_intena(SDIO_SLAVE_HOSTINT_SEND_NEW_PACKET); // only need one interrupt to notify of a new packet
-
-    ret = sdio_slave_start();
-    if (ret != ESP_OK) {
-        sdio_slave_deinit();
-        return ESP_FAIL;
-    }
-    return ESP_OK;
-}
-
-void eppp_sdio_slave_deinit(void)
-{
-    sdio_slave_stop();
-    sdio_slave_deinit();
-}
-
-#else // SOC_SDIO_SLAVE NOT-SUPPORTED
-
-esp_err_t eppp_sdio_slave_tx(void *h, void *buffer, size_t len)
-{
-    return ESP_ERR_NOT_SUPPORTED;
-}
-esp_err_t eppp_sdio_slave_rx(esp_netif_t *netif)
-{
-    return ESP_ERR_NOT_SUPPORTED;
-}
-
-void eppp_sdio_slave_deinit(void)
-{
-}
-
-esp_err_t eppp_sdio_slave_init(void)
-{
-    return ESP_ERR_NOT_SUPPORTED;
-}
-
-#endif // CONFIG_SOC_SDIO_SLAVE_SUPPORTED

components/eppp_link/examples/host/main/app_main.c

@@ -104,13 +104,11 @@ void app_main(void)
     eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
 #if CONFIG_EPPP_LINK_DEVICE_SPI
     config.transport = EPPP_TRANSPORT_SPI;
-#elif CONFIG_EPPP_LINK_DEVICE_UART
+#else
     config.transport = EPPP_TRANSPORT_UART;
     config.uart.tx_io = CONFIG_EXAMPLE_UART_TX_PIN;
     config.uart.rx_io = CONFIG_EXAMPLE_UART_RX_PIN;
     config.uart.baud = CONFIG_EXAMPLE_UART_BAUDRATE;
-#else
-    config.transport = EPPP_TRANSPORT_SDIO;
 #endif
     esp_netif_t *eppp_netif = eppp_connect(&config);
     if (eppp_netif == NULL) {

components/eppp_link/examples/slave/main/eppp_slave.c

@@ -128,21 +128,16 @@ void app_main(void)
     ESP_ERROR_CHECK(ret);
 
     init_network_interface();   // WiFi station if withing SoC capabilities (otherwise a placeholder)
-//    ESP_ERROR_CHECK(esp_netif_init());
-//    ESP_ERROR_CHECK(esp_event_loop_create_default());
 
     eppp_config_t config = EPPP_DEFAULT_SERVER_CONFIG();
 #if CONFIG_EPPP_LINK_DEVICE_SPI
     config.transport = EPPP_TRANSPORT_SPI;
-#elif CONFIG_EPPP_LINK_DEVICE_UART
+#else
     config.transport = EPPP_TRANSPORT_UART;
     config.uart.tx_io = CONFIG_EXAMPLE_UART_TX_PIN;
     config.uart.rx_io = CONFIG_EXAMPLE_UART_RX_PIN;
     config.uart.baud = CONFIG_EXAMPLE_UART_BAUDRATE;
-#elif CONFIG_EPPP_LINK_DEVICE_SDIO
-    config.transport = EPPP_TRANSPORT_SDIO;
-#endif // transport device
-
+#endif
     esp_netif_t *eppp_netif = eppp_listen(&config);
     if (eppp_netif == NULL) {
         ESP_LOGE(TAG, "Failed to setup connection");

components/eppp_link/idf_component.yml

@@ -1,6 +1,6 @@
-version: 0.2.0
+version: 0.1.1
 url: https://github.com/espressif/esp-protocols/tree/master/components/eppp_link
 description: The component provides a general purpose PPP connectivity, typically used as WiFi-PPP router
 dependencies:
-  idf: '>=5.2'
-  espressif/esp_serial_slave_link: "^1.1.0"
+  idf:
+    version: '>=5.2'

components/eppp_link/include/eppp_link.h

@@ -28,16 +28,7 @@
             .rx_io = 26,        \
             .queue_size = 16,   \
             .rx_buffer_size = 1024, \
-    },                          \
-    .sdio = {                                   \
-            .width = 4,                         \
-            .clk = 18,                          \
-            .cmd = 19,                          \
-            .d0 = 49,                           \
-            .d1 = 50,                           \
-            .d2 = 16,                           \
-            .d3 = 17,           \
-    },                          \
+    },  \
     . task = {                  \
             .run_task = true,   \
             .stack_size = 4096, \
@@ -62,7 +53,6 @@ typedef enum eppp_type {
 typedef enum eppp_transport {
     EPPP_TRANSPORT_UART,
     EPPP_TRANSPORT_SPI,
-    EPPP_TRANSPORT_SDIO,
 } eppp_transport_t;
 
 
@@ -91,16 +81,6 @@ typedef struct eppp_config_t {
         int rx_buffer_size;
     } uart;
 
-    struct eppp_config_sdio_s {
-        int width;
-        int clk;
-        int cmd;
-        int d0;
-        int d1;
-        int d2;
-        int d3;
-    } sdio;
-
     struct eppp_config_task_s {
         bool run_task;
         int stack_size;

components/esp_modem/Kconfig

@@ -63,17 +63,4 @@ menu "esp-modem"
             dce_factory::Factory::create_unique_dce_from<CustomModule, DCE*>(dce_config, std::move(dte), netif)
             Please refer to the pppos_client example for more details.
 
-    config ESP_MODEM_C_API_STR_MAX
-        int "Size in bytes for response from AT commands returning textual values (C-API)"
-        default 128
-        help
-            Some AT commands returns textual values which C-API copy as c-string to user allocated space,
-            it also truncates the output data to this size. Increase this if some AT answers are truncated.
-
-    config ESP_MODEM_URC_HANDLER
-        bool "Enable support for adding URC handler"
-        default n
-        help
-            If enabled, APIs to add URC handler are available
-
 endmenu

components/esp_modem/examples/modem_console/README.md

@@ -16,9 +16,9 @@ class.
 
 ### USB DTE support
 
-For USB enabled targets (ESP32-S2, ESP32-S3, or ESP32-P4), it is possible to connect to the modem device via USB.
+For USB enabled targets (ESP32-S2 and ESP32-S3), it is possible to connect to the modem device via USB.
 1. In menuconfig, navigate to `Example Configuration->Type of serial connection to the modem` and choose `USB`.
-2. Connect the modem USB signals to your ESP chip (pin 19 (DATA-) and 20 (DATA+) for ESP32-S2/S3).
+2. Connect the modem USB signals to pin 19 (DATA-) and 20 (DATA+) on your ESP chip.
 
 USB example uses Quactel BG96 modem device. BG96 needs a positive pulse on its PWK pin to boot-up.
 

components/esp_modem/examples/modem_console/main/Kconfig.projbuild

@@ -10,7 +10,7 @@ menu "Example Configuration"
                 Connect to modem via UART.
         config EXAMPLE_SERIAL_CONFIG_USB
             bool "USB"
-            depends on IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4
+            depends on IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
             help
                 Connect to modem via USB (CDC-ACM class). For IDF version >= 4.4.
     endchoice
@@ -36,11 +36,6 @@ menu "Example Configuration"
             bool "BG96"
             help
                 Quectel BG96 is a series of LTE Cat M1/Cat NB1/EGPRS module.
-        config EXAMPLE_MODEM_DEVICE_EC20
-            depends on EXAMPLE_SERIAL_CONFIG_USB
-            bool "EC20"
-            help
-                Quectel EC20 is a series of LTE Cat M4 module.
         config EXAMPLE_MODEM_DEVICE_SIM7000
             depends on EXAMPLE_SERIAL_CONFIG_UART
             bool "SIM7000"

components/esp_modem/examples/modem_console/main/idf_component.yml

@@ -6,7 +6,7 @@ dependencies:
     version: "^1.0.0"
     override_path: "../../../"
   espressif/esp_modem_usb_dte:
-    version: "^1.2.0"
+    version: "^1.1.0"
     rules:
       - if: "idf_version >=4.4"
-      - if: "target in [esp32s2, esp32s3, esp32p4]"
+      - if: "target in [esp32s2, esp32s3]"

components/esp_modem/examples/modem_console/main/modem_console_main.cpp

@@ -160,9 +160,6 @@ extern "C" void app_main(void)
 #if CONFIG_EXAMPLE_MODEM_DEVICE_BG96 == 1
         ESP_LOGI(TAG, "Initializing esp_modem for the BG96 module...");
         struct esp_modem_usb_term_config usb_config = ESP_MODEM_BG96_USB_CONFIG();
-#elif CONFIG_EXAMPLE_MODEM_DEVICE_EC20 == 1
-        ESP_LOGI(TAG, "Initializing esp_modem for the EC20 module...");
-        struct esp_modem_usb_term_config usb_config = ESP_MODEM_EC20_USB_CONFIG();
 #elif CONFIG_EXAMPLE_MODEM_DEVICE_SIM7600 == 1
         ESP_LOGI(TAG, "Initializing esp_modem for the SIM7600 module...");
         struct esp_modem_usb_term_config usb_config = ESP_MODEM_SIM7600_USB_CONFIG();
@@ -183,7 +180,7 @@ extern "C" void app_main(void)
         });
 #if CONFIG_EXAMPLE_MODEM_DEVICE_BG96 == 1
         std::unique_ptr<DCE> dce = create_BG96_dce(&dce_config, dte, esp_netif);
-#elif CONFIG_EXAMPLE_MODEM_DEVICE_SIM7600 == 1 || CONFIG_EXAMPLE_MODEM_DEVICE_A7670 == 1 || CONFIG_EXAMPLE_MODEM_DEVICE_EC20 == 1
+#elif CONFIG_EXAMPLE_MODEM_DEVICE_SIM7600 == 1 || CONFIG_EXAMPLE_MODEM_DEVICE_A7670 == 1
         std::unique_ptr<DCE> dce = create_SIM7600_dce(&dce_config, dte, esp_netif);
 #else
 #error USB modem not selected

components/esp_modem/examples/modem_console/sdkconfig.ci.usb_p4

@@ -1,2 +0,0 @@
-CONFIG_IDF_TARGET="esp32p4"
-CONFIG_EXAMPLE_SERIAL_CONFIG_USB=y

components/esp_modem/examples/pppos_client/README.md

@@ -11,9 +11,9 @@ See the README.md file in the upper level `pppos` directory for more information
 
 ### USB DTE support
 
-For USB enabled targets (ESP32-S2, ESP32-S3, or ESP32-P4), it is possible to connect to the modem device via USB.
+For USB enabled targets (ESP32-S2 and ESP32-S3), it is possible to connect to the modem device via USB.
 1. In menuconfig, navigate to `Example Configuration->Type of serial connection to the modem` and choose `USB`.
-2. Connect the modem USB signals to your ESP chip (pin 19 (DATA-) and 20 (DATA+) for ESP32-S2/S3).
+2. Connect the modem USB signals to pin 19 (DATA-) and 20 (DATA+) on your ESP chip.
 
 USB example uses Quactel BG96 modem device. BG96 needs a positive pulse on its PWK pin to boot-up.
 

components/esp_modem/examples/pppos_client/main/Kconfig.projbuild

@@ -9,7 +9,7 @@ menu "Example Configuration"
                 Connect to modem via UART.
         config EXAMPLE_SERIAL_CONFIG_USB
             bool "USB"
-            depends on IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32P4
+            depends on IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
             help
                 Connect to modem via USB (CDC-ACM class). For IDF version >= 4.4.
     endchoice
@@ -29,11 +29,6 @@ menu "Example Configuration"
             bool "BG96"
             help
                 Quectel BG96 is a series of LTE Cat M1/Cat NB1/EGPRS module.
-        config EXAMPLE_MODEM_DEVICE_EC20
-            depends on EXAMPLE_SERIAL_CONFIG_USB
-            bool "EC20"
-            help
-                Quectel EC20 is a series of LTE Cat M4 module.
         config EXAMPLE_MODEM_DEVICE_SIM7000
             depends on EXAMPLE_SERIAL_CONFIG_UART
             bool "SIM7000"

components/esp_modem/examples/pppos_client/main/custom_module.hpp

@@ -56,7 +56,7 @@ DCE *esp_modem_create_custom_dce(const esp_modem_dce_config_t *dce_config, std::
 /**
  * @brief This API is only needed for extending standard C-API, since we added get_time() method to our CustomModule
  *
- * @note This header is included from esp_modem_c_api.cpp, so it could use CONFIG_ESP_MODEM_C_API_STR_MAX macro
+ * @note This header is included from esp_modem_c_api.cpp, so it could use ESP_MODEM_C_API_STR_MAX macro
  * indicating maximum C-API string size
  *
  * @note In order to access the newly added API get_time(), we have to static_cast<> the GenericModule from DCE
@@ -70,10 +70,10 @@ extern "C" esp_err_t esp_modem_get_time(esp_modem_dce_t *dce_wrap, char *p_time)
     if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
         return ESP_ERR_INVALID_ARG;
     }
-    std::string time{CONFIG_ESP_MODEM_C_API_STR_MAX};
+    std::string time{ESP_MODEM_C_API_STR_MAX};
     auto ret = command_response_to_esp_err(static_cast<SIM7600_WITH_TIME *>(dce_wrap->dce->get_module())->get_time(time));
     if (ret == ESP_OK && !time.empty()) {
-        strlcpy(p_time, time.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
+        strlcpy(p_time, time.c_str(), ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }

components/esp_modem/examples/pppos_client/main/idf_component.yml

@@ -6,7 +6,7 @@ dependencies:
     version: "^1.0.0"
     override_path: "../../../"
   espressif/esp_modem_usb_dte:
-    version: "^1.2.0"
+    version: "^1.1.0"
     rules:
       - if: "idf_version >=4.4"
-      - if: "target in [esp32s2, esp32s3, esp32p4]"
+      - if: "target in [esp32s2, esp32s3]"

components/esp_modem/examples/pppos_client/main/pppos_client_main.c

@@ -219,10 +219,6 @@ void app_main(void)
         ESP_LOGI(TAG, "Initializing esp_modem for the BG96 module...");
         struct esp_modem_usb_term_config usb_config = ESP_MODEM_BG96_USB_CONFIG();
         esp_modem_dce_device_t usb_dev_type = ESP_MODEM_DCE_BG96;
-#elif CONFIG_EXAMPLE_MODEM_DEVICE_EC20 == 1
-        ESP_LOGI(TAG, "Initializing esp_modem for the EC20 module...");
-        struct esp_modem_usb_term_config usb_config = ESP_MODEM_EC20_USB_CONFIG();
-        esp_modem_dce_device_t usb_dev_type = ESP_MODEM_DCE_EC20;
 #elif CONFIG_EXAMPLE_MODEM_DEVICE_SIM7600 == 1
         ESP_LOGI(TAG, "Initializing esp_modem for the SIM7600 module...");
         struct esp_modem_usb_term_config usb_config = ESP_MODEM_SIM7600_USB_CONFIG();

components/esp_modem/examples/pppos_client/sdkconfig.ci.usb_p4

@@ -1,2 +0,0 @@
-CONFIG_IDF_TARGET="esp32p4"
-CONFIG_EXAMPLE_SERIAL_CONFIG_USB=y

components/esp_modem/examples/simple_cmux_client/main/Kconfig.projbuild

@@ -129,16 +129,4 @@ menu "Example Configuration"
         help
             URL of an mqtt broker which this example connects to.
 
-    config EXAMPLE_MQTT_TEST_TOPIC
-        string "MQTT topic to publish/subscribe"
-        default "/topic/esp-pppos"
-        help
-            MQTT topic, which we subscribe on and publish to.
-
-    config EXAMPLE_MQTT_TEST_DATA
-        string "MQTT data to publish/receive"
-        default "esp32-pppos"
-        help
-            MQTT data message, which we publish and expect to receive.
-
 endmenu

components/esp_modem/examples/simple_cmux_client/main/simple_cmux_client_main.cpp

@@ -234,8 +234,8 @@ extern "C" void app_main(void)
         }
         std::cout << "Connected" << std::endl;
 
-        mqtt.subscribe(CONFIG_EXAMPLE_MQTT_TEST_TOPIC);
-        mqtt.publish(CONFIG_EXAMPLE_MQTT_TEST_TOPIC, CONFIG_EXAMPLE_MQTT_TEST_DATA);
+        mqtt.subscribe("/topic/esp-modem");
+        mqtt.publish("/topic/esp-modem", "Hello modem");
         if (!handler.wait_for(StatusHandler::MQTT_Data, 60000)) {
             ESP_LOGE(TAG, "Didn't receive published data within specified timeout... exiting");
             return;

components/esp_modem/examples/simple_cmux_client/pytest_cmux.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 from __future__ import print_function, unicode_literals
 
@@ -10,17 +10,8 @@ def test_cmux_connection(dut):
       2. checks we get an IP
       3. checks for the MQTT events
     """
-    # Get topic and data from Kconfig
-    topic = ''
-    data = ''
-    try:
-        topic = dut.app.sdkconfig.get('EXAMPLE_MQTT_TEST_TOPIC')
-        data = dut.app.sdkconfig.get('EXAMPLE_MQTT_TEST_DATA')
-    except Exception:
-        print('ENV_TEST_FAILURE: Cannot find broker url in sdkconfig')
-        raise
     # Check the sequence of connecting, publishing, disconnecting
     dut.expect('Modem has correctly entered multiplexed')
     # Check for MQTT connection and the data event
-    dut.expect(f'TOPIC: {topic}')
-    dut.expect(f'DATA: {data}')
+    dut.expect('TOPIC: /topic/esp-modem')
+    dut.expect('DATA: Hello modem')

components/esp_modem/examples/simple_cmux_client/sdkconfig.ci.sim800_cmux

@@ -15,4 +15,3 @@ CONFIG_ESP32_PANIC_PRINT_HALT=y
 CONFIG_COMPILER_CXX_EXCEPTIONS=y
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_EXAMPLE_CLOSE_CMUX_AT_END=y
-CONFIG_EXAMPLE_MQTT_TEST_TOPIC="/ci/esp-modem/pppos-client"

components/esp_modem/include/cxx_include/esp_modem_dce.hpp

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -89,13 +89,6 @@ public:
         return dte->recover();
     }
 
-#ifdef CONFIG_ESP_MODEM_URC_HANDLER
-    void set_urc(got_line_cb on_read_cb)
-    {
-        dte->set_urc_cb(on_read_cb);
-    }
-#endif
-
 protected:
     std::shared_ptr<DTE> dte;
     std::shared_ptr<SpecificModule> device;

components/esp_modem/include/cxx_include/esp_modem_dte.hpp

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -94,17 +94,6 @@ public:
      */
     void set_error_cb(std::function<void(terminal_error err)> f);
 
-#ifdef CONFIG_ESP_MODEM_URC_HANDLER
-    /**
-     * @brief Allow setting a line callback for all incoming data
-     * @param line_cb
-     */
-    void set_urc_cb(got_line_cb line_cb)
-    {
-        command_cb.urc_handler = std::move(line_cb);
-    }
-#endif
-
     /**
      * @brief Sets the DTE to desired mode (Command/Data/Cmux)
      * @param m Desired operation mode
@@ -202,9 +191,6 @@ private:
      * @brief This abstracts command callback processing and implements its locking, signaling of completion and timeouts.
      */
     struct command_cb {
-#ifdef CONFIG_ESP_MODEM_URC_HANDLER
-        got_line_cb urc_handler {};                             /*!< URC callback if enabled */
-#endif
         static const size_t GOT_LINE = SignalGroup::bit0;       /*!< Bit indicating response available */
         got_line_cb got_line;                                   /*!< Supplied command callback */
         Lock line_lock{};                                       /*!< Command callback locking mechanism */

components/esp_modem/include/esp_modem_c_api_types.h

@@ -52,7 +52,6 @@ typedef enum esp_modem_dce_device {
     ESP_MODEM_DCE_SIM7070,
     ESP_MODEM_DCE_SIM7000,
     ESP_MODEM_DCE_BG96,
-    ESP_MODEM_DCE_EC20,
     ESP_MODEM_DCE_SIM800,
     ESP_MODEM_DCE_CUSTOM
 } esp_modem_dce_device_t;

components/esp_modem/include/generate/esp_modem_command_declare.inc

@@ -50,6 +50,7 @@ ESP_MODEM_DECLARE_DCE_COMMAND(set_pin, command_result, 1, STRING_IN(p1, pin)) \
  * @param[out] out Raw output from DTE
  * @param[in] pass Pattern in response for the API to return OK
  * @param[in] fail Pattern in response for the API to return FAIL
+ * @param[in] cmd String command that's send to DTE
  * @param[in] timeout AT command timeout in milliseconds
  * @return OK, FAIL or TIMEOUT
  */\

components/esp_modem/include/generate/esp_modem_command_declare_helper.inc

@@ -3,9 +3,9 @@
 // Parameters
 // * handle different parameters for C++ and C API
 // * make parameter unique names, so they could be easily referenced and forwarded
+#define _ARG(param, name) param
 #define INT_IN(param, name) int  _ARG(param, name)
 #ifdef __cplusplus
-#define _ARG(param, name) param
 #include <string>
 #define STRING_IN(param, name) const std::string& _ARG(param, name)
 #define STRING_OUT(param, name) std::string& _ARG(param, name)
@@ -16,7 +16,6 @@
 
 #define STRUCT_OUT(struct_name, p1)  struct_name& p1
 #else
-#define _ARG(param, name) name
 #define STRING_IN(param, name) const char* _ARG(param, name)
 #define STRING_OUT(param, name) char* _ARG(param, name)
 #define BOOL_IN(param, name) const bool _ARG(param, name)

components/esp_modem/src/esp_modem_c_api.cpp

@@ -16,6 +16,10 @@
 #include "exception_stub.hpp"
 #include "esp_private/c_api_wrapper.hpp"
 
+#ifndef ESP_MODEM_C_API_STR_MAX
+#define ESP_MODEM_C_API_STR_MAX 128
+#endif
+
 #ifndef HAVE_STRLCPY
 size_t strlcpy(char *dest, const char *src, size_t len);
 #endif
@@ -176,7 +180,7 @@ extern "C" esp_err_t esp_modem_at(esp_modem_dce_t *dce_wrap, const char *at, cha
     std::string at_str(at);
     auto ret = command_response_to_esp_err(dce_wrap->dce->at(at_str, out, timeout));
     if ((p_out != NULL) && (!out.empty())) {
-        strlcpy(p_out, out.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
+        strlcpy(p_out, out.c_str(), ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }
@@ -197,7 +201,7 @@ extern "C" esp_err_t esp_modem_get_imsi(esp_modem_dce_t *dce_wrap, char *p_imsi)
     std::string imsi;
     auto ret = command_response_to_esp_err(dce_wrap->dce->get_imsi(imsi));
     if (ret == ESP_OK && !imsi.empty()) {
-        strlcpy(p_imsi, imsi.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
+        strlcpy(p_imsi, imsi.c_str(), ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }
@@ -210,7 +214,7 @@ extern "C" esp_err_t esp_modem_at_raw(esp_modem_dce_t *dce_wrap, const char *cmd
     std::string out;
     auto ret = command_response_to_esp_err(dce_wrap->dce->at_raw(cmd, out, pass, fail, timeout));
     if ((p_out != NULL) && (!out.empty())) {
-        strlcpy(p_out, out.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
+        strlcpy(p_out, out.c_str(), ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }
@@ -240,7 +244,7 @@ extern "C" esp_err_t esp_modem_get_imei(esp_modem_dce_t *dce_wrap, char *p_imei)
     std::string imei;
     auto ret = command_response_to_esp_err(dce_wrap->dce->get_imei(imei));
     if (ret == ESP_OK && !imei.empty()) {
-        strlcpy(p_imei, imei.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
+        strlcpy(p_imei, imei.c_str(), ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }
@@ -254,7 +258,7 @@ extern "C" esp_err_t esp_modem_get_operator_name(esp_modem_dce_t *dce_wrap, char
     int act;
     auto ret = command_response_to_esp_err(dce_wrap->dce->get_operator_name(name, act));
     if (ret == ESP_OK && !name.empty()) {
-        strlcpy(p_name, name.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
+        strlcpy(p_name, name.c_str(), ESP_MODEM_C_API_STR_MAX);
         *p_act = act;
     }
     return ret;
@@ -268,7 +272,7 @@ extern "C" esp_err_t esp_modem_get_module_name(esp_modem_dce_t *dce_wrap, char *
     std::string name;
     auto ret = command_response_to_esp_err(dce_wrap->dce->get_module_name(name));
     if (ret == ESP_OK && !name.empty()) {
-        strlcpy(p_name, name.c_str(), CONFIG_ESP_MODEM_C_API_STR_MAX);
+        strlcpy(p_name, name.c_str(), ESP_MODEM_C_API_STR_MAX);
     }
     return ret;
 }

components/esp_modem/src/esp_modem_dte.cpp

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -50,11 +50,9 @@ void DTE::set_command_callbacks()
 {
     primary_term->set_read_cb([this](uint8_t *data, size_t len) {
         Scoped<Lock> l(command_cb.line_lock);
-#ifndef CONFIG_ESP_MODEM_URC_HANDLER
-        if (command_cb.got_line == nullptr || command_cb.result != command_result::TIMEOUT) {
-            return false;   // this line has been processed already (got OK or FAIL previously)
+        if (command_cb.got_line == nullptr) {
+            return false;
         }
-#endif
         if (data) {
             // For terminals which post data directly with the callback (CMUX)
             // we cannot defragment unless we allocate, but
@@ -156,10 +154,12 @@ bool DTE::exit_cmux()
     if (!cmux_term) {
         return false;
     }
-    const bool success = cmux_term->deinit();
+    if (!cmux_term->deinit()) {
+        return false;
+    }
     exit_cmux_internal();
     cmux_term.reset();
-    return success;
+    return true;
 }
 
 void DTE::exit_cmux_internal()
@@ -347,14 +347,9 @@ void DTE::on_read(got_line_cb on_read_cb)
 
 bool DTE::command_cb::process_line(uint8_t *data, size_t consumed, size_t len)
 {
-#ifdef CONFIG_ESP_MODEM_URC_HANDLER
-    if (urc_handler) {
-        urc_handler(data, consumed + len);
-    }
-    if (result != command_result::TIMEOUT || got_line == nullptr) {
+    if (result != command_result::TIMEOUT) {
         return false;   // this line has been processed already (got OK or FAIL previously)
     }
-#endif
     if (memchr(data + consumed, separator, len)) {
         result = got_line(data, consumed + len);
         if (result == command_result::OK || result == command_result::FAIL) {

components/esp_modem/test/target/main/CMakeLists.txt

@@ -1,6 +1,7 @@
 idf_component_register(SRCS "pppd_test.cpp"
                             "NetworkDCE.cpp"
-                       REQUIRES esp_modem catch2)
+        INCLUDE_DIRS "$ENV{IDF_PATH}/tools/catch"
+        REQUIRES esp_modem)
 
 set_target_properties(${COMPONENT_LIB} PROPERTIES
     CXX_STANDARD 17

components/esp_modem/test/target/main/Kconfig.projbuild

@@ -27,23 +27,12 @@ menu "Test App Configuration"
         help
             Pin number of UART RX.
 
-    config TEST_APP_AUTH
-        bool "Use PPP authentication"
-        select LWIP_PPP_CHAP_SUPPORT
-        default n
+    config TEST_APP_TCP_PORT
+        int "Port of test"
+        range 0 65535
+        default 2222
         help
-            Set to true for the PPP client to use authentication
-
-    config TEST_APP_AUTH_USERNAME
-        string "Set username for authentication"
-        default "myclient"
-        help
-            Username to authenticate the PPP connection.
-
-    config TEST_APP_AUTH_PASSWORD
-        string "Set password for authentication"
-        default "mypassword"
-        help
-            Password to authenticate the PPP connection.
+            The remote port to which the client will connects to
+            once the PPP connection established
 
 endmenu

components/esp_modem/test/target/main/idf_component.yml

@@ -1,4 +0,0 @@
-dependencies:
-  espressif/catch2: "*"
-  idf:
-    version: ">=4.4"

components/esp_modem/test/target/main/pppd_test.cpp

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -18,8 +18,7 @@
 #include "freertos/event_groups.h"
 
 #define CATCH_CONFIG_MAIN
-#include "catch2/catch_test_macros.hpp"
-#include "catch2/catch_session.hpp"
+#include "catch.hpp"
 
 static const char *TAG = "pppd_test";
 static EventGroupHandle_t event_group = NULL;
@@ -95,10 +94,6 @@ extern "C" void app_main(void)
     ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, on_modem_event, nullptr));
     ESP_ERROR_CHECK(esp_event_handler_register(NETIF_PPP_STATUS, ESP_EVENT_ANY_ID, &on_ppp_changed, nullptr));
 
-#if CONFIG_TEST_APP_AUTH
-    esp_netif_ppp_set_auth(ppp_netif, NETIF_PPP_AUTHTYPE_CHAP, CONFIG_TEST_APP_AUTH_USERNAME, CONFIG_TEST_APP_AUTH_PASSWORD);
-#endif
-
     modem_start_network();
     Catch::Session session;
     int numFailed = session.run();

components/esp_modem/test/target/pytest_pppd.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 from __future__ import print_function, unicode_literals
 
@@ -9,20 +9,14 @@ from threading import Event, Thread
 import netifaces
 
 
-def run_server(server_stop, port, server_ip, client_ip, auth, auth_user, auth_password):
+def run_server(server_stop, port, server_ip, client_ip):
     print('Starting PPP server on port: {}'.format(port))
     try:
         arg_list = [
             'sudo', 'pppd', port, '115200',
-            '{}:{}'.format(server_ip, client_ip), 'modem', 'local',
+            '{}:{}'.format(server_ip, client_ip), 'modem', 'local', 'noauth',
             'debug', 'nocrtscts', 'nodetach', '+ipv6'
         ]
-        if auth:
-            arg_list.extend(['auth', '+chap'])
-            subprocess.run(['sudo', 'rm', '/etc/ppp/chap-secrets'])
-            subprocess.run(f"echo '{auth_user} * {auth_password} *' | sudo tee -a /etc/ppp/chap-secrets", shell=True)
-        else:
-            arg_list.append('noauth')
         p = subprocess.Popen(arg_list, stdout=subprocess.PIPE, bufsize=1)
         while not server_stop.is_set():
             if p.poll() is not None:
@@ -57,9 +51,6 @@ def test_examples_protocol_pppos_connect(dut):
     try:
         server_ip = dut.app.sdkconfig.get('TEST_APP_PPP_SERVER_IP')
         client_ip = dut.app.sdkconfig.get('TEST_APP_PPP_CLIENT_IP')
-        auth = dut.app.sdkconfig.get('TEST_APP_AUTH')
-        auth_user = dut.app.sdkconfig.get('TEST_APP_AUTH_USERNAME')
-        auth_password = dut.app.sdkconfig.get('TEST_APP_AUTH_PASSWORD')
     except Exception:
         print(
             'ENV_TEST_FAILURE: Some mandatory configuration not found in sdkconfig'
@@ -72,7 +63,7 @@ def test_examples_protocol_pppos_connect(dut):
     # Start the PPP server
     server_stop = Event()
     t = Thread(target=run_server,
-               args=(server_stop, port, server_ip, client_ip, auth, auth_user, auth_password))
+               args=(server_stop, port, server_ip, client_ip))
     t.start()
     try:
         ppp_server_timeout = time.time() + 30

components/esp_modem/test/target/sdkconfig.ci.pppd_chap_auth

@@ -1,5 +0,0 @@
-CONFIG_COMPILER_CXX_EXCEPTIONS=y
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
-CONFIG_LWIP_PPP_SUPPORT=y
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
-CONFIG_TEST_APP_AUTH=y

components/esp_modem/test/target/sdkconfig.defaults

@@ -1,4 +1,4 @@
 CONFIG_COMPILER_CXX_EXCEPTIONS=y
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
-CONFIG_LWIP_PPP_SUPPORT=y
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
+CONFIG_CXX_EXCEPTIONS=y
+CONFIG_PPP_SUPPORT=y
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096

components/esp_mqtt_cxx/.cz.yaml

@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(mqtt_cxx): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py esp_mqtt_cxx
   tag_format: mqtt_cxx-v$version
-  version: 0.4.0
+  version: 0.3.0
   version_files:
   - idf_component.yml

components/esp_mqtt_cxx/CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## [0.4.0](https://github.com/espressif/esp-protocols/commits/mqtt_cxx-v0.4.0)
-
-### Bug Fixes
-
-- Adds missing configuration fields ([d4c6d5ed](https://github.com/espressif/esp-protocols/commit/d4c6d5ed))
-
 ## [0.3.0](https://github.com/espressif/esp-protocols/commits/mqtt_cxx-v0.3.0)
 
 ### Bug Fixes

components/esp_mqtt_cxx/idf_component.yml

@@ -1,4 +1,4 @@
-version: "0.4.0"
+version: "0.3.0"
 description: C++ APIs for ESP-MQTT library
 url: https://github.com/espressif/esp-protocols/tree/master/components/esp_mqtt_cxx
 issues: https://github.com/espressif/esp-protocols/issues

components/esp_websocket_client/esp_websocket_client.c

@@ -95,9 +95,7 @@ typedef struct {
     size_t                      client_key_len;
     bool                        use_global_ca_store;
     bool                        skip_cert_common_name_check;
-    const char                  *cert_common_name;
     esp_err_t                   (*crt_bundle_attach)(void *conf);
-    esp_transport_handle_t      ext_transport;
 } websocket_config_storage_t;
 
 typedef enum {
@@ -206,8 +204,6 @@ static esp_err_t esp_websocket_client_dispatch_event(esp_websocket_client_handle
         event_data.error_handle.esp_tls_last_esp_err = esp_tls_get_and_clear_last_error(esp_transport_get_error_handle(client->transport),
                 &client->error_handle.esp_tls_stack_err,
                 &client->error_handle.esp_tls_cert_verify_flags);
-        event_data.error_handle.esp_tls_stack_err = client->error_handle.esp_tls_stack_err;
-        event_data.error_handle.esp_tls_cert_verify_flags = client->error_handle.esp_tls_cert_verify_flags;
         event_data.error_handle.esp_transport_sock_errno = esp_transport_get_errno(client->transport);
     }
     event_data.error_handle.error_type = client->error_handle.error_type;
@@ -504,10 +500,6 @@ static esp_err_t esp_websocket_client_create_transport(esp_websocket_client_hand
         if (client->keep_alive_cfg.keep_alive_enable) {
             esp_transport_ssl_set_keep_alive(ssl, &client->keep_alive_cfg);
         }
-        if (client->if_name) {
-            esp_transport_ssl_set_interface_name(ssl, client->if_name);
-        }
-
         if (client->config->use_global_ca_store == true) {
             esp_transport_ssl_enable_global_ca_store(ssl);
         } else if (client->config->cert) {
@@ -541,13 +533,6 @@ static esp_err_t esp_websocket_client_create_transport(esp_websocket_client_hand
         if (client->config->skip_cert_common_name_check) {
             esp_transport_ssl_skip_common_name_check(ssl);
         }
-        if (client->config->cert_common_name) {
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
-            esp_transport_ssl_set_common_name(ssl, client->config->cert_common_name);
-#else
-            ESP_LOGE(TAG, "cert_common_name requires ESP-IDF 5.1.0 or later");
-#endif
-        }
 
         esp_transport_handle_t wss = esp_transport_ws_init(ssl);
         ESP_WS_CLIENT_MEM_CHECK(TAG, wss, return ESP_ERR_NO_MEM);
@@ -683,11 +668,6 @@ esp_websocket_client_handle_t esp_websocket_client_init(const esp_websocket_clie
     }
 
     // configure ssl related parameters
-    if (config->cert_common_name != NULL && config->skip_cert_common_name_check) {
-        ESP_LOGE(TAG, "Both cert_common_name and skip_cert_common_name_check are set, only one of them can be set");
-        goto _websocket_init_fail;
-    }
-
     client->config->use_global_ca_store = config->use_global_ca_store;
     client->config->cert = config->cert_pem;
     client->config->cert_len = config->cert_len;
@@ -696,9 +676,7 @@ esp_websocket_client_handle_t esp_websocket_client_init(const esp_websocket_clie
     client->config->client_key = config->client_key;
     client->config->client_key_len = config->client_key_len;
     client->config->skip_cert_common_name_check = config->skip_cert_common_name_check;
-    client->config->cert_common_name = config->cert_common_name;
     client->config->crt_bundle_attach = config->crt_bundle_attach;
-    client->config->ext_transport = config->ext_transport;
 
     if (config->uri) {
         if (esp_websocket_client_set_uri(client, config->uri) != ESP_OK) {
@@ -957,9 +935,7 @@ static void esp_websocket_client_task(void *pv)
     client->run = true;
 
     //get transport by scheme
-    if (client->transport == NULL && client->config->ext_transport == NULL) {
-        client->transport = esp_transport_list_get_transport(client->transport_list, client->config->scheme);
-    }
+    client->transport = esp_transport_list_get_transport(client->transport_list, client->config->scheme);
 
     if (client->transport == NULL) {
         ESP_LOGE(TAG, "There are no transports valid, stop websocket client");
@@ -972,7 +948,6 @@ static void esp_websocket_client_task(void *pv)
 
     client->state = WEBSOCKET_STATE_INIT;
     xEventGroupClearBits(client->status_bits, STOPPED_BIT | CLOSE_FRAME_SENT_BIT);
-    esp_websocket_client_dispatch_event(client, WEBSOCKET_EVENT_BEGIN, NULL, 0);
     int read_select = 0;
     while (client->run) {
         if (xSemaphoreTakeRecursive(client->lock, lock_timeout) != pdPASS) {
@@ -1107,7 +1082,6 @@ static void esp_websocket_client_task(void *pv)
         }
     }
 
-    esp_websocket_client_dispatch_event(client, WEBSOCKET_EVENT_FINISH, NULL, 0);
     esp_transport_close(client->transport);
     xEventGroupSetBits(client->status_bits, STOPPED_BIT);
     client->state = WEBSOCKET_STATE_UNKNOW;
@@ -1126,13 +1100,9 @@ esp_err_t esp_websocket_client_start(esp_websocket_client_handle_t client)
         ESP_LOGE(TAG, "The client has started");
         return ESP_FAIL;
     }
-
-    client->transport = client->config->ext_transport;
-    if (!client->transport) {
-        if (esp_websocket_client_create_transport(client) != ESP_OK) {
-            ESP_LOGE(TAG, "Failed to create websocket transport");
-            return ESP_FAIL;
-        }
+    if (esp_websocket_client_create_transport(client) != ESP_OK) {
+        ESP_LOGE(TAG, "Failed to create websocket transport");
+        return ESP_FAIL;
     }
 
     if (xTaskCreate(esp_websocket_client_task, client->config->task_name ? client->config->task_name : "websocket_task",
@@ -1141,7 +1111,6 @@ esp_err_t esp_websocket_client_start(esp_websocket_client_handle_t client)
         return ESP_FAIL;
     }
     xEventGroupClearBits(client->status_bits, STOPPED_BIT | CLOSE_FRAME_SENT_BIT);
-    ESP_LOGI(TAG, "Started");
     return ESP_OK;
 }
 
@@ -1309,43 +1278,6 @@ esp_err_t esp_websocket_client_set_ping_interval_sec(esp_websocket_client_handle
     return ESP_OK;
 }
 
-int esp_websocket_client_get_reconnect_timeout(esp_websocket_client_handle_t client)
-{
-    if (client == NULL) {
-        ESP_LOGW(TAG, "Client was not initialized");
-        return -1;
-    }
-
-    if (!client->config->auto_reconnect) {
-        ESP_LOGW(TAG, "Automatic reconnect is disabled");
-        return -1;
-    }
-
-    return client->wait_timeout_ms;
-}
-
-esp_err_t esp_websocket_client_set_reconnect_timeout(esp_websocket_client_handle_t client, int reconnect_timeout_ms)
-{
-    if (client == NULL) {
-        ESP_LOGW(TAG, "Client was not initialized");
-        return ESP_ERR_INVALID_ARG;
-    }
-
-    if (reconnect_timeout_ms <= 0) {
-        ESP_LOGW(TAG, "Invalid reconnect timeout");
-        return ESP_ERR_INVALID_ARG;
-    }
-
-    if (!client->config->auto_reconnect) {
-        ESP_LOGW(TAG, "Automatic reconnect is disabled");
-        return ESP_ERR_INVALID_STATE;
-    }
-
-    client->wait_timeout_ms = reconnect_timeout_ms;
-
-    return ESP_OK;
-}
-
 esp_err_t esp_websocket_register_events(esp_websocket_client_handle_t client,
                                         esp_websocket_event_id_t event,
                                         esp_event_handler_t event_handler,

components/esp_websocket_client/examples/linux/CMakeLists.txt

@@ -6,6 +6,7 @@ set(common_component_dir ../../../../common_components)
 set(EXTRA_COMPONENT_DIRS
    ../..
   "${common_component_dir}/linux_compat/esp_timer"
+  "${common_component_dir}/linux_compat"
   "${common_component_dir}/linux_compat/freertos"
    $ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs
    $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)

components/esp_websocket_client/examples/linux/main/CMakeLists.txt

@@ -1,4 +1,6 @@
-idf_component_register(SRCS "websocket_linux.c"
+idf_component_register(SRCS "main.c"
+                    INCLUDE_DIRS
+                    "."
                     REQUIRES esp_websocket_client protocol_examples_common)
 
 if(CONFIG_GCOV_ENABLED)

components/esp_websocket_client/examples/linux/main/main.c

@@ -3,13 +3,20 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <esp_log.h>
+#include <stdio.h>
+#include "esp_log.h"
 #include "nvs_flash.h"
 #include "protocol_examples_common.h"
 
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/semphr.h"
+#include "freertos/event_groups.h"
+
 #include "esp_websocket_client.h"
 #include "esp_system.h"
 #include "esp_event.h"
+#include "esp_log.h"
 #include "esp_netif.h"
 
 static const char *TAG = "websocket";
@@ -25,9 +32,6 @@ static void websocket_event_handler(void *handler_args, esp_event_base_t base, i
 {
     esp_websocket_event_data_t *data = (esp_websocket_event_data_t *)event_data;
     switch (event_id) {
-    case WEBSOCKET_EVENT_BEGIN:
-        ESP_LOGI(TAG, "WEBSOCKET_EVENT_BEGIN");
-        break;
     case WEBSOCKET_EVENT_CONNECTED:
         ESP_LOGI(TAG, "WEBSOCKET_EVENT_CONNECTED");
         break;
@@ -62,9 +66,6 @@ static void websocket_event_handler(void *handler_args, esp_event_base_t base, i
             log_error_if_nonzero("captured as transport's socket errno",  data->error_handle.esp_transport_sock_errno);
         }
         break;
-    case WEBSOCKET_EVENT_FINISH:
-        ESP_LOGI(TAG, "WEBSOCKET_EVENT_FINISH");
-        break;
     }
 }
 

components/esp_websocket_client/examples/target/main/CMakeLists.txt

@@ -10,6 +10,12 @@ set(EMBED_FILES "") # Initialize an empty list for files to embed
         "certs/client_key.pem")
 #endif()
 
+# For testing purpose we are using CA of wss://echo.websocket.events
+#if(CONFIG_WS_OVER_TLS_SERVER_AUTH)
+    list(APPEND EMBED_FILES
+        "certs/ca_certificate_public_domain.pem")
+#endif()
+
 # Register the component with source files, include dirs, and any conditionally added embedded files
 idf_component_register(SRCS "${SRC_FILES}"
                        INCLUDE_DIRS "${INCLUDE_DIRS}"

components/esp_websocket_client/examples/target/main/certs/ca_certificate_public_domain.pem

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----

components/esp_websocket_client/examples/target/main/websocket_example.c

@@ -19,7 +19,6 @@
 #include "nvs_flash.h"
 #include "esp_event.h"
 #include "protocol_examples_common.h"
-#include "esp_crt_bundle.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -74,9 +73,6 @@ static void websocket_event_handler(void *handler_args, esp_event_base_t base, i
 {
     esp_websocket_event_data_t *data = (esp_websocket_event_data_t *)event_data;
     switch (event_id) {
-    case WEBSOCKET_EVENT_BEGIN:
-        ESP_LOGI(TAG, "WEBSOCKET_EVENT_BEGIN");
-        break;
     case WEBSOCKET_EVENT_CONNECTED:
         ESP_LOGI(TAG, "WEBSOCKET_EVENT_CONNECTED");
         break;
@@ -125,9 +121,6 @@ static void websocket_event_handler(void *handler_args, esp_event_base_t base, i
             log_error_if_nonzero("captured as transport's socket errno",  data->error_handle.esp_transport_sock_errno);
         }
         break;
-    case WEBSOCKET_EVENT_FINISH:
-        ESP_LOGI(TAG, "WEBSOCKET_EVENT_FINISH");
-        break;
     }
 }
 
@@ -166,12 +159,8 @@ static void websocket_app_start(void)
     websocket_cfg.client_key = key_start;
     websocket_cfg.client_key_len = key_end - key_start;
 #elif CONFIG_WS_OVER_TLS_SERVER_AUTH
-    // Using certificate bundle as default server certificate source
-    websocket_cfg.crt_bundle_attach = esp_crt_bundle_attach;
-    // If using a custom certificate it could be added to certificate bundle, added to the build similar to client certificates in this examples,
-    // or read from NVS.
-    /* extern const char cacert_start[] asm("ADDED_CERTIFICATE"); */
-    /* websocket_cfg.cert_pem = cacert_start; */
+    extern const char cacert_start[] asm("_binary_ca_certificate_public_domain_pem_start"); // CA cert of wss://echo.websocket.event, modify it if using another server
+    websocket_cfg.cert_pem = cacert_start;
 #endif
 
 #if CONFIG_WS_OVER_TLS_SKIP_COMMON_NAME_CHECK

components/esp_websocket_client/examples/target/pytest_websocket.py

@@ -52,7 +52,7 @@ class Websocket(object):
     def run(self):
         if self.use_tls is True:
             ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-            ssl_context.load_cert_chain(certfile='main/certs/server/server_cert.pem', keyfile='main/certs/server/server_key.pem')
+            ssl_context.load_cert_chain(certfile='main/certs/server_cert.pem', keyfile='main/certs/server_key.pem')
             if self.client_verify is True:
                 ssl_context.load_verify_locations(cafile='main/certs/ca_cert.pem')
                 ssl_context.verify = ssl.CERT_REQUIRED

components/esp_websocket_client/include/esp_websocket_client.h

@@ -36,8 +36,6 @@ typedef enum {
     WEBSOCKET_EVENT_DATA,           /*!< When receiving data from the server, possibly multiple portions of the packet */
     WEBSOCKET_EVENT_CLOSED,         /*!< The connection has been closed cleanly */
     WEBSOCKET_EVENT_BEFORE_CONNECT, /*!< The event occurs before connecting */
-    WEBSOCKET_EVENT_BEGIN,          /*!< The event occurs once after thread creation, before event loop */
-    WEBSOCKET_EVENT_FINISH,         /*!< The event occurs once after event loop, before thread destruction */
     WEBSOCKET_EVENT_MAX
 } esp_websocket_event_id_t;
 
@@ -120,7 +118,6 @@ typedef struct {
     bool                        disable_pingpong_discon;    /*!< Disable auto-disconnect due to no PONG received within pingpong_timeout_sec */
     bool                        use_global_ca_store;        /*!< Use a global ca_store for all the connections in which this bool is set. */
     esp_err_t (*crt_bundle_attach)(void *conf);             /*!< Function pointer to esp_crt_bundle_attach. Enables the use of certification bundle for server verification, MBEDTLS_CERTIFICATE_BUNDLE must be enabled in menuconfig. Include esp_crt_bundle.h, and use `esp_crt_bundle_attach` here to include bundled CA certificates. */
-    const char                  *cert_common_name;          /*!< Expected common name of the server certificate */
     bool                        skip_cert_common_name_check;/*!< Skip any validation of server certificate CN field */
     bool                        keep_alive_enable;          /*!< Enable keep-alive timeout */
     int                         keep_alive_idle;            /*!< Keep-alive idle time. Default is 5 (second) */
@@ -130,7 +127,6 @@ typedef struct {
     int                         network_timeout_ms;         /*!< Abort network operation if it is not completed after this value, in milliseconds (defaults to 10s) */
     size_t                      ping_interval_sec;          /*!< Websocket ping interval, defaults to 10 seconds if not set */
     struct ifreq                *if_name;                   /*!< The name of interface for data to go through. Use the default interface without setting */
-    esp_transport_handle_t      ext_transport;              /*!< External WebSocket tcp_transport handle to the client; or if null, the client will create its own transport handle. */
 } esp_websocket_client_config_t;
 
 /**
@@ -420,29 +416,6 @@ size_t esp_websocket_client_get_ping_interval_sec(esp_websocket_client_handle_t
  */
 esp_err_t esp_websocket_client_set_ping_interval_sec(esp_websocket_client_handle_t client, size_t ping_interval_sec);
 
-/**
- * @brief      Get the next reconnect timeout for client. Returns -1 when client is not initialized or automatic reconnect is disabled.
- *
- * @param[in]  client             The client
- *
- * @return     Reconnect timeout in msec
- */
-int esp_websocket_client_get_reconnect_timeout(esp_websocket_client_handle_t client);
-
-/**
- * @brief      Set next reconnect timeout for client.
- *
- *  Notes:
- *  - Changing this value when reconnection delay is already active does not immediately affect the active delay and may have unexpected result.
- *  - Good place to change this value is when handling WEBSOCKET_EVENT_DISCONNECTED or WEBSOCKET_EVENT_ERROR events.
- *
- * @param[in]  client             The client
- * @param[in]  reconnect_timeout_ms  The new timeout
- *
- * @return     esp_err_t
- */
-esp_err_t esp_websocket_client_set_reconnect_timeout(esp_websocket_client_handle_t client, int reconnect_timeout_ms);
-
 /**
  * @brief Register the Websocket Events
  *

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.4.0
+  version: 0.2.3
   version_files:
   - idf_component.yml

components/esp_wifi_remote/CHANGELOG.md

@@ -1,31 +1,5 @@
 # Changelog
 
-## [0.4.0](https://github.com/espressif/esp-protocols/commits/wifi_remote-v0.4.0)
-
-### Features
-
-- Make esp_hosted default RPC library ([1b62adbd](https://github.com/espressif/esp-protocols/commit/1b62adbd))
-- Add build test for current IDF examples ([50c113e4](https://github.com/espressif/esp-protocols/commit/50c113e4))
-- Support for IDF v5.3 in a separate directory ([bde97203](https://github.com/espressif/esp-protocols/commit/bde97203))
-- Support for IDF v5.4 via a separate dir ([e9ac41e1](https://github.com/espressif/esp-protocols/commit/e9ac41e1))
-- Add slave selection and peview targets ([345c4577](https://github.com/espressif/esp-protocols/commit/345c4577))
-
-### Bug Fixes
-
-- Fix CMake to use inherent IDF build vars ([c454ec09](https://github.com/espressif/esp-protocols/commit/c454ec09))
-- Update per v5.4 espressif/esp-idf@97e42349 ([ff5dac70](https://github.com/espressif/esp-protocols/commit/ff5dac70))
-- Fix CI builds to generate configs per slave selection ([8795d164](https://github.com/espressif/esp-protocols/commit/8795d164))
-- Depend on esp_hosted only on targets with no WiFi ([7ca5ed1d](https://github.com/espressif/esp-protocols/commit/7ca5ed1d))
-- Update per espressif/esp-idf@27f61966 ([2e53b81f](https://github.com/espressif/esp-protocols/commit/2e53b81f))
-- Fix checking API compat against reference dir ([1a57a878](https://github.com/espressif/esp-protocols/commit/1a57a878))
-
-## [0.3.0](https://github.com/espressif/esp-protocols/commits/wifi_remote-v0.3.0)
-
-### Features
-
-- add esp_wifi_internal_tx_by_ref ([ba35d14e](https://github.com/espressif/esp-protocols/commit/ba35d14e))
-- Make wifi_remote depend on esp_hosted ([ac9972aa](https://github.com/espressif/esp-protocols/commit/ac9972aa))
-
 ## [0.2.3](https://github.com/espressif/esp-protocols/commits/wifi_remote-v0.2.3)
 
 ### Bug Fixes

components/esp_wifi_remote/CMakeLists.txt

@@ -1,16 +1,14 @@
-set(IDF_VER_DIR "idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")
-
 if(NOT CONFIG_ESP_WIFI_ENABLED)
-    set(src_wifi_is_remote esp_wifi_remote.c ${IDF_VER_DIR}/esp_wifi_with_remote.c esp_wifi_remote_net.c)
+    set(src_wifi_is_remote esp_wifi_remote.c esp_wifi_with_remote.c esp_wifi_remote_net.c)
 endif()
 
 if(CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP)
     set(src_wifi_remote_eppp eppp/wifi_remote_rpc_client.cpp eppp/wifi_remote_rpc_server.cpp eppp/eppp_init.c)
 else()
-    set(src_wifi_remote_weak ${IDF_VER_DIR}/esp_wifi_remote_weak.c)
+    set(src_wifi_remote_weak esp_wifi_remote_weak.c)
 endif()
 
-idf_component_register(INCLUDE_DIRS include ${IDF_VER_DIR}/include
+idf_component_register(INCLUDE_DIRS include
                     SRCS ${src_wifi_remote_weak}
                          ${src_wifi_remote_eppp}
                          ${src_wifi_is_remote}

components/esp_wifi_remote/Kconfig

@@ -1,14 +1,678 @@
+# This file is auto-generated
 menu "Wi-Fi Remote"
     config ESP_WIFI_REMOTE_ENABLED
         bool
         default y
 
-    orsource "./idf_v$ESP_IDF_VERSION/Kconfig.slave_select.in"
-    orsource "./idf_v$ESP_IDF_VERSION/Kconfig.soc_wifi_caps.in"
+    orsource "./Kconfig.soc_wifi_caps.in"
     orsource "./Kconfig.rpc.in"
 
-    menu "Wi-Fi configuration"
-    orsource "./idf_v$ESP_IDF_VERSION/Kconfig.wifi.in"
-    endmenu
+        config ESP_WIFI_STATIC_RX_BUFFER_NUM
+            int "Max number of WiFi static RX buffers"
+            range 2 25 if !SLAVE_SOC_WIFI_HE_SUPPORT
+            range 2 128 if SLAVE_SOC_WIFI_HE_SUPPORT
+            default 10 if !SPIRAM_TRY_ALLOCATE_WIFI_LWIP
+            default 16 if SPIRAM_TRY_ALLOCATE_WIFI_LWIP
+            help
+                Set the number of WiFi static RX buffers. Each buffer takes approximately 1.6KB of RAM.
+                The static rx buffers are allocated when esp_wifi_init is called, they are not freed
+                until esp_wifi_deinit is called.
+
+                WiFi hardware use these buffers to receive all 802.11 frames.
+                A higher number may allow higher throughput but increases memory use. If ESP_WIFI_AMPDU_RX_ENABLED
+                is enabled, this value is recommended to set equal or bigger than ESP_WIFI_RX_BA_WIN in order to
+                achieve better throughput and compatibility with both stations and APs.
+
+        config ESP_WIFI_DYNAMIC_RX_BUFFER_NUM
+            int "Max number of WiFi dynamic RX buffers"
+            range 0 128 if !LWIP_WND_SCALE
+            range 0 1024 if LWIP_WND_SCALE
+            default 32
+            help
+                Set the number of WiFi dynamic RX buffers, 0 means unlimited RX buffers will be allocated
+                (provided sufficient free RAM). The size of each dynamic RX buffer depends on the size of
+                the received data frame.
+
+                For each received data frame, the WiFi driver makes a copy to an RX buffer and then delivers
+                it to the high layer TCP/IP stack. The dynamic RX buffer is freed after the higher layer has
+                successfully received the data frame.
+
+                For some applications, WiFi data frames may be received faster than the application can
+                process them. In these cases we may run out of memory if RX buffer number is unlimited (0).
+
+                If a dynamic RX buffer limit is set, it should be at least the number of static RX buffers.
+
+        choice ESP_WIFI_TX_BUFFER
+            prompt "Type of WiFi TX buffers"
+            default ESP_WIFI_DYNAMIC_TX_BUFFER
+            help
+                Select type of WiFi TX buffers:
+
+                If "Static" is selected, WiFi TX buffers are allocated when WiFi is initialized and released
+                when WiFi is de-initialized. The size of each static TX buffer is fixed to about 1.6KB.
+
+                If "Dynamic" is selected, each WiFi TX buffer is allocated as needed when a data frame is
+                delivered to the Wifi driver from the TCP/IP stack. The buffer is freed after the data frame
+                has been sent by the WiFi driver. The size of each dynamic TX buffer depends on the length
+                of each data frame sent by the TCP/IP layer.
+
+                If PSRAM is enabled, "Static" should be selected to guarantee enough WiFi TX buffers.
+                If PSRAM is disabled, "Dynamic" should be selected to improve the utilization of RAM.
+
+            config ESP_WIFI_STATIC_TX_BUFFER
+                bool "Static"
+            config ESP_WIFI_DYNAMIC_TX_BUFFER
+                bool "Dynamic"
+                depends on !SPIRAM_USE_MALLOC
+        endchoice
+
+        config ESP_WIFI_TX_BUFFER_TYPE
+            int
+            default 0 if ESP_WIFI_STATIC_TX_BUFFER
+            default 1 if ESP_WIFI_DYNAMIC_TX_BUFFER
+
+        config ESP_WIFI_STATIC_TX_BUFFER_NUM
+            int "Max number of WiFi static TX buffers"
+            depends on ESP_WIFI_STATIC_TX_BUFFER
+            range 1 64
+            default 16
+            help
+                Set the number of WiFi static TX buffers. Each buffer takes approximately 1.6KB of RAM.
+                The static RX buffers are allocated when esp_wifi_init() is called, they are not released
+                until esp_wifi_deinit() is called.
+
+                For each transmitted data frame from the higher layer TCP/IP stack, the WiFi driver makes a
+                copy of it in a TX buffer.  For some applications especially UDP applications, the upper
+                layer can deliver frames faster than WiFi layer can transmit. In these cases, we may run out
+                of TX buffers.
+
+        config ESP_WIFI_CACHE_TX_BUFFER_NUM
+            int "Max number of WiFi cache TX buffers"
+            depends on SPIRAM
+            range 16 128
+            default 32
+            help
+                Set the number of WiFi cache TX buffer number.
+
+                For each TX packet from uplayer, such as LWIP etc, WiFi driver needs to allocate a static TX
+                buffer and makes a copy of uplayer packet. If WiFi driver fails to allocate the static TX buffer,
+                it caches the uplayer packets to a dedicated buffer queue, this option is used to configure the
+                size of the cached TX queue.
+
+        config ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
+            int "Max number of WiFi dynamic TX buffers"
+            depends on ESP_WIFI_DYNAMIC_TX_BUFFER
+            range 1 128
+            default 32
+            help
+                Set the number of WiFi dynamic TX buffers. The size of each dynamic TX buffer is not fixed,
+                it depends on the size of each transmitted data frame.
+
+                For each transmitted frame from the higher layer TCP/IP stack, the WiFi driver makes a copy
+                of it in a TX buffer. For some applications, especially UDP applications, the upper layer
+                can deliver frames faster than WiFi layer can transmit. In these cases, we may run out of TX
+                buffers.
+
+        choice ESP_WIFI_MGMT_RX_BUFFER
+            prompt "Type of WiFi RX MGMT buffers"
+            default ESP_WIFI_STATIC_RX_MGMT_BUFFER
+            help
+                Select type of WiFi RX MGMT buffers:
+
+                If "Static" is selected, WiFi RX MGMT buffers are allocated when WiFi is initialized and released
+                when WiFi is de-initialized. The size of each static RX MGMT buffer is fixed to about 500 Bytes.
+
+                If "Dynamic" is selected, each WiFi RX MGMT buffer is allocated as needed when a MGMT data frame is
+                received. The MGMT buffer is freed after the MGMT data frame has been processed by the WiFi driver.
+
+
+            config ESP_WIFI_STATIC_RX_MGMT_BUFFER
+                bool "Static"
+            config ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER
+                bool "Dynamic"
+        endchoice
+
+        config ESP_WIFI_DYNAMIC_RX_MGMT_BUF
+            int
+            default 0 if ESP_WIFI_STATIC_RX_MGMT_BUFFER
+            default 1 if ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER
+
+        config ESP_WIFI_RX_MGMT_BUF_NUM_DEF
+            int "Max number of WiFi RX MGMT buffers"
+            range 1 10
+            default 5
+            help
+                Set the number of WiFi RX_MGMT buffers.
+
+                For Management buffers, the number of dynamic and static management buffers is the same.
+                In order to prevent memory fragmentation, the management buffer type should be set to static first.
+
+        config ESP_WIFI_CSI_ENABLED
+            bool "WiFi CSI(Channel State Information)"
+            depends on SLAVE_SOC_WIFI_CSI_SUPPORT
+            default n
+            help
+                Select this option to enable CSI(Channel State Information) feature. CSI takes about
+                CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM KB of RAM. If CSI is not used, it is better to disable
+                this feature in order to save memory.
+
+        config ESP_WIFI_AMPDU_TX_ENABLED
+            bool "WiFi AMPDU TX"
+            default y
+            help
+                Select this option to enable AMPDU TX feature
+
+
+        config ESP_WIFI_TX_BA_WIN
+            int "WiFi AMPDU TX BA window size"
+            depends on ESP_WIFI_AMPDU_TX_ENABLED
+            range 2 32 if !SLAVE_SOC_WIFI_HE_SUPPORT
+            range 2 64 if SLAVE_SOC_WIFI_HE_SUPPORT
+            default 6
+            help
+                Set the size of WiFi Block Ack TX window. Generally a bigger value means higher throughput but
+                more memory. Most of time we should NOT change the default value unless special reason, e.g.
+                test the maximum UDP TX throughput with iperf etc. For iperf test in shieldbox, the recommended
+                value is 9~12.
+
+        config ESP_WIFI_AMPDU_RX_ENABLED
+            bool "WiFi AMPDU RX"
+            default y
+            help
+                Select this option to enable AMPDU RX feature
+
+        config ESP_WIFI_RX_BA_WIN
+            int "WiFi AMPDU RX BA window size"
+            depends on ESP_WIFI_AMPDU_RX_ENABLED
+            range 2 32 if !SLAVE_SOC_WIFI_HE_SUPPORT
+            range 2 64 if SLAVE_SOC_WIFI_HE_SUPPORT
+            default 6 if !SPIRAM_TRY_ALLOCATE_WIFI_LWIP
+            default 16 if SPIRAM_TRY_ALLOCATE_WIFI_LWIP
+            help
+                Set the size of WiFi Block Ack RX window. Generally a bigger value means higher throughput and better
+                compatibility but more memory. Most of time we should NOT change the default value unless special
+                reason, e.g. test the maximum UDP RX throughput with iperf etc. For iperf test in shieldbox, the
+                recommended value is 9~12. If PSRAM is used and WiFi memory is preferred to allocate in PSRAM first,
+                the default and minimum value should be 16 to achieve better throughput and compatibility with both
+                stations and APs.
+
+        config ESP_WIFI_AMSDU_TX_ENABLED
+            bool "WiFi AMSDU TX"
+            depends on SPIRAM
+            default n
+            help
+                Select this option to enable AMSDU TX feature
+
+        config ESP_WIFI_NVS_ENABLED
+            bool "WiFi NVS flash"
+            default y
+            help
+                Select this option to enable WiFi NVS flash
+
+        choice ESP_WIFI_TASK_CORE_ID
+            depends on !FREERTOS_UNICORE
+            prompt "WiFi Task Core ID"
+            default ESP_WIFI_TASK_PINNED_TO_CORE_0
+            help
+                Pinned WiFi task to core 0 or core 1.
+
+            config ESP_WIFI_TASK_PINNED_TO_CORE_0
+                bool "Core 0"
+            config ESP_WIFI_TASK_PINNED_TO_CORE_1
+                bool "Core 1"
+        endchoice
+
+        config ESP_WIFI_SOFTAP_BEACON_MAX_LEN
+            int "Max length of WiFi SoftAP Beacon"
+            range 752 1256
+            default 752
+            help
+                ESP-MESH utilizes beacon frames to detect and resolve root node conflicts (see documentation). However
+                the default length of a beacon frame can simultaneously hold only five root node identifier structures,
+                meaning that a root node conflict of up to five nodes can be detected at one time. In the occurrence of
+                more root nodes conflict involving more than five root nodes, the conflict resolution process will
+                detect five of the root nodes, resolve the conflict, and re-detect more root nodes. This process will
+                repeat until all root node conflicts are resolved. However this process can generally take a very long
+                time.
+
+                To counter this situation, the beacon frame length can be increased such that more root nodes can be
+                detected simultaneously. Each additional root node will require 36 bytes and should be added on top of
+                the default beacon frame length of
+                752 bytes. For example, if you want to detect 10 root nodes simultaneously, you need to set the beacon
+                frame length as
+                932 (752+36*5).
+
+                Setting a longer beacon length also assists with debugging as the conflicting root nodes can be
+                identified more quickly.
+
+        config ESP_WIFI_MGMT_SBUF_NUM
+            int "WiFi mgmt short buffer number"
+            range 6 32
+            default 32
+            help
+                Set the number of WiFi management short buffer.
+
+        config ESP_WIFI_IRAM_OPT
+            bool "WiFi IRAM speed optimization"
+            default n if (BT_ENABLED && SPIRAM && SLAVE_IDF_TARGET_ESP32)
+            default y
+            help
+                Select this option to place frequently called Wi-Fi library functions in IRAM.
+                When this option is disabled, more than 10Kbytes of IRAM memory will be saved
+                but Wi-Fi throughput will be reduced.
+
+        config ESP_WIFI_EXTRA_IRAM_OPT
+            bool "WiFi EXTRA IRAM speed optimization"
+            default y if SLAVE_IDF_TARGET_ESP32C6
+            default n
+            help
+                Select this option to place additional frequently called Wi-Fi library functions
+                in IRAM. When this option is disabled, more than 5Kbytes of IRAM memory will be saved
+                but Wi-Fi throughput will be reduced.
+
+        config ESP_WIFI_RX_IRAM_OPT
+            bool "WiFi RX IRAM speed optimization"
+            default n if (BT_ENABLED && SPIRAM && SLAVE_IDF_TARGET_ESP32)
+            default y
+            help
+                Select this option to place frequently called Wi-Fi library RX functions in IRAM.
+                When this option is disabled, more than 17Kbytes of IRAM memory will be saved
+                but Wi-Fi performance will be reduced.
+
+        config ESP_WIFI_ENABLE_WPA3_SAE
+            bool "Enable WPA3-Personal"
+            default y
+            select ESP_WIFI_MBEDTLS_CRYPTO
+            help
+                Select this option to allow the device to establish a WPA3-Personal connection with eligible AP's.
+                PMF (Protected Management Frames) is a prerequisite feature for a WPA3 connection, it needs to be
+                explicitly configured before attempting connection. Please refer to the Wi-Fi Driver API Guide
+                for details.
+
+        config ESP_WIFI_ENABLE_SAE_PK
+            bool "Enable SAE-PK"
+            default y
+            depends on ESP_WIFI_ENABLE_WPA3_SAE
+            help
+                Select this option to enable SAE-PK
+
+        config ESP_WIFI_SOFTAP_SAE_SUPPORT
+            bool "Enable WPA3 Personal(SAE) SoftAP"
+            default y
+            depends on ESP_WIFI_ENABLE_WPA3_SAE
+            depends on ESP_WIFI_SOFTAP_SUPPORT
+            help
+                Select this option to enable SAE support in softAP mode.
+
+        config ESP_WIFI_ENABLE_WPA3_OWE_STA
+            bool "Enable OWE STA"
+            default y
+            select ESP_WIFI_MBEDTLS_CRYPTO
+            help
+                Select this option to allow the device to establish OWE connection with eligible AP's.
+                PMF (Protected Management Frames) is a prerequisite feature for a WPA3 connection, it needs to be
+                explicitly configured before attempting connection. Please refer to the Wi-Fi Driver API Guide
+                for details.
+
+        config ESP_WIFI_SLP_IRAM_OPT
+            bool "WiFi SLP IRAM speed optimization"
+            select PM_SLP_DEFAULT_PARAMS_OPT
+            select PERIPH_CTRL_FUNC_IN_IRAM
+            help
+                Select this option to place called Wi-Fi library TBTT process and receive beacon functions in IRAM.
+                Some functions can be put in IRAM either by ESP_WIFI_IRAM_OPT and ESP_WIFI_RX_IRAM_OPT, or this one.
+                If already enabled ESP_WIFI_IRAM_OPT, the other 7.3KB IRAM memory would be taken by this option.
+                If already enabled ESP_WIFI_RX_IRAM_OPT, the other 1.3KB IRAM memory would be taken by this option.
+                If neither of them are enabled, the other 7.4KB IRAM memory would be taken by this option.
+                Wi-Fi power-save mode average current would be reduced if this option is enabled.
+
+        config ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME
+            int "Minimum active time"
+            range 8 60
+            default 50
+            depends on ESP_WIFI_SLP_IRAM_OPT
+            help
+                The minimum timeout for waiting to receive data, unit: milliseconds.
+
+        config ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME
+            int "Maximum keep alive time"
+            range 10 60
+            default 10
+            depends on ESP_WIFI_SLP_IRAM_OPT
+            help
+                The maximum time that wifi keep alive, unit: seconds.
+
+        config ESP_WIFI_FTM_ENABLE
+            bool "WiFi FTM"
+            default n
+            depends on SLAVE_SOC_WIFI_FTM_SUPPORT
+            help
+                Enable feature Fine Timing Measurement for calculating WiFi Round-Trip-Time (RTT).
+
+        config ESP_WIFI_FTM_INITIATOR_SUPPORT
+            bool "FTM Initiator support"
+            default y
+            depends on ESP_WIFI_FTM_ENABLE
+
+        config ESP_WIFI_FTM_RESPONDER_SUPPORT
+            bool "FTM Responder support"
+            default y
+            depends on ESP_WIFI_FTM_ENABLE
+
+        config ESP_WIFI_STA_DISCONNECTED_PM_ENABLE
+            bool "Power Management for station at disconnected"
+            default y
+            help
+                Select this option to enable power_management for station when disconnected.
+                Chip will do modem-sleep when rf module is not in use any more.
+
+        config ESP_WIFI_GCMP_SUPPORT
+            bool "WiFi GCMP Support(GCMP128 and GCMP256)"
+            default n
+            depends on SLAVE_SOC_WIFI_GCMP_SUPPORT
+            help
+                Select this option to enable GCMP support. GCMP support is compulsory for WiFi Suite-B support.
+
+        config ESP_WIFI_GMAC_SUPPORT
+            bool "WiFi GMAC Support(GMAC128 and GMAC256)"
+            default n
+            help
+                Select this option to enable GMAC support. GMAC support is compulsory for WiFi 192 bit certification.
+
+        config ESP_WIFI_SOFTAP_SUPPORT
+            bool "WiFi SoftAP Support"
+            default y
+            help
+                WiFi module can be compiled without SoftAP to save code size.
+
+        config ESP_WIFI_ENHANCED_LIGHT_SLEEP
+            bool "WiFi modem automatically receives the beacon"
+            default n
+            depends on ESP_PHY_MAC_BB_PD && SOC_PM_SUPPORT_BEACON_WAKEUP
+            help
+                The wifi modem automatically receives the beacon frame during light sleep.
+
+        config ESP_WIFI_SLP_BEACON_LOST_OPT
+            bool "Wifi sleep optimize when beacon lost"
+            help
+                Enable wifi sleep optimization when beacon loss occurs and immediately enter
+                sleep mode when the WiFi module detects beacon loss.
+
+        config ESP_WIFI_SLP_BEACON_LOST_TIMEOUT
+            int "Beacon loss timeout"
+            range 5 100
+            default 10
+            depends on ESP_WIFI_SLP_BEACON_LOST_OPT
+            help
+                Timeout time for close rf phy when beacon loss occurs, Unit: 1024 microsecond.
+
+        config ESP_WIFI_SLP_BEACON_LOST_THRESHOLD
+            int "Maximum number of consecutive lost beacons allowed"
+            range 0 8
+            default 3
+            depends on ESP_WIFI_SLP_BEACON_LOST_OPT
+            help
+                Maximum number of consecutive lost beacons allowed, WiFi keeps Rx state when
+                the number of consecutive beacons lost is greater than the given threshold.
+
+        config ESP_WIFI_SLP_PHY_ON_DELTA_EARLY_TIME
+            int "Delta early time for RF PHY on"
+            range 0 100
+            default 2
+            depends on ESP_WIFI_SLP_BEACON_LOST_OPT && SLAVE_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW
+            help
+                Delta early time for rf phy on, When the beacon is lost, the next rf phy on will
+                be earlier the time specified by the configuration item, Unit: 32 microsecond.
+
+        config ESP_WIFI_SLP_PHY_OFF_DELTA_TIMEOUT_TIME
+            int "Delta timeout time for RF PHY off"
+            range 0 8
+            default 2
+            depends on ESP_WIFI_SLP_BEACON_LOST_OPT && SLAVE_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW
+            help
+                Delta timeout time for rf phy off, When the beacon is lost, the next rf phy off will
+                be delayed for the time specified by the configuration item. Unit: 1024 microsecond.
+
+        config ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM
+            int "Maximum espnow encrypt peers number"
+            range 0 4 if SLAVE_IDF_TARGET_ESP32C2
+            range 0 17 if (!SLAVE_IDF_TARGET_ESP32C2)
+            default 2 if SLAVE_IDF_TARGET_ESP32C2
+            default 7 if (!SLAVE_IDF_TARGET_ESP32C2)
+            help
+                Maximum number of encrypted peers supported by espnow.
+                The number of hardware keys for encryption is fixed. And the espnow and SoftAP share the same
+                hardware keys. So this configuration will affect the maximum connection number of SoftAP.
+                Maximum espnow encrypted peers number + maximum number of connections of SoftAP = Max hardware
+                keys number. When using ESP mesh, this value should be set to a maximum of 6.
+
+        config ESP_WIFI_NAN_ENABLE
+            bool "WiFi Aware"
+            default n
+            depends on SLAVE_SOC_WIFI_NAN_SUPPORT
+            help
+                Enable WiFi Aware (NAN) feature.
+
+        config ESP_WIFI_ENABLE_WIFI_TX_STATS
+            bool "Enable Wi-Fi transmission statistics"
+            depends on SLAVE_SOC_WIFI_HE_SUPPORT
+            default "y"
+            help
+                Enable Wi-Fi transmission statistics. Total support 4 access category. Each access category
+                will use 346 bytes memory.
+
+        config ESP_WIFI_MBEDTLS_CRYPTO
+            bool "Use MbedTLS crypto APIs"
+            default y
+            select MBEDTLS_AES_C
+            select MBEDTLS_ECP_C
+            select MBEDTLS_ECDH_C
+            select MBEDTLS_ECDSA_C
+            select MBEDTLS_CMAC_C
+            select MBEDTLS_ECP_DP_SECP256R1_ENABLED
+            help
+                Select this option to enable the use of MbedTLS crypto APIs.
+                The internal crypto support within the supplicant is limited
+                and may not suffice for all new security features, including WPA3.
+
+                It is recommended to always keep this option enabled. Additionally,
+                note that MbedTLS can leverage hardware acceleration if available,
+                resulting in significantly faster cryptographic operations.
+
+        if ESP_WIFI_MBEDTLS_CRYPTO
+            config ESP_WIFI_MBEDTLS_TLS_CLIENT
+                bool "Use MbedTLS TLS client for WiFi Enterprise connection"
+                depends on ESP_WIFI_ENTERPRISE_SUPPORT
+                default y
+                select MBEDTLS_TLS_ENABLED
+                help
+                    Select this option to use MbedTLS TLS client for WPA2 enterprise connection.
+                    Please note that from MbedTLS-3.0 onwards, MbedTLS does not support SSL-3.0
+                    TLS-v1.0, TLS-v1.1 versions. In case your server is using one of these version,
+                    it is advisable to update your server.
+                    Please disable this option for compatibility with older TLS versions.
+
+            config ESP_WIFI_EAP_TLS1_3
+                bool "Enable EAP-TLS v1.3 Support for WiFi Enterprise connection"
+                default n
+                select MBEDTLS_SSL_PROTO_TLS1_3
+                depends on ESP_WIFI_MBEDTLS_TLS_CLIENT && IDF_EXPERIMENTAL_FEATURES
+                help
+                    Select this option to support EAP with TLS v1.3.
+                    This configuration still supports compatibility with EAP-TLS v1.2.
+                    Please note that enabling this configuration will cause every application which
+                    uses TLS go for TLS1.3 if server supports that. TLS1.3 is still in development in mbedtls
+                    and there may be interoperability issues with this. Please modify your application to set
+                    max version as TLS1.2 if you want to enable TLS1.3 only for WiFi connection.
+
+        endif
+
+        config ESP_WIFI_WAPI_PSK
+            bool "Enable WAPI PSK support"
+            depends on SLAVE_SOC_WIFI_WAPI_SUPPORT
+            default n
+            help
+                Select this option to enable WAPI-PSK
+                which is a Chinese National Standard Encryption for Wireless LANs (GB 15629.11-2003).
+
+        config ESP_WIFI_SUITE_B_192
+            bool "Enable NSA suite B support with 192 bit key"
+            default n
+            depends on SLAVE_SOC_WIFI_GCMP_SUPPORT
+            select ESP_WIFI_GCMP_SUPPORT
+            select ESP_WIFI_GMAC_SUPPORT
+            help
+                Select this option to enable 192 bit NSA suite-B.
+                This is necessary to support WPA3 192 bit security.
+
+        config ESP_WIFI_11KV_SUPPORT
+            bool "Enable 802.11k, 802.11v APIs Support"
+            default n
+            help
+                Select this option to enable 802.11k 802.11v APIs(RRM and BTM support).
+                Only APIs which are helpful for network assisted roaming
+                are supported for now.
+                Enable this option with BTM and RRM enabled in sta config
+                to make device ready for network assisted roaming.
+                BTM: BSS transition management enables an AP to request a station to transition
+                to a specific AP, or to indicate to a station a set of preferred APs.
+                RRM: Radio measurements enable STAs to understand the radio environment,
+                it enables STAs to observe and gather data on radio link performance
+                and on the radio environment. Current implementation adds beacon report,
+                link measurement, neighbor report.
+
+        config ESP_WIFI_SCAN_CACHE
+            bool "Keep scan results in cache"
+            depends on ESP_WIFI_11KV_SUPPORT
+            default n
+            help
+                Keep scan results in cache, if not enabled, those
+                will be flushed immediately.
+
+        config ESP_WIFI_MBO_SUPPORT
+            bool "Enable Multi Band Operation Certification Support"
+            default n
+            select ESP_WIFI_11KV_SUPPORT
+            select ESP_WIFI_SCAN_CACHE
+            help
+                Select this option to enable WiFi Multiband operation certification support.
+
+        config ESP_WIFI_ENABLE_ROAMING_APP
+            bool "Advanced support for Wi-Fi Roaming (Experimental)"
+            depends on IDF_EXPERIMENTAL_FEATURES
+            default n
+            select ESP_WIFI_SCAN_CACHE
+            help
+                Enable Espressif's roaming app to allow for efficient Wi-Fi roaming.
+                This includes configurable periodic environment scans, maintaining a cache of the
+                best APs, handling low rssi events etc.
+
+                Risk Warning
+                Please note that this feature is still experimental and enabling this potentially can
+                lead to unpredictable scanning, connection and roaming attempts.
+                We are still working on tuning and optimising this feature to ensure reliable and stable use.
+
+        menu "Configure roaming App"
+            depends on ESP_WIFI_ENABLE_ROAMING_APP
+            rsource "wifi_apps/roaming_app/src/Kconfig.roaming"
+        endmenu
+
+        config ESP_WIFI_DPP_SUPPORT
+            bool "Enable DPP support"
+            default n
+            select ESP_WIFI_MBEDTLS_CRYPTO
+            help
+                Select this option to enable WiFi Easy Connect Support.
+
+        config ESP_WIFI_11R_SUPPORT
+            bool "Enable 802.11R (Fast Transition) Support"
+            default n
+            help
+                Select this option to enable WiFi Fast Transition Support.
+
+        config ESP_WIFI_WPS_SOFTAP_REGISTRAR
+            bool "Add WPS Registrar support in SoftAP mode"
+            depends on ESP_WIFI_SOFTAP_SUPPORT
+            default n
+            help
+                Select this option to enable WPS registrar support in softAP mode.
+
+        config ESP_WIFI_ENABLE_WIFI_RX_STATS
+            bool "Enable Wi-Fi reception statistics"
+            depends on SLAVE_SOC_WIFI_HE_SUPPORT
+            default "y"
+            help
+                Enable Wi-Fi reception statistics. Total support 2 access category. Each access category
+                will use 190 bytes memory.
+
+        config ESP_WIFI_ENABLE_WIFI_RX_MU_STATS
+            bool "Enable Wi-Fi DL MU-MIMO and DL OFDMA reception statistics"
+            depends on ESP_WIFI_ENABLE_WIFI_RX_STATS
+            default "y"
+            help
+                Enable Wi-Fi DL MU-MIMO and DL OFDMA reception statistics. Will use 10932 bytes memory.
+
+        menu "WPS Configuration Options"
+            config ESP_WIFI_WPS_STRICT
+                bool "Strictly validate all WPS attributes"
+                default n
+                help
+                    Select this option to enable validate each WPS attribute
+                    rigorously. Disabling this add the workarounds with various APs.
+                    Enabling this may cause inter operability issues with some APs.
+
+            config ESP_WIFI_WPS_PASSPHRASE
+                bool "Get WPA2 passphrase in WPS config"
+                default n
+                help
+                    Select this option to get passphrase during WPS configuration.
+                    This option fakes the virtual display capabilities to get the
+                    configuration in passphrase mode.
+                    Not recommended to be used since WPS credentials should not
+                    be shared to other devices, making it in readable format increases
+                    that risk, also passphrase requires pbkdf2 to convert in psk.
+
+        endmenu # "WPS Configuration Options"
+
+
+        config ESP_WIFI_DEBUG_PRINT
+            bool "Print debug messages from WPA Supplicant"
+            default n
+            help
+                Select this option to print logging information from WPA supplicant,
+                this includes handshake information and key hex dumps depending
+                on the project logging level.
+
+                Enabling this could increase the build size ~60kb
+                depending on the project logging level.
+
+        config ESP_WIFI_TESTING_OPTIONS
+            bool "Add DPP testing code"
+            default n
+            help
+                Select this to enable unity test for DPP.
+
+        config ESP_WIFI_ENTERPRISE_SUPPORT
+            bool "Enable enterprise option"
+            default y
+            help
+                Select this to enable/disable enterprise connection support.
+
+                disabling this will reduce binary size.
+                disabling this will disable the use of any esp_wifi_sta_wpa2_ent_* (as APIs will be meaningless)
+
+                Note that when using bigger certificates on low-power chips without crypto
+                hardware acceleration, it is recommended to adjust the task watchdog timer (TWDT)
+                if it is enabled. For precise information on timing requirements, you can check
+                performance numbers at https://github.com/espressif/mbedtls/wiki/Performance-Numbers.
+
+        config ESP_WIFI_ENT_FREE_DYNAMIC_BUFFER
+            bool "Free dynamic buffers during WiFi enterprise connection"
+            depends on ESP_WIFI_ENTERPRISE_SUPPORT
+            default y if SLAVE_IDF_TARGET_ESP32C2
+            default n if !SLAVE_IDF_TARGET_ESP32C2
+            help
+                Select this configuration to free dynamic buffers during WiFi enterprise connection.
+                This will enable chip to reduce heap consumption during WiFi enterprise connection.
 
 endmenu # Wi-Fi Remote

components/esp_wifi_remote/Kconfig.rpc.in

@@ -1,6 +1,6 @@
 choice ESP_WIFI_REMOTE_LIBRARY
     prompt "Choose WiFi-remote implementation"
-    default ESP_WIFI_REMOTE_LIBRARY_HOSTED
+    default ESP_WIFI_REMOTE_LIBRARY_EPPP
     help
         Select type of WiFi Remote implementation
 

components/esp_wifi_remote/Kconfig.soc_wifi_caps.in

@@ -223,3 +223,15 @@ if SLAVE_IDF_TARGET_ESP32C6
         default y
 
 endif # ESP32C6
+
+if SLAVE_IDF_TARGET_ESP32H2
+
+endif # ESP32H2
+
+if SLAVE_IDF_TARGET_ESP32P4
+
+    config SLAVE_SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH
+        int
+        default 12
+
+endif # ESP32P4

components/esp_wifi_remote/esp_wifi_remote_net.c

@@ -59,11 +59,6 @@ WEAK void esp_wifi_internal_free_rx_buffer(void *buffer)
     free(buffer);
 }
 
-WEAK esp_err_t esp_wifi_internal_tx_by_ref(wifi_interface_t ifx, void *buffer, size_t len, void *netstack_buf)
-{
-    return esp_wifi_internal_tx(ifx, buffer, (uint16_t)len);
-}
-
 WEAK int esp_wifi_internal_tx(wifi_interface_t ifx, void *buffer, uint16_t len)
 {
     if (ifx == WIFI_IF_STA && s_tx_cb[0]) {

components/esp_wifi_remote/esp_wifi_remote_weak.c

@@ -71,16 +71,6 @@ WEAK esp_err_t esp_wifi_remote_scan_start(const wifi_scan_config_t *config, _Boo
     LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
 }
 
-WEAK esp_err_t esp_wifi_remote_set_scan_parameters(const wifi_scan_default_params_t *config)
-{
-    LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
-}
-
-WEAK esp_err_t esp_wifi_remote_get_scan_parameters(wifi_scan_default_params_t *config)
-{
-    LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
-}
-
 WEAK esp_err_t esp_wifi_remote_scan_stop(void)
 {
     LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
@@ -276,11 +266,6 @@ WEAK esp_err_t esp_wifi_remote_set_csi_config(const wifi_csi_config_t *config)
     LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
 }
 
-WEAK esp_err_t esp_wifi_remote_get_csi_config(wifi_csi_config_t *config)
-{
-    LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);
-}
-
 WEAK esp_err_t esp_wifi_remote_set_csi(_Bool en)
 {
     LOG_UNSUPPORTED_AND_RETURN(ESP_ERR_NOT_SUPPORTED);