Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_add_assert_when_no_device_name' into 'master'

Browse source 
component/bt: Fix exception when there is no device name

See merge request idf/esp-idf!2184
This commit is contained in:
Jiang Jiang Jian 2018-04-17 14:19:39 +08:00
parent a21336eaa1 52dbcef908
commit 0d55f2cb7b
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/bt/bluedroid/api/include/esp_bt_device.h
View file

@ -27,15 +27,17 @@ extern "C" {
/**
*
* @brief Get bluetooth device address. Must use after "esp_bluedroid_enable".
*
*
* @return bluetooth device address (six bytes), or NULL if bluetooth stack is not enabled
*/
const uint8_t *esp_bt_dev_get_address(void);
/**
* @brief Set bluetooth device name. This function should be called after esp_bluedroid_enable()
* completes successfully
* @brief Set bluetooth device name. This function should be called after esp_bluedroid_enable()
* completes successfully.
* A BR/EDR/LE device type shall have a single Bluetooth device name which shall be
* identical irrespective of the physical channel used to perform the name discovery procedure.
*
* @param[in] name : device name to be set
*

8
components/bt/bluedroid/btc/core/btc_dm.c
View file

@ -434,6 +434,12 @@ void btc_dm_sec_cb_handler(btc_msg_t *msg)
//load the bonding device to the btm layer
btc_storage_load_bonded_ble_devices();
#endif ///SMP_INCLUDED == TRUE
/* Set initial device name, it can be overwritten later */
if (p_data->enable.status == BTA_SUCCESS) {
char *initial_device_name = "ESP32";
BTA_DmSetDeviceName(initial_device_name);
}
btc_enable_bluetooth_evt(p_data->enable.status);
break;
}
@ -465,7 +471,7 @@ void btc_dm_sec_cb_handler(btc_msg_t *msg)
memcpy(bd_addr.address, p_data->link_down.bd_addr, sizeof(BD_ADDR));
btm_set_bond_type_dev(p_data->link_down.bd_addr, BOND_TYPE_UNKNOWN);
param.remove_bond_dev_cmpl.status = ESP_BT_STATUS_FAIL;
if (p_data->link_down.status == HCI_SUCCESS) {
//remove the bonded key in the config and nvs flash.
btc_storage_remove_ble_dev_type(&bd_addr, false);

2
components/bt/lib

@ -1 +1 @@
Subproject commit 9a93239bc8f54bc5434e8a3dec98e2a8b6b9454a
Subproject commit 74a772d0b88271d6161d0e61e4c358030a001ab5