pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid

Browse Source 
# Conflicts:
#	components/bt/bluedroid/bta/dm/bta_dm_pm.c
#	components/bt/component.mk
#	examples/07_blufi/components/bluedroid_demos/app_core/bt_app_core.c
#	examples/07_blufi/components/bluedroid_demos/app_project/SampleServerProject.c
This commit is contained in:
Tian Hao
2016-11-01 14:01:49 +08:00
parent e81ff4f68c 45638b3f98
commit cb33e2a5ae
30 changed files with 827 additions and 1731 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/bluedroid/stack/btm/btm_ble_gap.c
+1 -1
View File
@@ -1434,7 +1434,7 @@ UINT8 *btm_ble_build_adv_data(tBTM_BLE_AD_MASK *p_data_mask, UINT8 **p_dst,
LOG_ERROR("cp_len = %d\n,p_data->p_manu->len=%d\n",cp_len,p_data->p_manu->len);
for(int i = 0; i < p_data->p_manu->len; i++)
{
LOG_ERROR("p_data->p_manu->p_val[%d] = %x\n",i,p_data->p_manu->p_val[i]);
LOG_DEBUG("p_data->p_manu->p_val[%d] = %x\n",i,p_data->p_manu->p_val[i]);
}
*p++ = cp_len + 1;
*p++ = BTM_BLE_AD_TYPE_MANU;