From ff0106345fd0a92bce8ecc6f1355dd171d3b2b64 Mon Sep 17 00:00:00 2001 From: luomanruo Date: Fri, 24 Nov 2023 19:21:04 +0800 Subject: [PATCH 1/4] ble: Update c2 lib to 79ed4e8a Update h2 lib to 9a237426 Update c6 lib to 9a237426 --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- components/bt/controller/lib_esp32c6/esp32c6-bt-lib | 2 +- components/bt/controller/lib_esp32h2/esp32h2-bt-lib | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index 1e8bbd6f1a..5dc39aabee 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit 1e8bbd6f1af71b90a2e8130e77ed49dc799031fe +Subproject commit 5dc39aabee570806cbdaed1886d07bd91451cd60 diff --git a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib index e70c4abbd5..0caa942705 160000 --- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib +++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib @@ -1 +1 @@ -Subproject commit e70c4abbd5666afac3b7b3cea1c3d9c59ee33ce9 +Subproject commit 0caa942705eb9876a82d5ab609413eccbc712a42 diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib index 66303b4a8c..acf2950557 160000 --- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib +++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib @@ -1 +1 @@ -Subproject commit 66303b4a8cc8e889a0c9bdd7301582ba2cb8b0eb +Subproject commit acf295055730cc2acba07dadfc55716cf65faacd From 49d81c71a8b8eaf93acbce0ce4b4afc4e4be8d98 Mon Sep 17 00:00:00 2001 From: luomanruo Date: Fri, 24 Nov 2023 19:34:54 +0800 Subject: [PATCH 2/4] ble(fix): fix RX issue on ESP32-C2 --- components/esp_phy/lib | 2 +- components/esp_phy/src/phy_init.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/esp_phy/lib b/components/esp_phy/lib index a8e8b9532e..e3222517e3 160000 --- a/components/esp_phy/lib +++ b/components/esp_phy/lib @@ -1 +1 @@ -Subproject commit a8e8b9532e2874ac167d4ade7808fda70fe05820 +Subproject commit e3222517e339e9301dd7f432fa3e052cf44d325f diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c index 2c330879ca..71e2714129 100644 --- a/components/esp_phy/src/phy_init.c +++ b/components/esp_phy/src/phy_init.c @@ -781,10 +781,10 @@ void esp_phy_load_cal_and_init(void) // Set PHY whether in combo module // For comode mode, phy enable will be not in WiFi RX state #if SOC_PHY_COMBO_MODULE -#if CONFIG_IDF_TARGET_ESP32C2 - phy_init_param_set(1); -#else +#if (CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3) phy_init_param_set(0); +#else + phy_init_param_set(1); #endif #endif From 8f37c22a0d07e4cfc01be64b3b5b92a658dbb0a8 Mon Sep 17 00:00:00 2001 From: luomanruo Date: Tue, 21 Nov 2023 11:49:55 +0800 Subject: [PATCH 3/4] ble: update sdkconfig_version on ESP32C2, ESP32H2 and ESP32C6 --- components/bt/include/esp32c2/include/esp_bt.h | 7 ++++--- components/bt/include/esp32c6/include/esp_bt.h | 4 ++-- components/bt/include/esp32h2/include/esp_bt.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/components/bt/include/esp32c2/include/esp_bt.h b/components/bt/include/esp32c2/include/esp_bt.h index 6939470393..366c789218 100644 --- a/components/bt/include/esp32c2/include/esp_bt.h +++ b/components/bt/include/esp32c2/include/esp_bt.h @@ -15,6 +15,7 @@ #include "nimble/nimble_npl.h" #include "../../../../controller/esp32c2/esp_bt_cfg.h" +#include "hal/efuse_hal.h" #ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART #include "driver/uart.h" @@ -165,7 +166,7 @@ esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t po */ uint8_t esp_ble_get_chip_rev_version(void); -#define CONFIG_VERSION 0x20230629 +#define CONFIG_VERSION 0x20231124 #define CONFIG_MAGIC 0x5A5AA5A5 /** @@ -222,7 +223,7 @@ typedef struct { uint8_t cca_drop_mode; /*!< CCA drop mode */ int8_t cca_low_tx_pwr; /*!< Low TX power setting for CCA */ uint8_t main_xtal_freq; /*!< Main crystal frequency */ - uint8_t version_num; /*!< Version number */ + uint32_t version_num; /*!< Version number */ uint8_t ignore_wl_for_direct_adv; /*!< Ignore the white list for directed advertising */ uint32_t config_magic; /*!< Configuration magic value */ } esp_bt_controller_config_t; @@ -274,7 +275,7 @@ typedef struct { .dis_scan_backoff = NIMBLE_DISABLE_SCAN_BACKOFF, \ .ble_scan_classify_filter_enable = 0, \ .main_xtal_freq = CONFIG_XTAL_FREQ, \ - .version_num = esp_ble_get_chip_rev_version(), \ + .version_num = efuse_hal_chip_revision(), \ .ignore_wl_for_direct_adv = 0, \ .config_magic = CONFIG_MAGIC, \ } diff --git a/components/bt/include/esp32c6/include/esp_bt.h b/components/bt/include/esp32c6/include/esp_bt.h index 876754df6d..93360be1ba 100644 --- a/components/bt/include/esp32c6/include/esp_bt.h +++ b/components/bt/include/esp32c6/include/esp_bt.h @@ -155,7 +155,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); -#define CONFIG_VERSION 0x20230113 +#define CONFIG_VERSION 0x20231124 #define CONFIG_MAGIC 0x5A5AA5A5 /** @@ -212,7 +212,7 @@ typedef struct { uint8_t cca_drop_mode; /*!< CCA drop mode */ int8_t cca_low_tx_pwr; /*!< CCA low transmit power */ uint8_t main_xtal_freq; /*!< Main crystal frequency */ - uint8_t version_num; /*!< Controller configuration version number */ + uint32_t version_num; /*!< Controller configuration version number */ uint8_t cpu_freq_mhz; /*!< CPU frequency in megahertz (MHz) */ uint8_t ignore_wl_for_direct_adv; /*!< Ignore the whitelist for direct advertising */ uint8_t enable_pcl; /*!< Enable power control */ diff --git a/components/bt/include/esp32h2/include/esp_bt.h b/components/bt/include/esp32h2/include/esp_bt.h index 75b9231b22..90cfcdeeff 100644 --- a/components/bt/include/esp32h2/include/esp_bt.h +++ b/components/bt/include/esp32h2/include/esp_bt.h @@ -160,7 +160,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); -#define CONFIG_VERSION 0x20230113 +#define CONFIG_VERSION 0x20231124 #define CONFIG_MAGIC 0x5A5AA5A5 /** From e6602ced8e19f3bb2d780cf8d6bd936020a3093b Mon Sep 17 00:00:00 2001 From: luomanruo Date: Fri, 24 Nov 2023 20:33:49 +0800 Subject: [PATCH 4/4] ble: update rom.ld file --- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 211a2540f6..295d913858 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -734,7 +734,6 @@ r_ble_ll_conn_module_reset = 0x40000e04; r_ble_ll_conn_num_comp_pkts_event_send = 0x40000e0c; r_ble_ll_conn_process_conn_params = 0x40000e14; r_ble_ll_conn_req_peer_sca = 0x40000e18; -r_ble_ll_conn_rx_data_pdu = 0x40000e1c; r_ble_ll_conn_set_csa = 0x40000e20; r_ble_ll_conn_set_ext_con_params = 0x40000e24; r_ble_ll_conn_set_global_chanmap = 0x40000e28; @@ -889,7 +888,6 @@ r_ble_ll_pdu_max_tx_octets_get = 0x400010ec; r_ble_ll_pdu_tx_time_get = 0x400010f0; r_ble_ll_phy_to_phy_mode = 0x400010f4; r_ble_ll_qa_enable = 0x400010f8; -r_ble_ll_rand = 0x400010fc; r_ble_ll_rand_data_get = 0x40001100; r_ble_ll_rand_init = 0x4000110c; r_ble_ll_rand_prand_get = 0x40001110; @@ -1164,7 +1162,6 @@ r_ble_lll_per_adv_coex_dpc_update_on_data_updated = 0x40001638; r_ble_lll_per_adv_coex_dpc_update_on_scheduled = 0x4000163c; r_ble_lll_per_adv_coex_dpc_update_on_start = 0x40001640; r_ble_lll_reset = 0x40001644; -r_ble_lll_rfmgmt_enable_now = 0x40001658; r_ble_lll_rfmgmt_is_enabled = 0x40001660; r_ble_lll_rfmgmt_release = 0x40001664; r_ble_lll_rfmgmt_scan_changed = 0x40001670; @@ -1203,7 +1200,6 @@ r_ble_lll_sched_adv_resched_pdu = 0x40001720; r_ble_lll_sched_adv_reschedule = 0x40001724; r_ble_lll_sched_aux_scan = 0x40001728; r_ble_lll_sched_conn_overlap = 0x4000172c; -r_ble_lll_sched_conn_reschedule = 0x40001730; r_ble_lll_sched_dtm = 0x40001738; r_ble_lll_sched_execute_item = 0x40001744; r_ble_lll_sched_init = 0x40001748;