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

ble client: start implement in-depth search for included characteristics

Browse Source
This commit is contained in:
mila@ringwald.ch 2013-11-29 21:42:15 +00:00
parent e79a28b681
commit 04af4d87c5
2 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
example/libusb/ble_client.c
View File

@ -114,6 +114,19 @@ void le_central_register_handler(void (*le_callback)(le_central_event_t* event))
} }
} }
static inline uint16_t end_group_handle_for_peripheral(le_peripheral_t * peripheral){
return peripheral->nodes[peripheral->depth].end_group_handle;
}
static inline uint16_t start_group_handle_for_peripheral(le_peripheral_t * peripheral){
return peripheral->nodes[peripheral->depth].start_group_handle;
}
static inline void set_node_for_peripheral(le_peripheral_t *peripheral, uint8_t depth, uint16_t start_handle, uint16_t end_handle){
peripheral->depth = depth;
peripheral->nodes[depth].start_group_handle = start_handle;
peripheral->nodes[depth].end_group_handle = end_handle;
}
static void send_gatt_connection_complete_event(le_peripheral_t * peripheral, uint8_t status){ static void send_gatt_connection_complete_event(le_peripheral_t * peripheral, uint8_t status){
@ -124,12 +137,29 @@ static void send_gatt_connection_complete_event(le_peripheral_t * peripheral, ui
(*le_central_callback)((le_central_event_t*)&event); (*le_central_callback)((le_central_event_t*)&event);
} }
static inline void send_gatt_complete_event(le_peripheral_t * peripheral, uint8_t type){
le_query_complete_event_t event;
event.type = type;
event.peripheral = peripheral;
(*le_central_callback)((le_central_event_t*)&event);
}
static inline void handle_gatt_service_complete_event(le_peripheral_t * peripheral){
peripheral->state = P_CONNECTED;
send_gatt_complete_event(peripheral, GATT_SERVICE_QUERY_COMPLETE);
}
static inline void handle_gatt_characteristic_complete_event(le_peripheral_t * peripheral){
peripheral->state = P_CONNECTED;
send_gatt_complete_event(peripheral, GATT_CHARACTERISTIC_QUERY_COMPLETE);
}
static le_command_status_t send_gatt_characteristic_request(le_peripheral_t *peripheral){ static le_command_status_t send_gatt_characteristic_request(le_peripheral_t *peripheral){
if (!l2cap_can_send_conectionless_packet_now()) return BLE_PERIPHERAL_BUSY; if (!l2cap_can_send_conectionless_packet_now()) return BLE_PERIPHERAL_BUSY;
uint8_t request[7]; uint8_t request[7];
request[0] = ATT_READ_BY_TYPE_REQUEST; request[0] = ATT_READ_BY_TYPE_REQUEST;
uint16_t att_client_end_handle = peripheral->end_group_handle; uint16_t att_client_end_handle = end_group_handle_for_peripheral(peripheral);
uint16_t att_client_attribute_group_type = GATT_CHARACTERISTICS_UUID; uint16_t att_client_attribute_group_type = GATT_CHARACTERISTICS_UUID;
bt_store_16(request, 1, peripheral->last_group_handle+1); bt_store_16(request, 1, peripheral->last_group_handle+1);
@ -400,8 +430,8 @@ if (peripheral->state != P_CONNECTED) return BLE_PERIPHERAL_IN_WRONG_STATE;
// send will increment last_group_handle, so substract in advance // send will increment last_group_handle, so substract in advance
peripheral->last_group_handle = service->start_group_handle - 1; peripheral->last_group_handle = service->start_group_handle - 1;
peripheral->end_group_handle = service->end_group_handle; set_node_for_peripheral(peripheral, 0, service->start_group_handle, service->end_group_handle);
peripheral->state = P_W2_SEND_CHARACTERISTIC_QUERY; peripheral->state = P_W2_SEND_CHARACTERISTIC_QUERY;
gatt_client_run(); gatt_client_run();
return BLE_PERIPHERAL_OK; return BLE_PERIPHERAL_OK;
@ -637,22 +667,10 @@ static void att_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pa
} }
printf("att_packet_handler :: ATT_READ_BY_GROUP_TYPE_RESPONSE ---> DONE\n"); printf("att_packet_handler :: ATT_READ_BY_GROUP_TYPE_RESPONSE ---> DONE\n");
// DONE // DONE
peripheral->state = P_CONNECTED; handle_gatt_service_complete_event(peripheral);
le_query_complete_event_t event;
event.type = GATT_SERVICE_QUERY_COMPLETE;
event.peripheral = peripheral;
(*le_central_callback)((le_central_event_t*)&event);
break; break;
} }
case ATT_READ_BY_TYPE_RESPONSE: case ATT_READ_BY_TYPE_RESPONSE:
// if (peripheral->state != P_W4_CHARACTERISTIC_QUERY_RESULT) return;
/*
uint8_t permision;
uint16_t handle;
uint16_t uuid16;
uint8_t uuid128[16];
*/
{ {
uint8_t attr_length = packet[1]; uint8_t attr_length = packet[1];
uint8_t uuid_length = attr_length - 5; uint8_t uuid_length = attr_length - 5;
@ -680,42 +698,30 @@ static void att_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pa
(*le_central_callback)((le_central_event_t*)&event); (*le_central_callback)((le_central_event_t*)&event);
} }
if (peripheral->last_group_handle < peripheral->end_group_handle){ if (peripheral->last_group_handle < end_group_handle_for_peripheral(peripheral)){
peripheral->state = P_W2_SEND_CHARACTERISTIC_QUERY; peripheral->state = P_W2_SEND_CHARACTERISTIC_QUERY;
break; break;
} }
printf("att_packet_handler :: ATT_READ_BY_TYPE_RESPONSE ---> DONE\n"); printf("att_packet_handler :: ATT_READ_BY_TYPE_RESPONSE ---> DONE\n");
// DONE // DONE
peripheral->state = P_CONNECTED; handle_gatt_characteristic_complete_event(peripheral);
le_query_complete_event_t event;
event.type = GATT_CHARACTERISTIC_QUERY_COMPLETE;
event.peripheral = peripheral;
(*le_central_callback)((le_central_event_t*)&event);
break; break;
} }
case ATT_ERROR_RESPONSE: case ATT_ERROR_RESPONSE:
switch (packet[4]){ switch (packet[4]){
case ATT_ERROR_ATTRIBUTE_NOT_FOUND: { case ATT_ERROR_ATTRIBUTE_NOT_FOUND: {
le_query_complete_event_t event;
event.peripheral = peripheral;
event.type = 0;
switch(peripheral->state){ switch(peripheral->state){
case P_W4_SERVICE_QUERY_RESULT: case P_W4_SERVICE_QUERY_RESULT:
event.type = GATT_SERVICE_QUERY_COMPLETE; handle_gatt_service_complete_event(peripheral);
break; break;
case P_W4_CHARACTERISTIC_QUERY_RESULT: case P_W4_CHARACTERISTIC_QUERY_RESULT:
event.type = GATT_CHARACTERISTIC_QUERY_COMPLETE; handle_gatt_characteristic_complete_event(peripheral);
break; break;
default: default:
return; return;
} }
peripheral->state = P_CONNECTED;
if (event.type){
(*le_central_callback)((le_central_event_t*)&event);
}
break; break;
} }
default: default:

20
example/libusb/ble_client.h
View File

@ -50,6 +50,7 @@
extern "C" { extern "C" {
#endif #endif
#define LE_CENTRAL_MAX_INCLUDE_DEPTH 3
typedef struct le_central_event { typedef struct le_central_event {
uint8_t type; uint8_t type;
@ -94,6 +95,10 @@ typedef enum {
BLE_PERIPHERAL_BUSY BLE_PERIPHERAL_BUSY
} le_command_status_t; } le_command_status_t;
typedef struct le_service_node{
uint16_t start_group_handle;
uint16_t end_group_handle;
} le_service_node_t;
typedef struct le_peripheral{ typedef struct le_peripheral{
linked_item_t item; linked_item_t item;
@ -107,7 +112,9 @@ typedef struct le_peripheral{
// for service discovery // for service discovery
uint16_t last_group_handle; uint16_t last_group_handle;
uint16_t end_group_handle; le_service_node_t nodes[LE_CENTRAL_MAX_INCLUDE_DEPTH];
uint8_t depth;
} le_peripheral_t; } le_peripheral_t;
typedef struct le_peripheral_event{ typedef struct le_peripheral_event{
@ -116,6 +123,12 @@ typedef struct le_peripheral_event{
uint8_t status; uint8_t status;
} le_peripheral_event_t; } le_peripheral_event_t;
// TODO replace with peripheral event
typedef struct le_query_complete_event{
uint8_t type;
le_peripheral_t * peripheral;
} le_query_complete_event_t;
typedef struct le_service{ typedef struct le_service{
uint16_t start_group_handle; uint16_t start_group_handle;
uint16_t end_group_handle; uint16_t end_group_handle;
@ -128,11 +141,6 @@ typedef struct le_service_event{
le_service_t service; le_service_t service;
} le_service_event_t; } le_service_event_t;
typedef struct le_query_complete_event{
uint8_t type;
le_peripheral_t * peripheral;
} le_query_complete_event_t;
typedef struct le_characteristic{ typedef struct le_characteristic{
uint8_t properties; uint8_t properties;
uint16_t value_handle; uint16_t value_handle;