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

ble client: implemented emit hci advertisement

Browse Source
This commit is contained in:
mila@ringwald.ch 2014-05-02 14:24:57 +00:00
parent 7bdc6798db
commit 57c9da5b07
3 changed files with 86 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
example/libusb/ble_client.c
View File

@ -388,8 +388,9 @@ static void dump_characteristic(le_characteristic_t * characteristic){
static void dump_ad_event(ad_event_t * e){
printf(" *** adv. event *** evt-type %u, addr-type %u, addr %s, rssi %u, length adv %u, data: ", e->event_type,
e->address_type, bd_addr_to_str(e->address), e->rssi, e->length);
hexdump2( e->data, e->length);
e->address_type, bd_addr_to_str(e->address), e->rssi, e->length);
hexdump2(e->data, e->length);
}
static void dump_service(le_service_t * service){
@ -972,7 +973,6 @@ static void handle_disconnect(le_event_t * event){
}
static void handle_ble_client_event(le_event_t * event){
handle_scan_and_connect(event);
handle_disconnect(event);
switch(tc_state){
@ -1059,12 +1059,51 @@ static void handle_ble_client_event(le_event_t * event){
}
/*
typedef struct ad_event {
uint8_t type;
uint8_t event_type;
uint8_t address_type;
bd_addr_t address;
uint8_t rssi;
uint8_t length;
uint8_t * data;
} ad_event_t;
*/
static void handle_hci_event(uint8_t packet_type, uint8_t *packet, uint16_t size){
le_command_status_t status;
if (packet_type != HCI_EVENT_PACKET) return;
switch (packet[0]) {
case GATT_ADVERTISEMENT:
if (tc_state != TC_W4_SCAN_RESULT) return;
printf("test client - SCAN ACTIVE\n");
ad_event_t ad_event;
int pos = 3;
ad_event.event_type = packet[pos++];
ad_event.address_type = packet[pos++];
memcpy(ad_event.address, &packet[pos], 6);
pos += 6;
ad_event.length = packet[pos++];
ad_event.data = &packet[pos];
pos += ad_event.length;
ad_event.rssi = packet[pos];
dump_ad_event(&ad_event);
test_device_addr_type = ad_event.address_type;
bd_addr_t found_device_addr;
memcpy(found_device_addr, ad_event.address, 6);
if (memcmp(&found_device_addr, &test_device_addr, 6) != 0) return;
// memcpy(test_device_addr, ad_event->address, 6);
tc_state = TC_W4_CONNECT;
le_central_stop_scan();
le_central_connect(&test_device, test_device_addr_type, test_device_addr);
break;
case BTSTACK_EVENT_STATE:
// BTstack activated, get started
if (packet[2] == HCI_STATE_WORKING) {
@ -1118,7 +1157,6 @@ void setup(void){
l2cap_init();
ble_client_init();
le_central_init();
le_central_register_handler(handle_ble_client_event);
ble_client_register_packet_handler(handle_ble_client_event);
le_central_register_packet_handler(handle_hci_event);
}

78
src/hci.c
View File

@ -80,15 +80,15 @@ static hci_stack_t hci_stack_static;
#endif
static hci_stack_t * hci_stack = NULL;
static void (*le_central_callback)(le_event_t * event);
// static void (*le_central_callback)(le_event_t * event);
static void dummy_notify(le_event_t* event){}
void le_central_register_handler(void (*le_callback)(le_event_t* event)){
if (le_callback == NULL){
le_callback = dummy_notify;
}
le_central_callback = le_callback;
}
//static void dummy_notify(le_event_t* event){}
//void le_central_register_handler(void (*le_callback)(le_event_t* event)){
// if (le_callback == NULL){
// le_callback = dummy_notify;
// }
// le_central_callback = le_callback;
//}
// test helper
static uint8_t disable_l2cap_timeouts = 0;
@ -523,6 +523,38 @@ void hci_le_advertisement_address(uint8_t * addr_type, bd_addr_t * addr){
}
}
static void le_handle_advertisement_report(uint8_t *packet, int size){
int num_reports = packet[3];
int i;
int total_data_length = 0;
int data_offset = 0;
for (i=0; i<num_reports;i++){
total_data_length += packet[4+num_reports*8+i];
}
for (i=0; i<num_reports;i++){
int pos = 0;
uint8_t data_length = packet[4+num_reports*8+i];
uint8_t event_size = 3 + 9 + data_length + 1;
uint8_t event[event_size];
event[pos++] = GATT_ADVERTISEMENT;
event[pos++] = event_size;
event[pos++] = 0;
event[pos++] = packet[4+i]; // event_type;
event[pos++] = packet[4+num_reports+i]; // address_type;
bt_flip_addr(&event[pos], &packet[4+num_reports*2+i*6]); // bt address
pos += 6;
event[pos++] = data_length;
memcpy(&packet[4+num_reports*9+data_offset], &event[pos], data_length);
data_offset += data_length;
pos += data_length;
event[pos] = packet[4+num_reports*9+total_data_length + i];
hci_stack->packet_handler(HCI_EVENT_PACKET, event, sizeof(event));
}
}
// avoid huge local variables
#ifndef EMBEDDED
static device_name_t device_name;
@ -531,7 +563,7 @@ static void event_handler(uint8_t *packet, int size){
uint16_t event_length = packet[1];
// assert packet is complete
// assert packet is complete
if (size != event_length + 2){
log_error("hci.c: event_handler called with event packet of wrong size %u, expected %u => dropping packet", size, event_length + 2);
return;
@ -853,34 +885,10 @@ static void event_handler(uint8_t *packet, int size){
#ifdef HAVE_BLE
case HCI_EVENT_LE_META:
switch (packet[2]){
case HCI_SUBEVENT_LE_ADVERTISING_REPORT:{
case HCI_SUBEVENT_LE_ADVERTISING_REPORT:
if (hci_stack->le_scanning_state != LE_SCANNING) break;
int num_reports = packet[3];
int i;
int total_data_length = 0;
int data_offset = 0;
for (i=0; i<num_reports;i++){
total_data_length += packet[4+num_reports*8+i];
}
ad_event_t advertisement_event;
advertisement_event.type = GATT_ADVERTISEMENT;
for (i=0; i<num_reports;i++){
advertisement_event.event_type = packet[4+i];
advertisement_event.address_type = packet[4+num_reports+i];
bt_flip_addr(advertisement_event.address, &packet[4+num_reports*2+i*6]);
advertisement_event.length = packet[4+num_reports*8+i];
advertisement_event.data = &packet[4+num_reports*9+data_offset];
data_offset += advertisement_event.length;
advertisement_event.rssi = packet[4+num_reports*9+total_data_length + i];
(*le_central_callback)((le_event_t*)&advertisement_event);
}
le_handle_advertisement_report(packet, size);
break;
}
case HCI_SUBEVENT_LE_CONNECTION_COMPLETE:
// Connection management
bt_flip_addr(addr, &packet[8]);

2
src/hci.h
View File

@ -406,7 +406,7 @@ typedef struct ad_event {
uint8_t * data;
} ad_event_t;
void le_central_register_handler(void (*le_callback)(le_event_t* event));
// void le_central_register_handler(void (*le_callback)(le_event_t* event));
le_command_status_t le_central_start_scan();
le_command_status_t le_central_stop_scan();