Merge branch 'feat/support_setting_event_for_154_txrx' into 'master'

Jiang Jiang Jian · Jiang Jiang Jian · commit 6f8c76df98d1 · 2025-01-06T12:53:19.000+08:00
feat(15.4): support setting 15.4 txrx pti when coex is enabled

See merge request espressif/esp-idf!35207
diff --git a/components/esp_coex/include/esp_coex_i154.h b/components/esp_coex/include/esp_coex_i154.h
@@ -1,12 +1,11 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 #ifndef __COEXIST_I154_H__
 #define __COEXIST_I154_H__
 
-#ifdef CONFIG_SOC_IEEE802154_SUPPORTED
 typedef enum {
     IEEE802154_HIGH = 1,
     IEEE802154_MIDDLE,
@@ -15,11 +14,16 @@ typedef enum {
     IEEE802154_EVENT_MAX,
 } ieee802154_coex_event_t;
 
+typedef struct {
+    ieee802154_coex_event_t idle;
+    ieee802154_coex_event_t txrx;
+    ieee802154_coex_event_t txrx_at;
+} esp_ieee802154_coex_config_t;
+
 void esp_coex_ieee802154_txrx_pti_set(ieee802154_coex_event_t event);
 void esp_coex_ieee802154_ack_pti_set(ieee802154_coex_event_t event);
 void esp_coex_ieee802154_coex_break_notify(void);
 void esp_coex_ieee802154_extcoex_tx_stage(void);
 void esp_coex_ieee802154_extcoex_rx_stage(void);
-#endif
 
 #endif
diff --git a/components/esp_coex/lib b/components/esp_coex/lib
@@ -1 +1 @@
-Subproject commit ad30777643ca4c97fbce790f01aebd474ae4946f
+Subproject commit 7b588f2dbb12ddcd46c075dcd041f4d03a59154f
diff --git a/components/ieee802154/CMakeLists.txt b/components/ieee802154/CMakeLists.txt
@@ -35,5 +35,6 @@ idf_component_register(
     INCLUDE_DIRS "${include}"
     PRIV_INCLUDE_DIRS "${private_include}"
     LDFRAGMENTS linker.lf
-    PRIV_REQUIRES esp_phy esp_timer esp_coex soc hal esp_pm
+    REQUIRES esp_coex
+    PRIV_REQUIRES esp_phy esp_timer soc hal esp_pm
 )
diff --git a/components/ieee802154/driver/esp_ieee802154_util.c b/components/ieee802154/driver/esp_ieee802154_util.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -22,20 +22,39 @@ uint8_t ieee802154_channel_to_freq(uint8_t channel)
 }
 
 #if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+
+esp_ieee802154_coex_config_t s_coex_config = {
+    .idle = IEEE802154_IDLE,
+    .txrx = IEEE802154_LOW,
+    .txrx_at = IEEE802154_MIDDLE,
+};
+
+void ieee802154_set_coex_config(esp_ieee802154_coex_config_t config)
+{
+    s_coex_config.idle = config.idle;
+    s_coex_config.txrx = config.txrx;
+    s_coex_config.txrx_at = config.txrx_at;
+}
+
+esp_ieee802154_coex_config_t ieee802154_get_coex_config(void)
+{
+    return s_coex_config;
+}
+
 void ieee802154_set_txrx_pti(ieee802154_txrx_scene_t txrx_scene)
 {
 
     switch (txrx_scene) {
     case IEEE802154_SCENE_IDLE:
-        esp_coex_ieee802154_txrx_pti_set(IEEE802154_IDLE);
+        esp_coex_ieee802154_txrx_pti_set(s_coex_config.idle);
         break;
     case IEEE802154_SCENE_TX:
     case IEEE802154_SCENE_RX:
-        esp_coex_ieee802154_txrx_pti_set(IEEE802154_LOW);
+        esp_coex_ieee802154_txrx_pti_set(s_coex_config.txrx);
         break;
     case IEEE802154_SCENE_TX_AT:
     case IEEE802154_SCENE_RX_AT:
-        esp_coex_ieee802154_txrx_pti_set(IEEE802154_MIDDLE);
+        esp_coex_ieee802154_txrx_pti_set(s_coex_config.txrx_at);
         break;
     default:
         assert(false);
diff --git a/components/ieee802154/esp_ieee802154.c b/components/ieee802154/esp_ieee802154.c
@@ -471,3 +471,15 @@ void esp_ieee802154_record_print(void)
     ieee802154_record_print();
 }
 #endif // CONFIG_IEEE802154_RECORD
+
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+void esp_ieee802154_set_coex_config(esp_ieee802154_coex_config_t config)
+{
+    ieee802154_set_coex_config(config);
+}
+
+esp_ieee802154_coex_config_t esp_ieee802154_get_coex_config(void)
+{
+    return ieee802154_get_coex_config();
+}
+#endif
diff --git a/components/ieee802154/include/esp_ieee802154.h b/components/ieee802154/include/esp_ieee802154.h
@@ -12,6 +12,10 @@
 #include "esp_err.h"
 #include "esp_ieee802154_types.h"
 
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+#include "esp_coex_i154.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -699,6 +703,27 @@ void esp_ieee802154_rx_buffer_statistic_print(void);
  */
 void esp_ieee802154_record_print(void);
 #endif // CONFIG_IEEE802154_RECORD
+
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+
+/**
+ * @brief  Set the IEEE802.15.4 coexist config.
+ *
+ * @param[in]  config     The config of IEEE802.15.4 coexist.
+ *
+ */
+void esp_ieee802154_set_coex_config(esp_ieee802154_coex_config_t config);
+
+/**
+ * @brief  Get the IEEE802.15.4 coexist config.
+ *
+ * @return
+ *        - The config of IEEE802.15.4 coexist.
+ *
+ */
+esp_ieee802154_coex_config_t esp_ieee802154_get_coex_config(void);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/ieee802154/private_include/esp_ieee802154_util.h b/components/ieee802154/private_include/esp_ieee802154_util.h
@@ -368,6 +368,26 @@ void ieee802154_etm_set_event_task(uint32_t channel, uint32_t event, uint32_t ta
  */
 void ieee802154_etm_channel_clear(uint32_t channel);
 
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+
+/**
+ * @brief  Set the IEEE802.15.4 coexist config.
+ *
+ * @param[in]  config     The config of IEEE802.15.4 coexist.
+ *
+ */
+void ieee802154_set_coex_config(esp_ieee802154_coex_config_t config);
+
+/**
+ * @brief  Get the IEEE802.15.4 coexist config.
+ *
+ * @return
+ *        - The config of IEEE802.15.4 coexist.
+ *
+ */
+esp_ieee802154_coex_config_t ieee802154_get_coex_config(void);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/openthread/CMakeLists.txt b/components/openthread/CMakeLists.txt
@@ -274,7 +274,7 @@ idf_component_register(SRC_DIRS "${src_dirs}"
                        PRIV_INCLUDE_DIRS "${private_include_dirs}"
                        REQUIRES esp_netif lwip esp_driver_uart driver
                        LDFRAGMENTS linker.lf
-                       PRIV_REQUIRES console esp_event esp_partition esp_timer
+                       PRIV_REQUIRES console esp_coex esp_event esp_partition esp_timer
                                      ieee802154 mbedtls nvs_flash)
 
 if(CONFIG_OPENTHREAD_RADIO_TREL)
diff --git a/components/openthread/private_include/esp_openthread_ncp.h b/components/openthread/private_include/esp_openthread_ncp.h
@@ -12,4 +12,6 @@
 
 #define SPINEL_PROP_VENDOR_ESP_SET_PENDINGMODE (SPINEL_PROP_VENDOR_ESP__BEGIN + 2)
 
+#define SPINEL_PROP_VENDOR_ESP_COEX_EVENT (SPINEL_PROP_VENDOR_ESP__BEGIN + 3)
+
 #endif
diff --git a/components/openthread/private_include/esp_openthread_radio.h b/components/openthread/private_include/esp_openthread_radio.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,6 +12,10 @@
 #include "esp_openthread_types.h"
 #include "openthread/instance.h"
 
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+#include "esp_coex_i154.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -53,6 +57,27 @@ void esp_openthread_radio_update(esp_openthread_mainloop_context_t *mainloop);
  */
 esp_err_t esp_openthread_radio_process(otInstance *instance, const esp_openthread_mainloop_context_t *mainloop);
 
+
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+
+/**
+ * @brief  Set the coexist config.
+ *
+ * @param[in]  config     The config of coexist.
+ *
+ */
+void esp_openthread_set_coex_config(esp_ieee802154_coex_config_t config);
+
+/**
+ * @brief  Get the coexist config.
+ *
+ * @return
+ *        - The config of coexist.
+ *
+ */
+esp_ieee802154_coex_config_t esp_openthread_get_coex_config(void);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/openthread/private_include/openthread-core-esp32x-ftd-config.h b/components/openthread/private_include/openthread-core-esp32x-ftd-config.h
@@ -493,6 +493,17 @@
 #ifndef OPENTHREAD_POSIX_CONFIG_RCP_TIME_SYNC_INTERVAL
 #define OPENTHREAD_POSIX_CONFIG_RCP_TIME_SYNC_INTERVAL (60 * 1000 * 1000)
 #endif
+
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+/**
+ * @def OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
+ *
+ * Enables compilation of vendor specific code for Spinel
+ */
+#ifndef OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
+#define OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE 1
+#endif
+#endif
 #endif // !CONFIG_OPENTHREAD_RADIO_NATIVE
 
 #if CONFIG_OPENTHREAD_LINK_METRICS
diff --git a/components/openthread/private_include/openthread-core-esp32x-spinel-config.h b/components/openthread/private_include/openthread-core-esp32x-spinel-config.h
@@ -50,11 +50,15 @@
 #define OPENTHREAD_SPINEL_CONFIG_RCP_RESTORATION_MAX_COUNT 3
 #endif
 
+/**
+ * @def OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
+ *
+ * Enables compilation of vendor specific code for Spinel
+ */
 #ifndef OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE
 #define OPENTHREAD_SPINEL_CONFIG_VENDOR_HOOK_ENABLE 1
 #endif
 
-
 /**
  * @def OPENTHREAD_SPINEL_CONFIG_COMPATIBILITY_ERROR_CALLBACK_ENABLE
  *
diff --git a/components/openthread/src/ncp/esp_openthread_ncp.cpp b/components/openthread/src/ncp/esp_openthread_ncp.cpp
@@ -9,6 +9,10 @@
 #include "esp_openthread_ncp.h"
 #include "ncp_base.hpp"
 
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+#include "esp_coex_i154.h"
+#endif
+
 #if CONFIG_OPENTHREAD_RCP_UART
 #include "utils/uart.h"
 #endif
@@ -65,6 +69,16 @@ otError NcpBase::VendorGetPropertyHandler(spinel_prop_key_t aPropKey)
 
     switch (aPropKey)
     {
+    case SPINEL_PROP_VENDOR_ESP_COEX_EVENT: {
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+        esp_ieee802154_coex_config_t config = esp_ieee802154_get_coex_config();
+        const uint8_t *args = reinterpret_cast<const uint8_t *>(&config);
+        error = mEncoder.WriteDataWithLen(args, sizeof(esp_ieee802154_coex_config_t));
+#else
+        error = OT_ERROR_NOT_IMPLEMENTED;
+#endif
+        break;
+    }
 
     default:
         error = OT_ERROR_NOT_FOUND;
@@ -95,6 +109,23 @@ otError NcpBase::VendorSetPropertyHandler(spinel_prop_key_t aPropKey)
         esp_ieee802154_set_pending_mode(static_cast<esp_ieee802154_pending_mode_t>(pending_mode));
         break;
     }
+    case SPINEL_PROP_VENDOR_ESP_COEX_EVENT: {
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+        const uint8_t *args = nullptr;
+        uint16_t len = 0;
+        mDecoder.ReadDataWithLen(args, len);
+        if (len == sizeof(esp_ieee802154_coex_config_t)) {
+            esp_ieee802154_coex_config_t config;
+            memcpy(&config, args, len);
+            esp_ieee802154_set_coex_config(config);
+        } else {
+            error = OT_ERROR_INVALID_ARGS;
+        }
+#else
+        error = OT_ERROR_NOT_IMPLEMENTED;
+#endif
+        break;
+    }
 
     default:
         error = OT_ERROR_NOT_FOUND;
diff --git a/components/openthread/src/port/esp_openthread_radio.c b/components/openthread/src/port/esp_openthread_radio.c
@@ -32,6 +32,10 @@
 #include "utils/link_metrics.h"
 #include "utils/mac_frame.h"
 
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+#include "esp_coex_i154.h"
+#endif
+
 #define ESP_RECEIVE_SENSITIVITY -120
 #define ESP_OPENTHREAD_XTAL_ACCURACY CONFIG_OPENTHREAD_XTAL_ACCURACY
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
@@ -810,3 +814,15 @@ uint32_t otPlatRadioGetSupportedChannelMask(otInstance *aInstance)
     OT_UNUSED_VARIABLE(aInstance);
     return CONFIG_OPENTHREAD_SUPPORTED_CHANNEL_MASK;
 }
+
+#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
+void esp_openthread_set_coex_config(esp_ieee802154_coex_config_t config)
+{
+    esp_ieee802154_set_coex_config(config);
+}
+
+esp_ieee802154_coex_config_t esp_openthread_get_coex_config(void)
+{
+    return esp_ieee802154_get_coex_config();
+}
+#endif
diff --git a/components/openthread/src/port/esp_openthread_radio_spinel.cpp b/components/openthread/src/port/esp_openthread_radio_spinel.cpp
diff --git a/components/openthread/src/port/esp_openthread_state.c b/components/openthread/src/port/esp_openthread_state.c
diff --git a/examples/openthread/ot_cli/sdkconfig.ci.ext_coex b/examples/openthread/ot_cli/sdkconfig.ci.ext_coex

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,6 @@ idf_component_register(`
`35`	`35`	`INCLUDE_DIRS "${include}"`
`36`	`36`	`PRIV_INCLUDE_DIRS "${private_include}"`
`37`	`37`	`LDFRAGMENTS linker.lf`
`38`		`- PRIV_REQUIRES esp_phy esp_timer esp_coex soc hal esp_pm`
	`38`	`+ REQUIRES esp_coex`
	`39`	`+ PRIV_REQUIRES esp_phy esp_timer soc hal esp_pm`
`39`	`40`	`)`