mirror of
https://github.com/espressif/esp-idf.git
synced 2025-10-03 10:30:58 +02:00
Merge branch 'feat/add_154_status_for_coex' into 'master'
feat(coex): add 802.15.4 status for coex See merge request espressif/esp-idf!41627
This commit is contained in:
@@ -6,6 +6,9 @@
|
|||||||
#ifndef __COEXIST_I154_H__
|
#ifndef __COEXIST_I154_H__
|
||||||
#define __COEXIST_I154_H__
|
#define __COEXIST_I154_H__
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief 802.15.4 coex event
|
||||||
|
*/
|
||||||
typedef enum {
|
typedef enum {
|
||||||
IEEE802154_HIGH = 1,
|
IEEE802154_HIGH = 1,
|
||||||
IEEE802154_MIDDLE,
|
IEEE802154_MIDDLE,
|
||||||
@@ -14,16 +17,50 @@ typedef enum {
|
|||||||
IEEE802154_EVENT_MAX,
|
IEEE802154_EVENT_MAX,
|
||||||
} ieee802154_coex_event_t;
|
} ieee802154_coex_event_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief 802.15.4 coexistence configurations
|
||||||
|
*/
|
||||||
typedef struct {
|
typedef struct {
|
||||||
ieee802154_coex_event_t idle;
|
ieee802154_coex_event_t idle;
|
||||||
ieee802154_coex_event_t txrx;
|
ieee802154_coex_event_t txrx;
|
||||||
ieee802154_coex_event_t txrx_at;
|
ieee802154_coex_event_t txrx_at;
|
||||||
} esp_ieee802154_coex_config_t;
|
} esp_ieee802154_coex_config_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Set 802.15.4 tx/rx pti
|
||||||
|
* @param 802.15.4 coexistence event
|
||||||
|
*/
|
||||||
void esp_coex_ieee802154_txrx_pti_set(ieee802154_coex_event_t event);
|
void esp_coex_ieee802154_txrx_pti_set(ieee802154_coex_event_t event);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Set 802.15.4 ack pti
|
||||||
|
* @param 802.15.4 coexistence event
|
||||||
|
*/
|
||||||
void esp_coex_ieee802154_ack_pti_set(ieee802154_coex_event_t event);
|
void esp_coex_ieee802154_ack_pti_set(ieee802154_coex_event_t event);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Indicate that a coexistence break occurred in 802.15.4
|
||||||
|
*/
|
||||||
void esp_coex_ieee802154_coex_break_notify(void);
|
void esp_coex_ieee802154_coex_break_notify(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Enter the TX stage for 802.15.4 external coexistence handling
|
||||||
|
*/
|
||||||
void esp_coex_ieee802154_extcoex_tx_stage(void);
|
void esp_coex_ieee802154_extcoex_tx_stage(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Enter the RX stage for 802.15.4 external coexistence handling
|
||||||
|
*/
|
||||||
void esp_coex_ieee802154_extcoex_rx_stage(void);
|
void esp_coex_ieee802154_extcoex_rx_stage(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Enable the 802.15.4 status for coexistence
|
||||||
|
*/
|
||||||
|
void esp_coex_ieee802154_status_enable(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Disable the 802.15.4 status for coexistence
|
||||||
|
*/
|
||||||
|
void esp_coex_ieee802154_status_disable(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -32,6 +32,8 @@ typedef enum {
|
|||||||
COEX_SCHM_ST_TYPE_WIFI = 0,
|
COEX_SCHM_ST_TYPE_WIFI = 0,
|
||||||
COEX_SCHM_ST_TYPE_BLE,
|
COEX_SCHM_ST_TYPE_BLE,
|
||||||
COEX_SCHM_ST_TYPE_BT,
|
COEX_SCHM_ST_TYPE_BT,
|
||||||
|
COEX_SCHM_ST_TYPE_EXTERNAL_COEX,
|
||||||
|
COEX_SCHM_ST_TYPE_I154,
|
||||||
} coex_schm_st_type_t;
|
} coex_schm_st_type_t;
|
||||||
|
|
||||||
#define COEX_STATUS_GET_WIFI_BITMAP (1 << COEX_SCHM_ST_TYPE_WIFI)
|
#define COEX_STATUS_GET_WIFI_BITMAP (1 << COEX_SCHM_ST_TYPE_WIFI)
|
||||||
|
Submodule components/esp_coex/lib updated: 2d68674e3d...adb3badffe
@@ -21,6 +21,10 @@
|
|||||||
#include "esp_private/esp_modem_clock.h"
|
#include "esp_private/esp_modem_clock.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if CONFIG_ESP_COEX_SW_COEXIST_ENABLE && CONFIG_SOC_IEEE802154_SUPPORTED
|
||||||
|
#include "esp_coex_i154.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if SOC_EXTERNAL_COEX_ADVANCE
|
#if SOC_EXTERNAL_COEX_ADVANCE
|
||||||
#define EXTERNAL_COEX_SIGNAL_I0_IDX EXTERN_ACTIVE_I_IDX
|
#define EXTERNAL_COEX_SIGNAL_I0_IDX EXTERN_ACTIVE_I_IDX
|
||||||
#define EXTERNAL_COEX_SIGNAL_I1_IDX EXTERN_PRIORITY_I_IDX
|
#define EXTERNAL_COEX_SIGNAL_I1_IDX EXTERN_PRIORITY_I_IDX
|
||||||
@@ -289,7 +293,7 @@ esp_err_t esp_coex_wifi_i154_enable(void)
|
|||||||
// TODO: Add a scheme for wifi and 154 coex.
|
// TODO: Add a scheme for wifi and 154 coex.
|
||||||
// Remove this function if FCC-50 closes.
|
// Remove this function if FCC-50 closes.
|
||||||
coex_enable();
|
coex_enable();
|
||||||
coex_schm_status_bit_set(1, 1);
|
esp_coex_ieee802154_status_enable();
|
||||||
return ESP_OK;
|
return ESP_OK;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Submodule components/esp_wifi/lib updated: 0e7080ea59...a3ae65ccff
Reference in New Issue
Block a user