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

convert GATT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_RESULT

Browse Source
This commit is contained in:
Matthias Ringwald 2015-10-14 15:30:38 +02:00
parent ad9ea7b731
commit b152779703
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ble/gatt_client.c
View File

@ -633,14 +633,6 @@ static void emit_event_to_all_subclients(le_event_t * event){
///
static void gatt_serialize_characteristic(le_characteristic_t * characteristic, uint8_t * event, int offset){
bt_store_16(event, offset, characteristic->start_handle);
bt_store_16(event, offset+2, characteristic->value_handle);
bt_store_16(event, offset+4, characteristic->end_handle);
bt_store_16(event, offset+6, characteristic->properties);
swap128(characteristic->uuid128, &event[offset+8]);
}
static void gatt_serialize_characteristic_descriptor(le_characteristic_descriptor_t * characteristic_descriptor, uint8_t * event, int offset){
bt_store_16(event, offset, characteristic_descriptor->handle);
swap128(characteristic_descriptor->uuid128, &event[offset+2]);
@ -696,6 +688,18 @@ static void emit_gatt_characteristic_query_result_event(gatt_client_t * peripher
emit_event_new(peripheral->subclient_id, packet, sizeof(packet));
}
static void emit_gatt_all_characteristic_descriptors_resutl_event(
gatt_client_t * peripheral, uint16_t descriptor_handle, uint8_t * uuid128){
// @format HZ
uint8_t packet[22];
packet[0] = GATT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_RESULT;
packet[1] = sizeof(packet) - 2;
bt_store_16(packet, 2, peripheral->handle);
///
bt_store_16(packet, 4, descriptor_handle);
swap128(uuid128, &packet[6]);
emit_event_new(peripheral->subclient_id, packet, sizeof(packet));
}
///
static void report_gatt_services(gatt_client_t * peripheral, uint8_t * packet, uint16_t size){
@ -884,25 +888,31 @@ static void report_gatt_characteristic_descriptor(gatt_client_t * peripheral, ui
}
static void report_gatt_all_characteristic_descriptors(gatt_client_t * peripheral, uint8_t * packet, uint16_t size, uint16_t pair_size){
le_characteristic_descriptor_t descriptor;
le_characteristic_descriptor_event_t event;
event.type = GATT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_RESULT;
event.handle = peripheral->handle;
int i;
for (i = 0; i<size; i+=pair_size){
descriptor.handle = READ_BT_16(packet,i);
uint16_t descriptor_handle = READ_BT_16(packet,i);
uint8_t uuid128[16];
uint16_t uuid16 = 0;
if (pair_size == 4){
descriptor.uuid16 = READ_BT_16(packet,i+2);
sdp_normalize_uuid((uint8_t*) &descriptor.uuid128, descriptor.uuid16);
uuid16 = READ_BT_16(packet,i+2);
sdp_normalize_uuid(uuid128, uuid16);
} else {
descriptor.uuid16 = 0;
swap128(&packet[i+2], descriptor.uuid128);
}
swap128(&packet[i+2], uuid128);
}
emit_gatt_all_characteristic_descriptors_resutl_event(peripheral, descriptor_handle, uuid128);
#ifdef OLD
le_characteristic_descriptor_t descriptor;
le_characteristic_descriptor_event_t event;
event.type = GATT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_RESULT;
event.handle = peripheral->handle;
descriptor.handle = descriptor_handle;
descriptor.uuid16 = uuid16;
memcpy(descriptor.uuid128, uuid128, 16);
event.value_length = 0;
event.characteristic_descriptor = descriptor;
emit_event(peripheral->subclient_id, (le_event_t*)&event);
#endif
}
}

16
test/gatt_client/gatt_client_test.c
View File

@ -147,6 +147,7 @@ static void handle_ble_client_event_new(uint8_t packet_type, uint8_t *packet, ui
uint8_t status;
le_service_t service;
le_characteristic_t characteristic;
le_characteristic_descriptor_t descriptor;
switch (packet[0]){
case GATT_QUERY_COMPLETE:
status = packet[4];
@ -191,6 +192,15 @@ static void handle_ble_client_event_new(uint8_t packet_type, uint8_t *packet, ui
characteristics[result_index++] = characteristic;
result_counter++;
break;
case GATT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_RESULT:
descriptor.handle = READ_BT_16(packet, 4);
swap128(&packet[6], descriptor.uuid128);
if (sdp_has_blueooth_base_uuid(descriptor.uuid128)){
descriptor.uuid16 = READ_NET_32(descriptor.uuid128, 0);
}
descriptors[result_index++] = descriptor;
result_counter++;
break;
default:
break;
}
@ -199,12 +209,6 @@ static void handle_ble_client_event_new(uint8_t packet_type, uint8_t *packet, ui
static void handle_ble_client_event(le_event_t * event){
switch(event->type){
case GATT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_RESULT:{
le_characteristic_descriptor_event *descriptor_event = (le_characteristic_descriptor_event_t *) event;
descriptors[result_index++] = descriptor_event->characteristic_descriptor;
result_counter++;
break;
}
case GATT_CHARACTERISTIC_DESCRIPTOR_QUERY_RESULT: {
le_characteristic_descriptor_event *descriptor_event = (le_characteristic_descriptor_event_t *) event;
CHECK_EQUAL(short_value_length, descriptor_event->value_length);