mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-26 21:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/bluekitchen/btstack into develop

Browse Source
This commit is contained in:
Milanka Ringwald 2019-09-12 11:11:07 +02:00
commit fef69b25dc
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/mesh_node_demo.c
View File

@ -190,7 +190,7 @@ int btstack_main(void)
// crypto // crypto
btstack_crypto_init(); btstack_crypto_init();
#ifdef ENABLE_GATT_BEARER #ifdef ENABLE_MESH_GATT_BEARER
// l2cap // l2cap
l2cap_init(); l2cap_init();
@ -213,7 +213,7 @@ int btstack_main(void)
// mesh // mesh
mesh_init(); mesh_init();
#ifdef ENABLE_GATT_BEARER #ifdef ENABLE_MESH_GATT_BEARER
// setup connectable advertisments // setup connectable advertisments
bd_addr_t null_addr; bd_addr_t null_addr;
memset(null_addr, 0, 6); memset(null_addr, 0, 6);

6
src/hci_transport_h4.c
View File

@ -288,8 +288,10 @@ static void hci_transport_h4_block_read(void){
packet_handler(hci_packet[0], &hci_packet[1], read_pos-1); packet_handler(hci_packet[0], &hci_packet[1], read_pos-1);
hci_transport_h4_reset_statemachine(); hci_transport_h4_reset_statemachine();
break; break;
default:
break; case H4_OFF:
bytes_to_read = 0;
return;
} }
#ifdef ENABLE_BAUDRATE_CHANGE_FLOWCONTROL_BUG_WORKAROUND #ifdef ENABLE_BAUDRATE_CHANGE_FLOWCONTROL_BUG_WORKAROUND

2
src/mesh/pb_adv.c
View File

@ -451,6 +451,7 @@ static void pb_adv_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case HCI_EVENT_MESH_META: case HCI_EVENT_MESH_META:
switch(packet[2]){ switch(packet[2]){
case MESH_SUBEVENT_CAN_SEND_NOW: case MESH_SUBEVENT_CAN_SEND_NOW:
#ifdef ENABLE_MESH_PROVISIONER
if (link_state == LINK_STATE_W4_ACK){ if (link_state == LINK_STATE_W4_ACK){
// build packet // build packet
uint8_t buffer[22]; uint8_t buffer[22];
@ -467,6 +468,7 @@ static void pb_adv_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
btstack_run_loop_add_timer(&pb_adv_random_delay_timer); btstack_run_loop_add_timer(&pb_adv_random_delay_timer);
break; break;
} }
#endif
if (link_state == LINK_STATE_CLOSING){ if (link_state == LINK_STATE_CLOSING){
log_info("link close %08x", pb_adv_link_id); log_info("link close %08x", pb_adv_link_id);
printf("PB-ADV: Sending Link Close\n"); printf("PB-ADV: Sending Link Close\n");