alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp32c2_fixed_adv_stop' into 'master'

Browse Source 
ble:Fixed issues of adv error stop and abnormal reporting of connection update...

Closes BT-3137 and BT-3144

See merge request espressif/esp-idf!22310
This commit is contained in:
Island 2023-02-15 14:20:51 +08:00
commit 50ae186ff7
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/controller/lib_esp32c2/esp32c2-bt-lib

@ -1 +1 @@
Subproject commit 2d0c9d0d5df1fa825ed3c48df968e3c9b8c434ee Subproject commit 27bb629b905473357dda49eb62c6a858e034d5c8

4
components/bt/include/esp32c2/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 0x20220824 #define CONFIG_VERSION 0x20230113
#define CONFIG_MAGIC 0x5A5AA5A5 #define CONFIG_MAGIC 0x5A5AA5A5
/** /**
@ -203,6 +203,7 @@ typedef struct {
uint8_t cca_drop_mode; uint8_t cca_drop_mode;
int8_t cca_low_tx_pwr; int8_t cca_low_tx_pwr;
uint8_t main_xtal_freq; uint8_t main_xtal_freq;
uint8_t ignore_wl_for_direct_adv;
uint32_t config_magic; uint32_t config_magic;
} esp_bt_controller_config_t; } esp_bt_controller_config_t;
@ -254,6 +255,7 @@ typedef struct {
.dis_scan_backoff = NIMBLE_DISABLE_SCAN_BACKOFF, \ .dis_scan_backoff = NIMBLE_DISABLE_SCAN_BACKOFF, \
.ble_scan_classify_filter_enable = 0, \ .ble_scan_classify_filter_enable = 0, \
.main_xtal_freq = CONFIG_XTAL_FREQ, \ .main_xtal_freq = CONFIG_XTAL_FREQ, \
.ignore_wl_for_direct_adv = 0, \
.config_magic = CONFIG_MAGIC, \ .config_magic = CONFIG_MAGIC, \
} }

7
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@ -562,7 +562,6 @@ bt_rf_coex_cfg_get_default = 0x40000ab0;
bt_rf_coex_dft_pti_get_default = 0x40000ab4; bt_rf_coex_dft_pti_get_default = 0x40000ab4;
bt_rf_coex_hooks_p_set = 0x40000ab8; bt_rf_coex_hooks_p_set = 0x40000ab8;
r__os_mbuf_copypkthdr = 0x40000abc; r__os_mbuf_copypkthdr = 0x40000abc;
r__os_msys_find_pool = 0x40000ac0;
r_ble_controller_get_rom_compile_version = 0x40000ac4; r_ble_controller_get_rom_compile_version = 0x40000ac4;
r_ble_hci_ram_hs_acl_tx = 0x40000ac8; r_ble_hci_ram_hs_acl_tx = 0x40000ac8;
r_ble_hci_ram_hs_cmd_tx = 0x40000acc; r_ble_hci_ram_hs_cmd_tx = 0x40000acc;
@ -742,7 +741,6 @@ r_ble_ll_conn_is_empty_pdu = 0x40000df0;
r_ble_ll_conn_is_lru = 0x40000df4; r_ble_ll_conn_is_lru = 0x40000df4;
r_ble_ll_conn_master_init = 0x40000df8; r_ble_ll_conn_master_init = 0x40000df8;
r_ble_ll_conn_module_reset = 0x40000e04; r_ble_ll_conn_module_reset = 0x40000e04;
r_ble_ll_conn_next_event = 0x40000e08;
r_ble_ll_conn_num_comp_pkts_event_send = 0x40000e0c; r_ble_ll_conn_num_comp_pkts_event_send = 0x40000e0c;
r_ble_ll_conn_process_conn_params = 0x40000e14; r_ble_ll_conn_process_conn_params = 0x40000e14;
r_ble_ll_conn_req_peer_sca = 0x40000e18; r_ble_ll_conn_req_peer_sca = 0x40000e18;
@ -832,7 +830,6 @@ r_ble_ll_hci_cb_set_event_mask2 = 0x40000fa4;
r_ble_ll_hci_chk_phy_masks = 0x40000fa8; r_ble_ll_hci_chk_phy_masks = 0x40000fa8;
r_ble_ll_hci_cmd_proc = 0x40000fac; r_ble_ll_hci_cmd_proc = 0x40000fac;
r_ble_ll_hci_cmd_rx = 0x40000fb0; r_ble_ll_hci_cmd_rx = 0x40000fb0;
r_ble_ll_hci_ctlr_bb_cmd_proc = 0x40000fb4;
r_ble_ll_hci_disconnect = 0x40000fbc; r_ble_ll_hci_disconnect = 0x40000fbc;
r_ble_ll_hci_ev_conn_update = 0x40000fc4; r_ble_ll_hci_ev_conn_update = 0x40000fc4;
r_ble_ll_hci_ev_databuf_overflow = 0x40000fc8; r_ble_ll_hci_ev_databuf_overflow = 0x40000fc8;
@ -902,7 +899,6 @@ r_ble_ll_is_valid_public_addr = 0x400010d4;
r_ble_ll_is_valid_random_addr = 0x400010d8; r_ble_ll_is_valid_random_addr = 0x400010d8;
r_ble_ll_misc_options_set = 0x400010e0; r_ble_ll_misc_options_set = 0x400010e0;
r_ble_ll_modify_sca = 0x400010e4; r_ble_ll_modify_sca = 0x400010e4;
r_ble_ll_modify_sca_action = 0x400010e8;
r_ble_ll_pdu_max_tx_octets_get = 0x400010ec; r_ble_ll_pdu_max_tx_octets_get = 0x400010ec;
r_ble_ll_pdu_tx_time_get = 0x400010f0; r_ble_ll_pdu_tx_time_get = 0x400010f0;
r_ble_ll_phy_to_phy_mode = 0x400010f4; r_ble_ll_phy_to_phy_mode = 0x400010f4;
@ -1088,7 +1084,6 @@ r_ble_lll_adv_periodic_done = 0x4000143c;
r_ble_lll_adv_periodic_event_done = 0x40001440; r_ble_lll_adv_periodic_event_done = 0x40001440;
r_ble_lll_adv_periodic_rmvd_from_sched = 0x40001444; r_ble_lll_adv_periodic_rmvd_from_sched = 0x40001444;
r_ble_lll_adv_periodic_schedule_first = 0x40001448; r_ble_lll_adv_periodic_schedule_first = 0x40001448;
r_ble_lll_adv_periodic_start = 0x40001450;
r_ble_lll_adv_pri_schedule_tx_pdu = 0x40001458; r_ble_lll_adv_pri_schedule_tx_pdu = 0x40001458;
r_ble_lll_adv_reschedule_event = 0x4000145c; r_ble_lll_adv_reschedule_event = 0x4000145c;
r_ble_lll_adv_reschedule_periodic_event = 0x40001460; r_ble_lll_adv_reschedule_periodic_event = 0x40001460;
@ -1320,7 +1315,6 @@ r_ble_phy_set_conn_ind_pdu = 0x40001890;
r_ble_phy_set_conn_mode = 0x40001894; r_ble_phy_set_conn_mode = 0x40001894;
r_ble_phy_set_dev_address = 0x40001898; r_ble_phy_set_dev_address = 0x40001898;
r_ble_phy_set_rx_pwr_compensation = 0x4000189c; r_ble_phy_set_rx_pwr_compensation = 0x4000189c;
r_ble_phy_set_scan_mode = 0x400018a4;
r_ble_phy_set_single_packet_rx_sequence = 0x400018ac; r_ble_phy_set_single_packet_rx_sequence = 0x400018ac;
r_ble_phy_set_single_packet_tx_sequence = 0x400018b0; r_ble_phy_set_single_packet_tx_sequence = 0x400018b0;
r_ble_phy_set_tx_rx_transition = 0x400018b4; r_ble_phy_set_tx_rx_transition = 0x400018b4;
@ -1388,7 +1382,6 @@ r_os_cputime_timer_start = 0x400019d0;
r_os_cputime_timer_stop = 0x400019d4; r_os_cputime_timer_stop = 0x400019d4;
r_os_cputime_usecs_to_ticks = 0x400019d8; r_os_cputime_usecs_to_ticks = 0x400019d8;
r_os_mbuf_adj = 0x400019dc; r_os_mbuf_adj = 0x400019dc;
r_os_mbuf_append = 0x400019e0;
r_os_mbuf_appendfrom = 0x400019e4; r_os_mbuf_appendfrom = 0x400019e4;
r_os_mbuf_cmpf = 0x400019e8; r_os_mbuf_cmpf = 0x400019e8;
r_os_mbuf_cmpm = 0x400019ec; r_os_mbuf_cmpm = 0x400019ec;