feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/esp32c6_enable_pcl_feature' into 'master'

Browse Source 
Enabled PCL feature on ESP32C6

Closes IDF-6529

See merge request espressif/esp-idf!21903
This commit is contained in:
Island
2023-01-17 17:35:04 +08:00
parent d9825f5165 38c5f239be
commit 2dc96f9a27
5 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/bt/controller/esp32c6/Kconfig.in
View File

@@ -175,6 +175,13 @@ config BT_LE_MAX_PERIODIC_ADVERTISER_LIST
help help
Set this option to set the upper limit for number of periodic advertiser list. Set this option to set the upper limit for number of periodic advertiser list.
config BT_LE_POWER_CONTROL_ENABLED
bool "Enable controller support for BLE Power Control"
depends on BT_LE_50_FEATURE_SUPPORT && !BT_NIMBLE_ENABLED && IDF_TARGET_ESP32C6
default n
help
Set this option to enable the Power Control feature on controller
menu "Memory Settings" menu "Memory Settings"
depends on !BT_NIMBLE_ENABLED depends on !BT_NIMBLE_ENABLED

2
components/bt/controller/lib_esp32c6/esp32c6-bt-lib

Submodule components/bt/controller/lib_esp32c6/esp32c6-bt-lib updated: 5b6a490d2b...0319817007

4
components/bt/host/nimble/port/include/esp_nimble_cfg.h
View File

@@ -1596,7 +1596,11 @@
#endif #endif
#ifndef MYNEWT_VAL_BLE_POWER_CONTROL #ifndef MYNEWT_VAL_BLE_POWER_CONTROL
#ifdef CONFIG_BT_NIMBLE_BLE_POWER_CONTROL
#define MYNEWT_VAL_BLE_POWER_CONTROL CONFIG_BT_NIMBLE_BLE_POWER_CONTROL #define MYNEWT_VAL_BLE_POWER_CONTROL CONFIG_BT_NIMBLE_BLE_POWER_CONTROL
#else
#define MYNEWT_VAL_BLE_POWER_CONTROL (0)
#endif
#endif #endif
#endif #endif

4
components/bt/include/esp32c6/include/esp_bt.h
View File

@@ -145,7 +145,7 @@ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type
*/ */
esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle); esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle);
#define CONFIG_VERSION 0x20221220 #define CONFIG_VERSION 0x20230113
#define CONFIG_MAGIC 0x5A5AA5A5 #define CONFIG_MAGIC 0x5A5AA5A5
/** /**
@@ -206,6 +206,7 @@ typedef struct {
uint8_t version_num; uint8_t version_num;
uint8_t cpu_freq_mhz; uint8_t cpu_freq_mhz;
uint8_t ignore_wl_for_direct_adv; uint8_t ignore_wl_for_direct_adv;
uint8_t enable_pcl;
uint32_t config_magic; uint32_t config_magic;
} esp_bt_controller_config_t; } esp_bt_controller_config_t;
@@ -260,6 +261,7 @@ typedef struct {
.version_num = 0, \ .version_num = 0, \
.cpu_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ, \ .cpu_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ, \
.ignore_wl_for_direct_adv = 0, \ .ignore_wl_for_direct_adv = 0, \
.enable_pcl = DEFAULT_BT_LE_POWER_CONTROL_ENABLED, \
.config_magic = CONFIG_MAGIC, \ .config_magic = CONFIG_MAGIC, \
} }

9
components/bt/include/esp32c6/include/esp_bt_cfg.h
View File

@@ -28,7 +28,6 @@ extern "C" {
#else #else
#define BLE_LL_SCAN_PHY_NUMBER_N (1) #define BLE_LL_SCAN_PHY_NUMBER_N (1)
#endif #endif
#define DEFAULT_BT_LE_MAX_PERIODIC_ADVERTISER_LIST MYNEWT_VAL(BLE_MAX_PERIODIC_ADVERTISER_LIST) #define DEFAULT_BT_LE_MAX_PERIODIC_ADVERTISER_LIST MYNEWT_VAL(BLE_MAX_PERIODIC_ADVERTISER_LIST)
#define DEFAULT_BT_LE_MAX_PERIODIC_SYNCS MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS) #define DEFAULT_BT_LE_MAX_PERIODIC_SYNCS MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)
#define DEFAULT_BT_LE_MAX_CONNECTIONS MYNEWT_VAL(BLE_MAX_CONNECTIONS) #define DEFAULT_BT_LE_MAX_CONNECTIONS MYNEWT_VAL(BLE_MAX_CONNECTIONS)
@@ -41,7 +40,7 @@ extern "C" {
#define DEFAULT_BT_LE_HCI_EVT_HI_BUF_COUNT MYNEWT_VAL(BLE_HCI_EVT_HI_BUF_COUNT) #define DEFAULT_BT_LE_HCI_EVT_HI_BUF_COUNT MYNEWT_VAL(BLE_HCI_EVT_HI_BUF_COUNT)
#define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT MYNEWT_VAL(BLE_HCI_EVT_LO_BUF_COUNT) #define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT MYNEWT_VAL(BLE_HCI_EVT_LO_BUF_COUNT)
#define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF #define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF
#define DEFAULT_BT_LE_POWER_CONTROL_ENABLED MYNEWT_VAL(BLE_POWER_CONTROL)
#else #else
#if CONFIG_BT_LE_LL_CFG_FEAT_LE_CODED_PHY #if CONFIG_BT_LE_LL_CFG_FEAT_LE_CODED_PHY
@@ -118,6 +117,11 @@ extern "C" {
#define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF #define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF
#if defined(CONFIG_BT_LE_POWER_CONTROL_ENABLED)
#define DEFAULT_BT_LE_POWER_CONTROL_ENABLED (CONFIG_BT_LE_POWER_CONTROL_ENABLED)
#else
#define DEFAULT_BT_LE_POWER_CONTROL_ENABLED (0)
#endif
#endif #endif
@@ -201,7 +205,6 @@ extern "C" {
#define RUN_QA_TEST (0) #define RUN_QA_TEST (0)
#define NIMBLE_DISABLE_SCAN_BACKOFF (0) #define NIMBLE_DISABLE_SCAN_BACKOFF (0)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif