diff --git a/components/esp_coex/include/esp_coexist.h b/components/esp_coex/include/esp_coexist.h index 8a865879dc..5354d741fa 100644 --- a/components/esp_coex/include/esp_coexist.h +++ b/components/esp_coex/include/esp_coexist.h @@ -164,7 +164,7 @@ esp_err_t esp_enable_extern_coex_gpio_pin(external_coex_wire_t wire_type, * @brief Disable external coex. * @return : ESP_OK - success, other - failed */ -esp_err_t esp_disable_extern_coex_gpio_pin(); +esp_err_t esp_disable_extern_coex_gpio_pin(void); #if SOC_EXTERNAL_COEX_ADVANCE /** diff --git a/components/esp_coex/src/coexist.c b/components/esp_coex/src/coexist.c index 89c18d4f9e..a723fd5a73 100644 --- a/components/esp_coex/src/coexist.c +++ b/components/esp_coex/src/coexist.c @@ -275,7 +275,7 @@ esp_err_t esp_enable_extern_coex_gpio_pin(external_coex_wire_t wire_type, esp_ex return ESP_OK; } -esp_err_t esp_disable_extern_coex_gpio_pin() +esp_err_t esp_disable_extern_coex_gpio_pin(void) { esp_coex_external_stop(); diff --git a/components/openthread/src/port/esp_openthread_radio_spinel.cpp b/components/openthread/src/port/esp_openthread_radio_spinel.cpp index 4a5d48a044..c183530ab2 100644 --- a/components/openthread/src/port/esp_openthread_radio_spinel.cpp +++ b/components/openthread/src/port/esp_openthread_radio_spinel.cpp @@ -188,6 +188,8 @@ esp_err_t esp_openthread_rcp_init(void) void esp_openthread_radio_deinit(void) { s_radio.Deinit(); + s_spinel_driver.Deinit(); + s_spinel_interface.GetSpinelInterface().Disable(); esp_openthread_platform_workflow_unregister(radiospinel_workflow); } diff --git a/examples/openthread/.build-test-rules.yml b/examples/openthread/.build-test-rules.yml index e4c6e03535..ac1688f37f 100644 --- a/examples/openthread/.build-test-rules.yml +++ b/examples/openthread/.build-test-rules.yml @@ -22,7 +22,8 @@ examples/openthread/ot_br: enable: - - if: SOC_WIFI_SUPPORTED == 1 + - if: (SOC_WIFI_SUPPORTED == 1 and IDF_TARGET != "esp32c61") and CONFIG_NAME != "native_radio" + - if: (SOC_WIFI_SUPPORTED == 1 and IDF_TARGET != "esp32c61") and (SOC_IEEE802154_SUPPORTED == 1 and CONFIG_NAME == "native_radio") disable_test: - if: IDF_TARGET in ["esp32", "esp32c3", "esp32c2", "esp32c6", "esp32s2"] temporary: true diff --git a/examples/openthread/ot_br/sdkconfig.ci.ext_coex b/examples/openthread/ot_br/sdkconfig.ci.ext_coex new file mode 100644 index 0000000000..10e03f180e --- /dev/null +++ b/examples/openthread/ot_br/sdkconfig.ci.ext_coex @@ -0,0 +1,2 @@ +CONFIG_EXTERNAL_COEX_ENABLE=y +CONFIG_ESP_COEX_SW_COEXIST_ENABLE=n diff --git a/examples/openthread/ot_br/sdkconfig.ci.native_radio b/examples/openthread/ot_br/sdkconfig.ci.native_radio new file mode 100644 index 0000000000..4adc4205ab --- /dev/null +++ b/examples/openthread/ot_br/sdkconfig.ci.native_radio @@ -0,0 +1,2 @@ +CONFIG_OPENTHREAD_RADIO_NATIVE=y +CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y diff --git a/examples/openthread/ot_rcp/sdkconfig.ci.ext_coex b/examples/openthread/ot_rcp/sdkconfig.ci.ext_coex new file mode 100644 index 0000000000..10e03f180e --- /dev/null +++ b/examples/openthread/ot_rcp/sdkconfig.ci.ext_coex @@ -0,0 +1,2 @@ +CONFIG_EXTERNAL_COEX_ENABLE=y +CONFIG_ESP_COEX_SW_COEXIST_ENABLE=n diff --git a/examples/openthread/ot_trel/CMakeLists.txt b/examples/openthread/ot_trel/CMakeLists.txt index b12d49bfa3..af5dad3d3c 100644 --- a/examples/openthread/ot_trel/CMakeLists.txt +++ b/examples/openthread/ot_trel/CMakeLists.txt @@ -3,4 +3,4 @@ cmake_minimum_required(VERSION 3.16) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -project(esp_ot_cli) +project(esp_ot_trel) diff --git a/examples/openthread/ot_trel/sdkconfig.defaults b/examples/openthread/ot_trel/sdkconfig.defaults index 07de5fdbf9..0e5eb34891 100644 --- a/examples/openthread/ot_trel/sdkconfig.defaults +++ b/examples/openthread/ot_trel/sdkconfig.defaults @@ -44,3 +44,9 @@ CONFIG_COMPILER_OPTIMIZATION_SIZE=y # Example connect CONFIG_EXAMPLE_CONNECT_THREAD=n + +# +# Wireless Coexistence +# +CONFIG_ESP_COEX_SW_COEXIST_ENABLE=n +CONFIG_EXTERNAL_COEX_ENABLE=n