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/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
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

4
components/bt/bluedroid/api/include/esp_bt_device.h
View File

@ -35,7 +35,9 @@ const uint8_t *esp_bt_dev_get_address(void);
/** /**
* @brief Set bluetooth device name. This function should be called after esp_bluedroid_enable() * @brief Set bluetooth device name. This function should be called after esp_bluedroid_enable()
* completes successfully * 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 * @param[in] name : device name to be set
* *

6
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 //load the bonding device to the btm layer
btc_storage_load_bonded_ble_devices(); btc_storage_load_bonded_ble_devices();
#endif ///SMP_INCLUDED == TRUE #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); btc_enable_bluetooth_evt(p_data->enable.status);
break; break;
} }

2
components/bt/lib

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