mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-01 04:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: enable gatt proxy advertisements in mesh.c

Browse Source
This commit is contained in:
Matthias Ringwald 2019-07-12 22:48:22 +02:00
parent 039d111d2b
commit c796b3e5b1
2 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/mesh/mesh.c
View File

@ -43,6 +43,7 @@
#include "mesh.h"
#include "btstack_util.h"
#include "btstack_config.h"
#include "btstack_event.h"
#include "mesh/adv_bearer.h"
#include "mesh/beacon.h"
@ -64,6 +65,7 @@
#include "provisioning_device.h"
static btstack_packet_handler_t provisioning_device_packet_handler;
static btstack_packet_callback_registration_t hci_event_callback_registration;
static int provisioned;
static void mesh_provisioning_message_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
@ -100,8 +102,49 @@ static void mesh_provisioning_message_handler (uint8_t packet_type, uint16_t cha
(*provisioning_device_packet_handler)(packet_type, channel, packet, size);
}
static void hci_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
UNUSED(channel);
UNUSED(size);
switch (packet_type) {
case HCI_EVENT_PACKET:
switch (hci_event_packet_get_type(packet)) {
case BTSTACK_EVENT_STATE:
if (btstack_event_state_get_state(packet) != HCI_STATE_WORKING) break;
// startup from provisioning data stored in TLV
provisioned = mesh_node_startup_from_tlv();
break;
case HCI_EVENT_DISCONNECTION_COMPLETE:
// enable PB_GATT
if (provisioned == 0){
mesh_proxy_start_advertising_unprovisioned_device();
} else {
#ifdef ENABLE_MESH_PROXY_SERVER
mesh_proxy_start_advertising_with_network_id();
#endif
}
break;
case HCI_EVENT_LE_META:
if (hci_event_le_meta_get_subevent_code(packet) != HCI_SUBEVENT_LE_CONNECTION_COMPLETE) break;
// disable PB_GATT
mesh_proxy_stop_advertising_unprovisioned_device();
break;
default:
break;
}
break;
}
}
void mesh_init(void){
// register for HCI events
hci_event_callback_registration.callback = &hci_packet_handler;
hci_add_event_handler(&hci_event_callback_registration);
// ADV Bearer also used for GATT Proxy Advertisements and PB-GATT
adv_bearer_init();

36
test/mesh/mesh_pts.c
View File

@ -118,36 +118,8 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
printf("%02x", addr[i]);
}
printf("\n");
// startup from provisioning data stored in TLV
provisioned = mesh_node_startup_from_tlv();
if (provisioned){
// dump PTS MeshOptions.ini
mesh_pts_dump_mesh_options();
}
show_usage();
break;
case HCI_EVENT_DISCONNECTION_COMPLETE:
// enable PB_GATT
if (provisioned == 0){
printf("Advertise Mesh Provisiong Service with Device UUID\n");
mesh_proxy_start_advertising_unprovisioned_device();
} else {
#ifdef ENABLE_MESH_PROXY_SERVER
printf("Advertise Mesh Proxy Service with Network ID\n");
mesh_proxy_start_advertising_with_network_id();
#endif
}
break;
case HCI_EVENT_LE_META:
if (hci_event_le_meta_get_subevent_code(packet) != HCI_SUBEVENT_LE_CONNECTION_COMPLETE) break;
// disable PB_GATT
printf("Connected, stop advertising GATT service\n");
mesh_proxy_stop_advertising_unprovisioned_device();
break;
default:
break;
@ -587,10 +559,6 @@ static void mesh_node_setup_default_models(void){
int btstack_main(void);
int btstack_main(void)
{
// register for HCI events
hci_event_callback_registration.callback = &packet_handler;
hci_add_event_handler(&hci_event_callback_registration);
// console
btstack_stdin_setup(stdin_process);
@ -644,6 +612,10 @@ int btstack_main(void)
// Enable PROXY
mesh_foundation_gatt_proxy_set(1);
// register for HCI events
hci_event_callback_registration.callback = &packet_handler;
hci_add_event_handler(&hci_event_callback_registration);
#if defined(ENABLE_MESH_ADV_BEARER)
// setup scanning when supporting ADV Bearer
gap_set_scan_parameters(0, 0x300, 0x300);