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

component/ble_mesh: Send gatt service change indication when device is connected

Browse Source
This commit is contained in:
lly
2019-03-28 16:02:52 +08:00
parent 999fa1986e
commit 5ae2a73971
6 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -816,13 +816,12 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
}
break;
}
case BTA_GATTS_ADD_INCL_SRVC_EVT: {
case BTA_GATTS_ADD_INCL_SRVC_EVT:
svc_handle = p_data->add_result.attr_id;
if (future_mesh != NULL) {
future_ready(future_mesh, FUTURE_SUCCESS);
}
break;
}
case BTA_GATTS_ADD_CHAR_EVT:
char_handle = p_data->add_result.attr_id;
if (future_mesh != NULL) {
@@ -841,7 +840,7 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
break;
case BTA_GATTS_STOP_EVT:
break;
case BTA_GATTS_CONNECT_EVT: {
case BTA_GATTS_CONNECT_EVT:
/*Adv disabled*/
// atomic_clear_bit(bt_dev.flags, BT_DEV_ADVERTISING);
if (bt_mesh_gatts_conn_cb != NULL && bt_mesh_gatts_conn_cb->connected != NULL) {
@@ -850,10 +849,11 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
bt_mesh_gatts_conn[index].handle = BT_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);
}
break;
}
case BTA_GATTS_DISCONNECT_EVT: {
case BTA_GATTS_DISCONNECT_EVT:
/*Adv disabled*/
// atomic_clear_bit(bt_dev.flags, BT_DEV_ADVERTISING);
if (bt_mesh_gatts_conn_cb != NULL && bt_mesh_gatts_conn_cb->disconnected != NULL) {
@@ -864,7 +864,6 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
}
}
break;
}
case BTA_GATTS_CLOSE_EVT:
break;
default:

2
examples/bluetooth/ble_mesh/ble_mesh_client_model/sdkconfig.defaults
View File

@@ -6,6 +6,8 @@ CONFIG_SCAN_DUPLICATE_TYPE=2
CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_GATTS_ENABLE=y
CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BT_MESH=y
CONFIG_BT_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BT_MESH_NODE=y

2
examples/bluetooth/ble_mesh/ble_mesh_console/ble_mesh_node/sdkconfig.defaults
View File

@@ -9,6 +9,8 @@ CONFIG_SCAN_DUPLICATE_TYPE=2
CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_GATTS_ENABLE=y
CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BT_MESH=y
CONFIG_BT_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BT_MESH_NODE=y

2
examples/bluetooth/ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/sdkconfig.defaults
View File

@@ -6,6 +6,8 @@ CONFIG_SCAN_DUPLICATE_TYPE=2
CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_GATTS_ENABLE=y
CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BT_MESH=y
CONFIG_BT_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BT_MESH_FAST_PROV=y

2
examples/bluetooth/ble_mesh/ble_mesh_node/sdkconfig.defaults
View File

@@ -6,6 +6,8 @@ CONFIG_SCAN_DUPLICATE_TYPE=2
CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_GATTS_ENABLE=y
CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BT_MESH=y
CONFIG_BT_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BT_MESH_NODE=y

2
examples/bluetooth/ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults
View File

@@ -10,6 +10,8 @@ CONFIG_SCAN_DUPLICATE_TYPE=2
CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
CONFIG_GATTS_ENABLE=y
CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
CONFIG_BT_MESH=y
CONFIG_BT_MESH_USE_DUPLICATE_SCAN=y
CONFIG_BT_MESH_FAST_PROV=y