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

use gap_set_local_name instead of hci_write_local_name

Browse Source
This commit is contained in:
Milanka Ringwald 2015-04-10 12:32:30 +02:00
parent b0715761ab
commit 7143b8fef5
6 changed files with 38 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example/embedded/spp_counter.c
View File

@ -82,7 +82,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name // bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) { if (packet[2] == HCI_STATE_WORKING) {
hci_send_cmd(&hci_write_local_name, "BTstack SPP Counter"); printf("BTstack is up and running\n");
} }
break; break;
@ -204,6 +204,7 @@ int btstack_main(int argc, const char * argv[]){
run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS); run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS);
run_loop_add_timer(&heartbeat); run_loop_add_timer(&heartbeat);
gap_set_local_name("BTstack SPP Counter");
// turn on! // turn on!
hci_power_control(HCI_POWER_ON); hci_power_control(HCI_POWER_ON);

9
example/embedded/spp_flowcontrol.c
View File

@ -78,9 +78,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
switch (packet[0]) { switch (packet[0]) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) { if (packet[2] == HCI_STATE_WORKING) {
hci_send_cmd(&hci_write_local_name, "BTstack SPP Flow Control"); printf("BTstack is up and running\n");
} }
break; break;
@ -90,10 +89,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr)); printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
break; break;
} }
if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){
hci_discoverable_control(1);
break;
}
break; break;
case HCI_EVENT_LINK_KEY_REQUEST: case HCI_EVENT_LINK_KEY_REQUEST:
@ -184,6 +179,8 @@ int btstack_main(int argc, const char * argv[]){
run_loop_add_timer(&heartbeat); run_loop_add_timer(&heartbeat);
puts("SPP FlowControl Demo: simulates processing on received data...\n\r"); puts("SPP FlowControl Demo: simulates processing on received data...\n\r");
gap_set_local_name("BTstack SPP Flow Control");
hci_discoverable_control(1);
// turn on! // turn on!
hci_power_control(HCI_POWER_ON); hci_power_control(HCI_POWER_ON);

24
platforms/ez430-rf2560/example/ant-test.c
View File

@ -55,9 +55,10 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
switch (packet[0]) { switch (packet[0]) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) { if (packet[2] == HCI_STATE_WORKING) {
hci_send_cmd(&hci_write_local_name, "BlueMSP-Demo"); printf("BTstack is up and running\n");
// start ANT init
ant_send_cmd(&ant_reset);
} }
break; break;
@ -67,12 +68,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr)); printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
break; break;
} }
if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){ break;
// start ANT init
ant_send_cmd(&ant_reset);
break;
}
break;
case HCI_EVENT_LINK_KEY_REQUEST: case HCI_EVENT_LINK_KEY_REQUEST:
// deny link key request // deny link key request
@ -205,14 +201,14 @@ int btstack_main(int argc, const char * argv[]){
run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS); run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS);
run_loop_add_timer(&heartbeat); run_loop_add_timer(&heartbeat);
printf("Run...\n\r"); // set local name
gap_set_local_name("BlueMSP-Demo");
// turn on! // make discoverable
hci_power_control(HCI_POWER_ON);
// default to discoverable
hci_discoverable_control(1); hci_discoverable_control(1);
printf("Run...\n\r");
// turn on!
hci_power_control(HCI_POWER_ON);
return 0; return 0;
} }

14
platforms/ez430-rf2560/example/spp_accel.c
View File

@ -95,9 +95,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
switch (packet[0]) { switch (packet[0]) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) { if (packet[2] == HCI_STATE_WORKING) {
hci_send_cmd(&hci_write_local_name, "BTstack SPP Sensor"); printf("BTstack is up and running\n");
} }
break; break;
@ -107,10 +106,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr)); printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
break; break;
} }
if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){
hci_discoverable_control(1);
break;
}
break; break;
case HCI_EVENT_LINK_KEY_REQUEST: case HCI_EVENT_LINK_KEY_REQUEST:
@ -193,11 +188,12 @@ int btstack_main(int argc, const char * argv[]){
// ready - enable irq used in h4 task // ready - enable irq used in h4 task
__enable_interrupt(); __enable_interrupt();
// turn on! // set local name
hci_power_control(HCI_POWER_ON); gap_set_local_name("BTstack SPP Sensor");
// make discoverable // make discoverable
hci_discoverable_control(1); hci_discoverable_control(1);
// turn on!
hci_power_control(HCI_POWER_ON);
return 0; return 0;
} }

28
platforms/msp-exp430f5438-cc2564b/example/ant-test.c
View File

@ -55,10 +55,11 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
switch (packet[0]) { switch (packet[0]) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) { if (packet[2] == HCI_STATE_WORKING) {
hci_send_cmd(&hci_write_local_name, "BlueMSP-Demo"); printf("BTstack is up and running\n");
} // start ANT init
ant_send_cmd(&ant_reset);
}
break; break;
case HCI_EVENT_COMMAND_COMPLETE: case HCI_EVENT_COMMAND_COMPLETE:
@ -67,12 +68,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr)); printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
break; break;
} }
if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){ break;
// start ANT init
ant_send_cmd(&ant_reset);
break;
}
break;
case HCI_EVENT_LINK_KEY_REQUEST: case HCI_EVENT_LINK_KEY_REQUEST:
// deny link key request // deny link key request
@ -205,14 +201,14 @@ int btstack_main(int argc, const char * argv[]){
run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS); run_loop_set_timer(&heartbeat, HEARTBEAT_PERIOD_MS);
run_loop_add_timer(&heartbeat); run_loop_add_timer(&heartbeat);
printf("Run...\n\r"); // set local name
gap_set_local_name("BlueMSP-Demo");
// turn on! // make discoverable
hci_power_control(HCI_POWER_ON);
// default to discoverable
hci_discoverable_control(1); hci_discoverable_control(1);
printf("Run...\n\r");
// turn on!
hci_power_control(HCI_POWER_ON);
return 0; return 0;
} }

15
platforms/msp-exp430f5438-cc2564b/example/spp_accel.c
View File

@ -95,9 +95,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
switch (packet[0]) { switch (packet[0]) {
case BTSTACK_EVENT_STATE: case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) { if (packet[2] == HCI_STATE_WORKING) {
hci_send_cmd(&hci_write_local_name, "BTstack SPP Sensor"); printf("BTstack is up and running.\n");
} }
break; break;
@ -107,10 +106,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr)); printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
break; break;
} }
if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){
hci_discoverable_control(1);
break;
}
break; break;
case HCI_EVENT_LINK_KEY_REQUEST: case HCI_EVENT_LINK_KEY_REQUEST:
@ -193,11 +188,13 @@ int btstack_main(int argc, const char * argv[]){
// ready - enable irq used in h4 task // ready - enable irq used in h4 task
__enable_interrupt(); __enable_interrupt();
// turn on! // set local name
hci_power_control(HCI_POWER_ON); gap_set_local_name("BTstack SPP Sensor");
// make discoverable // make discoverable
hci_discoverable_control(1); hci_discoverable_control(1);
// turn on!
hci_power_control(HCI_POWER_ON);
return 0; return 0;
} }