mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-23 18:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

add toggle for long values, hexdump write value for validation by tester

Browse Source
This commit is contained in:
mila@ringwald.ch 2014-02-01 11:10:12 +00:00
parent cdbacbab4d
commit 8436d2ee42
4 changed files with 110 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/libusb/Makefile
View File

@ -1,6 +1,6 @@
BTSTACK_ROOT = ../..
CFLAGS = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include -I${BTSTACK_ROOT}/chipset-cc256x
CFLAGS = -g -Wall -I. -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/include -I${BTSTACK_ROOT}/chipset-cc256x
CFLAGS += -I/usr/local/include -I../../ble -I../.. -I../..
LDFLAGS = -L/usr/local/lib -lusb-1.0

162
example/libusb/ble_client.c
View File

@ -84,6 +84,7 @@ static state_t state = W4_ON;
static linked_list_t le_connections = NULL;
static uint16_t att_client_start_handle = 0x0001;
void (*le_central_callback)(le_central_event_t * event);
void le_central_init(){
state = W4_ON;
@ -91,16 +92,18 @@ void le_central_init(){
att_client_start_handle = 0x0000;
}
void (*le_central_callback)(le_central_event_t * event);
static void gatt_client_run();
static void dummy_notify(le_central_event_t* event){}
void dump_nodes(le_peripheral_t * peripheral){
printf("current level %u, start %02x, end %02x, last %02x\n", peripheral->depth,
peripheral->nodes[peripheral->depth].start_group_handle,
peripheral->nodes[peripheral->depth].end_group_handle,
peripheral->nodes[peripheral->depth].last_group_handle);
void le_central_register_handler(void (*le_callback)(le_central_event_t* event)){
le_central_callback = dummy_notify;
if (le_callback != NULL){
le_central_callback = le_callback;
}
}
static void gatt_client_run();
// START Helper Functions - to be sorted
static int l2cap_can_send_conectionless_packet_now(){
return hci_can_send_packet_now(HCI_ACL_DATA_PACKET);
@ -111,18 +114,30 @@ static uint16_t l2cap_max_mtu_for_handle(uint16_t handle){
}
// END Helper Functions
static void dummy_notify(le_central_event_t* event){}
void le_central_register_handler(void (*le_callback)(le_central_event_t* event)){
le_central_callback = dummy_notify;
if (le_callback != NULL){
le_central_callback = le_callback;
}
static void dump_nodes(le_peripheral_t * peripheral){
printf("\n current level %u, start %02x, end %02x, last %02x\n", peripheral->depth,
peripheral->nodes[peripheral->depth].start_group_handle,
peripheral->nodes[peripheral->depth].end_group_handle,
peripheral->nodes[peripheral->depth].last_group_handle);
}
static inline le_command_status_t send_gatt_request(uint16_t request_type, uint16_t attribute_group_type, uint16_t next_handle, uint16_t end_handle, uint16_t peripheral_handle){
static inline le_command_status_t send_gatt_request(uint16_t request_type, uint16_t attribute_group_type, le_peripheral_t *peripheral){
if (!l2cap_can_send_conectionless_packet_now()) return BLE_PERIPHERAL_BUSY;
uint16_t next_handle = peripheral->nodes[peripheral->depth].last_group_handle+1;
uint16_t end_handle = peripheral->nodes[peripheral->depth].end_group_handle;
uint16_t peripheral_handle = peripheral->handle;
if (attribute_group_type == GATT_PRIMARY_SERVICE_UUID){
end_handle = 0xffff;
}
if (next_handle > end_handle){
printf (".......... smth went wrong: next_handle > end_handle");
}
uint8_t request[7];
request[0] = request_type;
bt_store_16(request, 1, next_handle);
@ -134,47 +149,25 @@ static inline le_command_status_t send_gatt_request(uint16_t request_type, uint1
}
static le_command_status_t send_gatt_include_service_request(le_peripheral_t *peripheral){
uint16_t next_handle = peripheral->nodes[peripheral->depth].last_group_handle+1;
uint16_t end_handle = peripheral->nodes[peripheral->depth].end_group_handle;
uint16_t peripheral_handle = peripheral->handle;
return send_gatt_request(ATT_READ_BY_TYPE_REQUEST, GATT_INCLUDE_SERVICE_UUID, next_handle, end_handle, peripheral_handle);
return send_gatt_request(ATT_READ_BY_TYPE_REQUEST, GATT_INCLUDE_SERVICE_UUID, peripheral);
}
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 le_command_status_t send_gatt_characteristic_request(le_peripheral_t *peripheral){
uint16_t next_handle = peripheral->nodes[peripheral->depth].last_group_handle+1;
uint16_t end_handle = peripheral->nodes[peripheral->depth].end_group_handle;
uint16_t peripheral_handle = peripheral->handle;
return send_gatt_request(ATT_READ_BY_TYPE_REQUEST, GATT_CHARACTERISTICS_UUID, next_handle, end_handle, peripheral_handle);
return send_gatt_request(ATT_READ_BY_TYPE_REQUEST, GATT_CHARACTERISTICS_UUID, peripheral);
}
static le_command_status_t send_gatt_services_request(le_peripheral_t *peripheral){
uint16_t next_handle = peripheral->nodes[peripheral->depth].last_group_handle+1;
uint16_t end_handle = 0xffff;
uint16_t peripheral_handle = peripheral->handle;
return send_gatt_request(ATT_READ_BY_GROUP_TYPE_REQUEST, GATT_PRIMARY_SERVICE_UUID, next_handle, end_handle, peripheral_handle);
return send_gatt_request(ATT_READ_BY_GROUP_TYPE_REQUEST, GATT_PRIMARY_SERVICE_UUID, peripheral);
}
static void send_gatt_connection_complete_event(le_peripheral_t * peripheral, uint8_t status){
static inline void send_gatt_complete_event(le_peripheral_t * peripheral, uint8_t type, uint8_t status){
le_peripheral_event_t event;
event.type = GATT_CONNECTION_COMPLETE;
event.type = type;
event.device = peripheral;
event.status = status;
(*le_central_callback)((le_central_event_t*)&event);
}
static le_peripheral_t * get_peripheral_for_handle(uint16_t handle){
linked_item_t *it;
for (it = (linked_item_t *) le_connections; it ; it = it->next){
@ -197,6 +190,17 @@ static le_peripheral_t * get_peripheral_with_state(peripheral_state_t p_state){
return NULL;
}
static le_peripheral_t * get_peripheral_with_address(uint8_t addr_type, bd_addr_t addr){
linked_item_t *it;
for (it = (linked_item_t *) le_connections; it ; it = it->next){
le_peripheral_t * peripheral = (le_peripheral_t *) it;
if (BD_ADDR_CMP(addr, peripheral->address) == 0 && peripheral->address_type == addr_type){
return peripheral;
}
}
return 0;
}
static inline le_peripheral_t * get_peripheral_w4_disconnected(){
return get_peripheral_with_state(P_W4_DISCONNECTED);
}
@ -217,16 +221,6 @@ static inline le_peripheral_t * get_peripheral_w2_exchange_MTU(){
return get_peripheral_with_state(P_W2_EXCHANGE_MTU);
}
static le_peripheral_t * get_peripheral_with_address(uint8_t addr_type, bd_addr_t addr){
linked_item_t *it;
for (it = (linked_item_t *) le_connections; it ; it = it->next){
le_peripheral_t * peripheral = (le_peripheral_t *) it;
if (BD_ADDR_CMP(addr, peripheral->address) == 0 && peripheral->address_type == addr_type){
return peripheral;
}
}
return 0;
}
static void handle_advertising_packet(uint8_t *packet){
int num_reports = packet[3];
@ -394,7 +388,7 @@ le_command_status_t le_central_disconnect(le_peripheral_t *context){
switch(context->state){
case P_W2_CONNECT:
linked_list_remove(&le_connections, (linked_item_t *) context);
send_gatt_connection_complete_event(context, 0);
send_gatt_complete_event(peripheral, GATT_CONNECTION_COMPLETE, 0);
break;
case P_W4_CONNECTED:
case P_W2_CANCEL_CONNECT:
@ -513,7 +507,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
peripheral->state = P_W2_CONNECT;
linked_list_remove(&le_connections, (linked_item_t *) peripheral);
send_gatt_connection_complete_event(peripheral, packet[5]);
send_gatt_complete_event(peripheral, GATT_CONNECTION_COMPLETE, packet[5]);
// printf("Peripheral disconnected, and removed from list\n");
break;
}
@ -540,7 +534,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
peripheral->state = P_W2_EXCHANGE_MTU;
peripheral->handle = READ_BT_16(packet, 4);
}
send_gatt_connection_complete_event(peripheral, packet[3]);
send_gatt_complete_event(peripheral, GATT_CONNECTION_COMPLETE, packet[3]);
break;
}
@ -549,7 +543,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
if (!peripheral) break;
linked_list_remove(&le_connections, (linked_item_t *) peripheral);
send_gatt_connection_complete_event(peripheral, packet[3]);
send_gatt_complete_event(peripheral, GATT_CONNECTION_COMPLETE, packet[3]);
break;
}
default:
@ -596,7 +590,7 @@ static void att_client_report_error(uint8_t * packet, uint16_t size){
}
void printUUID128(const uint8_t * uuid){
static void printUUID128(const uint8_t * uuid){
int i;
for (i=15; i >= 0 ; i--){
printf("%02X", uuid[i]);
@ -642,7 +636,10 @@ int has_more_handles_on_current_level(le_peripheral_t * peripheral){
return peripheral->nodes[peripheral->depth].last_group_handle < peripheral->nodes[peripheral->depth].end_group_handle;
}
int has_more_handles_on_current_level2(le_peripheral_t * peripheral){
return peripheral->nodes[peripheral->depth].last_group_handle + 1 < peripheral->nodes[peripheral->depth].end_group_handle;
}
/*
int find_next_handle(le_peripheral_t * peripheral){
printf("find next node: ");
@ -669,7 +666,7 @@ int find_next_handle(le_peripheral_t * peripheral){
}
return find_next_handle(peripheral);
}
*/
static void att_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *packet, uint16_t size){
if (packet_type != ATT_DATA_PACKET) return;
@ -683,8 +680,8 @@ static void att_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pa
uint16_t local_rx_mtu = l2cap_max_mtu_for_handle(handle);
peripheral->mtu = remote_rx_mtu < local_rx_mtu ? remote_rx_mtu : local_rx_mtu;
send_gatt_connection_complete_event(peripheral, 0);
send_gatt_complete_event(peripheral, GATT_CONNECTION_COMPLETE, 0);
peripheral->state = P_CONNECTED;
break;
}
@ -708,7 +705,7 @@ 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");
// DONE
peripheral->state = P_CONNECTED;
send_gatt_complete_event(peripheral, GATT_SERVICE_QUERY_COMPLETE);
send_gatt_complete_event(peripheral, GATT_SERVICE_QUERY_COMPLETE, 0);
break;
}
@ -744,34 +741,40 @@ static void att_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pa
(*le_central_callback)((le_central_event_t*)&event);
}
// query CHR on the same level
if (has_more_handles_on_current_level(peripheral)){
printf("more CHR on level\n");
dump_nodes(peripheral);
printf(" 1 .. query CHR on the same level\n");
if (has_more_handles_on_current_level2(peripheral)){
printf(" 2a .. more CHR on level\n");
peripheral->state = P_W2_SEND_CHARACTERISTIC_QUERY;
peripheral->nodes[peripheral->depth].last_group_handle++;
break;
}
printf(" 2b .. no more CHR on level\n");
printf(" 3b .. start query includes on the same level do not ask for include on the max level...\n");
// start query includes on the same level
// do not ask for include on the max level...
if (peripheral->depth + 1 < LE_CENTRAL_MAX_INCLUDE_DEPTH){
printf(" 4b .. more INCL on current level, reset LGH to SGH-1\n");
peripheral->nodes[peripheral->depth].last_group_handle = peripheral->nodes[peripheral->depth].start_group_handle - 1;
peripheral->state = P_W2_SEND_INCLUDE_SERVICE_QUERY;
break;
}
// no includes on the current level -> go up
printf(" 4c .. no includes on current level -> go up .. \n");
while (peripheral->depth > 0 && !has_more_handles_on_current_level(peripheral)){
peripheral->depth--;
}
if (has_more_handles_on_current_level(peripheral)){
dump_nodes(peripheral);
printf(" 5c .. query CHR on the upper level\n");
if (has_more_handles_on_current_level2(peripheral)){
printf(" 6c .. more CHR on level\n");
peripheral->nodes[peripheral->depth].last_group_handle++;
peripheral->state = P_W2_SEND_INCLUDE_SERVICE_QUERY;
break;
}
printf(" 7 .. send_gatt_complete_event\n");
peripheral->state = P_CONNECTED;
send_gatt_complete_event(peripheral, GATT_CHARACTERISTIC_QUERY_COMPLETE);
send_gatt_complete_event(peripheral, GATT_CHARACTERISTIC_QUERY_COMPLETE, 0);
break;
}
@ -780,7 +783,8 @@ static void att_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pa
peripheral->nodes[peripheral->depth].last_group_handle = READ_BT_16(packet,2);
// update handle
printf("go down one level, ask for CHR\n");
dump_nodes(peripheral);
printf(" .. go down one level, ask for CHR\n");
peripheral->depth++;
peripheral->nodes[peripheral->depth].start_group_handle = READ_BT_16(packet,4);
peripheral->nodes[peripheral->depth].end_group_handle = READ_BT_16(packet,6);
@ -801,7 +805,7 @@ static void att_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pa
switch(peripheral->state){
case P_W4_SERVICE_QUERY_RESULT:
peripheral->state = P_CONNECTED;
send_gatt_complete_event(peripheral, GATT_SERVICE_QUERY_COMPLETE);
send_gatt_complete_event(peripheral, GATT_SERVICE_QUERY_COMPLETE, 0);
break;
case P_W4_CHARACTERISTIC_QUERY_RESULT:
printf("CHARACTERISTIC_QUERY ERROR search includes\n");
@ -819,13 +823,13 @@ static void att_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pa
peripheral->depth--;
}
if (has_more_handles_on_current_level(peripheral)){
if (has_more_handles_on_current_level2(peripheral)){
peripheral->nodes[peripheral->depth].last_group_handle++;
peripheral->state = P_W2_SEND_INCLUDE_SERVICE_QUERY;
break;
}
peripheral->state = P_CONNECTED;
send_gatt_complete_event(peripheral, GATT_CHARACTERISTIC_QUERY_COMPLETE);
send_gatt_complete_event(peripheral, GATT_CHARACTERISTIC_QUERY_COMPLETE, 0);
break;
@ -838,13 +842,13 @@ static void att_packet_handler(uint8_t packet_type, uint16_t handle, uint8_t *pa
peripheral->depth--;
}
if (has_more_handles_on_current_level(peripheral)){
if (has_more_handles_on_current_level2(peripheral)){
peripheral->nodes[peripheral->depth].last_group_handle++;
peripheral->state = P_W2_SEND_INCLUDE_SERVICE_QUERY;
break;
}
peripheral->state = P_CONNECTED;
send_gatt_complete_event(peripheral, GATT_CHARACTERISTIC_QUERY_COMPLETE);
send_gatt_complete_event(peripheral, GATT_CHARACTERISTIC_QUERY_COMPLETE, 0);
break;
@ -955,7 +959,8 @@ int service_count = 0;
int service_index = 0;
// static bd_addr_t test_device_addr = {0x1c, 0xba, 0x8c, 0x20, 0xc7, 0xf6};
static bd_addr_t test_device_addr = {0x00, 0x1b, 0xdc, 0x05, 0xb5, 0xdc};
// static bd_addr_t test_device_addr = {0x00, 0x1b, 0xdc, 0x05, 0xb5, 0xdc}; // SensorTag 1
static bd_addr_t test_device_addr = {0x34, 0xb1, 0xf7, 0xd1, 0x77, 0x9b}; // SensorTag 2
typedef enum {
TC_IDLE,
@ -1031,7 +1036,6 @@ void test_client(){
static void handle_le_central_event(le_central_event_t * event){
ad_event_t * advertisement_event;
le_peripheral_event_t * peripheral_event;
le_query_complete_event_t * query_event;
le_service_t service;
le_characteristic_t characteristic;
@ -1070,7 +1074,7 @@ static void handle_le_central_event(le_central_event_t * event){
break;
case GATT_SERVICE_QUERY_COMPLETE:
query_event = (le_query_complete_event_t*) event;
peripheral_event = (le_peripheral_event_t*) event;
tc_state = TC_W2_CHARACTERISTIC_REQUEST;
int i;
for (i = 0; i < service_count; i++){
@ -1091,7 +1095,7 @@ static void handle_le_central_event(le_central_event_t * event){
break;
case GATT_CHARACTERISTIC_QUERY_COMPLETE:
query_event = (le_query_complete_event_t*) event;
peripheral_event = (le_peripheral_event_t*) event;
if (service_index == service_count) {
tc_state = TC_W2_DISCONNECT;
break;

6
example/libusb/ble_client.h
View File

@ -127,12 +127,6 @@ typedef struct le_peripheral_event{
uint8_t status;
} 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{
uint16_t start_group_handle;
uint16_t end_group_handle;

32
example/libusb/ble_peripheral.c
View File

@ -84,6 +84,8 @@ static int gap_bondable = 0;
static int gap_directed_connectable = 0;
static int gap_privacy = 0;
static int att_default_value_long = 0;
static char * sm_io_capabilities = NULL;
static int sm_mitm_protection = 0;
static int sm_have_oob_data = 0;
@ -173,7 +175,9 @@ static int advertisement_index = 2;
// att write queue engine
static const char alphabet[] = "abcdefghijklmnopqrstuvwxyz";
static const char default_value_long[] = "abcdefghijklmnopqrstuvwxyz";
static const char default_value_short[] = "a";
#define ATT_VALUE_MAX_LEN 26
typedef struct {
@ -279,8 +283,13 @@ static uint16_t att_read_callback(uint16_t handle, uint16_t offset, uint8_t * bu
uint16_t att_value_len;
if (index < 0){
// not written before
att_value = (uint8_t*) alphabet;
att_value_len = strlen(alphabet);
if (att_default_value_long){
att_value = (uint8_t*) default_value_long;
att_value_len = strlen(default_value_long);
} else {
att_value = (uint8_t*) default_value_short;
att_value_len = strlen(default_value_short);
}
} else {
att_value = att_attributes[index].value;
att_value_len = att_attributes[index].len;
@ -303,8 +312,9 @@ static uint16_t att_read_callback(uint16_t handle, uint16_t offset, uint8_t * bu
// write requests
static int att_write_callback(uint16_t handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size, signature_t * signature){
printf("WRITE Callback, handle %04x, mode %u, offset %u\n", handle, transaction_mode, offset);
printf("WRITE Callback, handle %04x, mode %u, offset %u, data: ", handle, transaction_mode, offset);
hexdump(buffer, buffer_size);
switch(handle){
case 0x0012:
case 0x0017:
@ -456,7 +466,7 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
case HCI_SUBEVENT_LE_CONNECTION_COMPLETE:
advertisements_enabled = 0;
handle = READ_BT_16(packet, 4);
printf("Connection handle 0x%04x", handle);
printf("Connection handle 0x%04x\n", handle);
// request connection parameter update - test parameters
// l2cap_le_request_connection_parameter_update(READ_BT_16(packet, 4), 20, 1000, 100, 100);
break;
@ -521,6 +531,7 @@ void show_usage(){
printf("ADV: "); hexdump(adv_data, adv_data_len);
printf("SM: %s, MITM protection %u, OOB data %u, key range [%u..16]\n",
sm_io_capabilities, sm_mitm_protection, sm_have_oob_data, sm_min_key_size);
printf("Default value: '%s'\n", att_default_value_long ? default_value_long : default_value_short);
printf("---\n");
printf("a/A - advertisements off/on\n");
printf("b/B - bondable off/on\n");
@ -535,6 +546,7 @@ void show_usage(){
printf("4 - AD Service Data | 9 - AD SM OOB\n");
printf("5 - AD Service Solicitation | 0 - AD SM TK\n");
printf("---\n");
printf("l/L - default attribute value '%s'/'%s'\n", default_value_short, default_value_long);
printf("s - send security request\n");
printf("z - send Connection Parameter Update Request\n");
printf("t - terminate connection\n");
@ -718,6 +730,14 @@ int stdin_process(struct data_source *ds){
printf("Sending l2cap connection update parameter request\n");
l2cap_le_request_connection_parameter_update(handle, 50, 120, 0, 550);
break;
case 'l':
att_default_value_long = 0;
show_usage();
break;
case 'L':
att_default_value_long = 1;
show_usage();
break;
case 'o':
sm_have_oob_data = 0;
show_usage();