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

Merge branch 'feature/btdm_bluedroid' into feature/btdm_a2dp

Browse Source 
# Conflicts:
#	examples/13_bt_sdp/components/bluedroid_demos/btif/btif_core.c
#	examples/13_bt_sdp/components/bluedroid_demos/include/btif_util.h
This commit is contained in:
wangmengyang
2016-12-02 22:33:09 +08:00
parent 56bbc17ddc bd20288b81
commit 11ddfbba4e
215 changed files with 12529 additions and 5908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/bluedroid/stack/btm/btm_ble_bgconn.c
+2 -2
View File
@@ -441,7 +441,7 @@ BOOLEAN btm_ble_start_auto_conn(BOOLEAN start)
** p_select_cback: callback function to return application
** selection.
**
** Returns BOOLEAN: selective connectino procedure is started.
** Returns BOOLEAN: selective connection procedure is started.
**
*******************************************************************************/
BOOLEAN btm_ble_start_select_conn(BOOLEAN start, tBTM_BLE_SEL_CBACK *p_select_cback)
@@ -523,7 +523,7 @@ BOOLEAN btm_ble_start_select_conn(BOOLEAN start, tBTM_BLE_SEL_CBACK *p_select_cb
** p_select_cback: callback function to return application
** selection.
**
** Returns BOOLEAN: selective connectino procedure is started.
** Returns BOOLEAN: selective connection procedure is started.
**
*******************************************************************************/
void btm_ble_initiate_select_conn(BD_ADDR bda)
components/bt/bluedroid/stack/btm/btm_ble_gap.c
+4 -5
View File
@@ -1353,11 +1353,10 @@ tBTM_STATUS BTM_BleWriteAdvData(tBTM_BLE_AD_MASK data_mask, tBTM_BLE_ADV_DATA *p
BOOLEAN BTM_BleSetRandAddress(BD_ADDR rand_addr)
{
BOOLEAN set_flag = false;
UINT8 len = sizeof(rand_addr);
if (len != BD_ADDR_LEN) {
APPL_TRACE_ERROR("Invalid random adress");
return false;
}
if (rand_addr == NULL)
return set_flag;
//send the set random address to the controller
set_flag = btsnd_hcic_ble_set_random_addr(rand_addr);
return set_flag;
components/bt/bluedroid/stack/gatt/att_protocol.c
+1 -1
View File
@@ -496,7 +496,7 @@ tGATT_STATUS attp_cl_send_cmd(tGATT_TCB *p_tcb, UINT16 clcb_idx, UINT8 cmd_code,
** Description This function sends the client request or confirmation message
** to server.
**
** Parameter p_tcb: pointer to the connectino control block.
** Parameter p_tcb: pointer to the connection control block.
** clcb_idx: clcb index
** op_code: message op code.
** p_msg: pointer to message parameters structure.
components/bt/bluedroid/stack/include/btm_ble_api.h
+1 -1
View File
@@ -167,7 +167,7 @@ typedef UINT8 tBTM_BLE_SFP;
#define BTM_BLE_CONN_INT_MIN_DEF 24 /* recommended min: 30ms = 24 * 1.25 */
#endif
/* default connectino interval max */
/* default connection interval max */
#ifndef BTM_BLE_CONN_INT_MAX_DEF
#define BTM_BLE_CONN_INT_MAX_DEF 40 /* recommended max: 50 ms = 56 * 1.25 */
#endif