Merge pull request #24 from david-cermak/fix/hosted_target_tests

Add esp_hosted target tests

Author: david-cermak

.github/workflows/build.yml

@@ -53,6 +53,8 @@ jobs:
           - { app: 2sta, path: "examples/two_stations", bin: "build_esp32s3_s3" }
           - { app: slave, path: "examples/server", bin: "build_esp32c6_c6" }
           - { app: slave_1, path: "examples/server", bin: "build_esp32c6_c6_1" }
+          - { app: esp_hosted, path: "examples/mqtt", bin: "build_esp32p4_hosted" }
+          - { app: esp_hosted_slave, path: "examples/hosted_slave", bin: "build_esp32c6_hosted" }
 
     runs-on: ubuntu-latest
     container: espressif/idf:${{ matrix.idf_ver }}
@@ -77,6 +79,13 @@ jobs:
         run: |
           . ${IDF_PATH}/export.sh
           pip install idf-component-manager idf-build-apps --upgrade
+          if [ "${{matrix.example.app}}" == "esp_hosted_slave" ]; then
+            idf.py create-project-from-example "espressif/esp_hosted:slave"
+            rm slave/sdkconfig.ci.*
+            mv slave/ ./components/esp_wifi_remote/${{matrix.example.path}}/
+            export EXPECTED_WARNING="warning: the int symbol ESP_HOSTED"
+            cp ./components/esp_wifi_remote/examples/sdkconfig.ci.hosted_slave ./components/esp_wifi_remote/${{matrix.example.path}}/sdkconfig.ci.hosted
+          fi
           python $GITHUB_WORKSPACE/protocols/ci/build_apps.py ./components/esp_wifi_remote/${{matrix.example.path}} -vv --preserve-all
           cd ./components/esp_wifi_remote/${{matrix.example.path}}
           ${GITHUB_WORKSPACE}/protocols/ci/clean_build_artifacts.sh `pwd`/${{matrix.example.bin}}
@@ -98,6 +107,7 @@ jobs:
         test_pair:
           - { p4: "build_esp32p4_p4", c6: "build_esp32c6_c6" }
           - { p4: "build_esp32p4_p4_1", c6: "build_esp32c6_c6_1" }
+          - { p4: "build_esp32p4_hosted", c6: "build_esp32c6_hosted" }
     runs-on: [self-hosted, wifi-remote]
     container:
       image: python:3.7-buster
@@ -122,4 +132,4 @@ jobs:
           mv server/${{ matrix.test_pair.c6 }}/ server/build/
           unzip mqtt/artifacts.zip -d mqtt/
           mv mqtt/${{ matrix.test_pair.p4 }}/ mqtt/build/
-          python -m pytest --log-cli-level DEBUG --target esp32p4,esp32c6
+          python -m pytest --log-cli-level DEBUG --target esp32c6,esp32p4

components/esp_wifi_remote/examples/mqtt/sdkconfig.ci.hosted

@@ -0,0 +1,14 @@
+CONFIG_IDF_TARGET="esp32p4"
+CONFIG_ESP_WIFI_SSID="local_mosquitto"
+CONFIG_ESP_WIFI_PASSWORD="local_mosquitto_password"
+CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP=n
+CONFIG_ESP_WIFI_REMOTE_LIBRARY_HOSTED=y
+CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
+CONFIG_ESP_HOSTED_GPIO_SLAVE_RESET_SLAVE=9
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CMD_SLOT_1=52
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CLK_SLOT_1=51
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D0_SLOT_1=50
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D1_4BIT_BUS_SLOT_1=49
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D2_4BIT_BUS_SLOT_1=48
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D3_4BIT_BUS_SLOT_1=47
+CONFIG_ESP_HOSTED_SDIO_GPIO_RESET_SLAVE=9

components/esp_wifi_remote/examples/pytest_eppp.py

@@ -10,13 +10,17 @@
 @pytest.mark.parametrize(
     'count, app_path, target', [
         (2,
-         f'{os.path.join(os.path.dirname(__file__), "mqtt")}|{os.path.join(os.path.dirname(__file__), "server")}',
-         'esp32p4|esp32c6'),
+         f'{os.path.join(os.path.dirname(__file__), "server")}|{os.path.join(os.path.dirname(__file__), "mqtt")}',
+         'esp32c6|esp32p4'),
     ], indirect=True
 )
 def test_wifi_remote_eppp(dut: Tuple[IdfDut, IdfDut]) -> None:
-    client = dut[0]
-    server = dut[1]
+    server = dut[0]
+    client = dut[1]
 
-    server.expect('rpc_server: Received WIFI event 4', timeout=100)     # wifi station connected
+    # Check for wifi station connected event (different for hosted and eppp)
+    if dut[1].app.sdkconfig.get('ESP_WIFI_REMOTE_LIBRARY_HOSTED') is True:
+        server.expect('slave_rpc: Sta mode connected', timeout=100)
+    else:
+        server.expect('rpc_server: Received WIFI event 4', timeout=100)
     client.expect('MQTT_EVENT_CONNECTED', timeout=100)

components/esp_wifi_remote/examples/sdkconfig.ci.hosted_slave

@@ -0,0 +1,20 @@
+# This file was generated using idf.py save-defconfig. It can be edited manually.
+# Espressif IoT Development Framework (ESP-IDF) 5.5.0 Project Minimal Configuration
+#
+CONFIG_IDF_TARGET="esp32c6"
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.esp32c6.csv"
+CONFIG_ESP_HOST_DEV_BOARD_P4_FUNC_BOARD=y
+CONFIG_ESP_SDIO_PIN_CMD=18
+CONFIG_ESP_SDIO_PIN_CLK=19
+CONFIG_ESP_SDIO_PIN_D0=20
+CONFIG_ESP_SDIO_PIN_D1=21
+CONFIG_ESP_SDIO_PIN_D2=22
+CONFIG_ESP_SDIO_PIN_D3=23
+CONFIG_ESP_CACHE_MALLOC=n
+CONFIG_ESP_PKT_STATS=y
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CONTROLLER_ONLY=y
+CONFIG_BT_LE_SLEEP_ENABLE=y
+CONFIG_FREERTOS_HZ=1000