eaw/esp-idf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

component/ble_mesh: fix sending GATT service change indication

Browse Source
This commit is contained in:
lly
2019-04-25 12:07:36 +08:00
parent c38be0f81b
commit 54ecdca320
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/bt/ble_mesh/mesh_core/mesh_bearer_adapt.c
View File

@@ -70,6 +70,7 @@ static sys_slist_t bt_mesh_gatts_db;
static struct bt_mesh_conn bt_mesh_gatts_conn[CONFIG_BT_MAX_CONN];
static struct bt_mesh_conn_cb *bt_mesh_gatts_conn_cb;
static tBTA_GATTS_IF bt_mesh_gatts_if;
static BD_ADDR bt_mesh_gatts_addr;
static u16_t svc_handle, char_handle;
static future_t *future_mesh;
@@ -541,8 +542,13 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
bt_mesh_gatts_conn[index].handle = BLE_MESH_GATT_GET_CONN_ID(p_data->conn.conn_id);
(bt_mesh_gatts_conn_cb->connected)(&bt_mesh_gatts_conn[index], 0);
}
/* Send GATT service change indication */
BTA_GATTS_SendServiceChangeIndication(p_data->conn.server_if, p_data->conn.remote_bda);
memcpy(bt_mesh_gatts_addr, p_data->conn.remote_bda, BLE_MESH_ADDR_LEN);
/* This is for EspBleMesh Android app. When it tries to connect with the
* device at the first time and it fails due to some reason. And after
* the second connection, the device needs to send GATT service change
* indication to the phone manually to notify it dicovering service again.
*/
BTA_GATTS_SendServiceChangeIndication(bt_mesh_gatts_if, bt_mesh_gatts_addr);
}
break;
case BTA_GATTS_DISCONNECT_EVT:
@@ -555,6 +561,7 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
bt_mesh_gatts_conn[index].handle = BLE_MESH_GATT_GET_CONN_ID(p_data->conn.conn_id);
(bt_mesh_gatts_conn_cb->disconnected)(&bt_mesh_gatts_conn[index], p_data->conn.reason);
}
memset(bt_mesh_gatts_addr, 0x0, BLE_MESH_ADDR_LEN);
}
break;
case BTA_GATTS_CLOSE_EVT:
@@ -947,6 +954,9 @@ int bt_mesh_gatts_service_stop(struct bt_mesh_gatt_service *svc)
int bt_mesh_gatts_service_start(struct bt_mesh_gatt_service *svc)
{
struct bt_mesh_uuid_16 *uuid_16 = NULL;
struct bt_mesh_uuid *uuid = NULL;
if (!svc) {
BT_ERR("%s, Invalid parameter", __func__);
return -EINVAL;
@@ -955,6 +965,20 @@ int bt_mesh_gatts_service_start(struct bt_mesh_gatt_service *svc)
BT_DBG("Start service:%d", svc->attrs[0].handle);
BTA_GATTS_StartService(svc->attrs[0].handle, BTA_GATT_TRANSPORT_LE);
/* For EspBleMesh Android app, it does not disconnect after provisioning
* is done, and hence we send GATT service change indication manually
* when Mesh Proxy Service is started after provisioning.
*/
uuid = (struct bt_mesh_uuid *)svc->attrs[0].user_data;
if (uuid && uuid->type == BLE_MESH_UUID_TYPE_16) {
uuid_16 = (struct bt_mesh_uuid_16 *)uuid;
BT_DBG("%s, type 0x%02x, val 0x%04x", __func__, uuid_16->uuid.type, uuid_16->val);
if (uuid_16->val == BLE_MESH_UUID_MESH_PROXY_VAL) {
BTA_GATTS_SendServiceChangeIndication(bt_mesh_gatts_if, bt_mesh_gatts_addr);
}
}
return 0;
}
#endif /* defined(CONFIG_BLE_MESH_NODE) && CONFIG_BLE_MESH_NODE */

2
components/bt/ble_mesh/mesh_core/transport.c
View File

@@ -253,7 +253,7 @@ static void seg_tx_send_unacked(struct seg_tx *tx)
}
if (!(BLE_MESH_ADV(seg)->seg.attempts--)) {
BT_ERR("%s, Ran out of retransmit attempts", __func__);
BT_WARN("Ran out of retransmit attempts");
seg_tx_complete(tx, -ETIMEDOUT);
return;
}