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

drop le_characteristic_value_t and add characteristic write

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2014-05-11 20:34:13 +00:00
parent a3bf7a24d6
commit e11fb83b1c
4 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ble/gatt_client.c
View File

@ -449,14 +449,12 @@ static void report_gatt_included_service(gatt_client_t * peripheral, uint8_t *uu
static void send_characteristic_value_event(gatt_client_t * peripheral, uint16_t handle, uint8_t * value, uint16_t length, uint16_t offset, uint8_t event_type){
le_characteristic_value_event_t event;
le_characteristic_value_t characteristic_value;
characteristic_value.handle = handle;
event.blob_length = length;
event.value = value;
event.value_offset = offset;
event.type = event_type;
event.client = peripheral;
event.characteristic_value = characteristic_value;
event.value_handle = handle;
event.value_offset = offset;
event.blob_length = length;
event.blob = value;
(*gatt_client_callback)((le_event_t*)&event);
}

22
ble/gatt_client.h
View File

@ -186,6 +186,15 @@ typedef struct le_characteristic_event{
le_characteristic_t characteristic;
} le_characteristic_event_t;
typedef struct le_characteristic_value_event{
uint8_t type;
gatt_client_t * client;
uint16_t value_handle;
uint16_t value_offset;
uint16_t blob_length;
uint8_t * blob;
} le_characteristic_value_event_t;
typedef struct le_characteristic_descriptor{
// no properties
uint16_t handle;
@ -202,19 +211,6 @@ typedef struct le_characteristic_descriptor_event{
uint8_t * value;
} le_characteristic_descriptor_event_t;
typedef struct le_characteristic_value{
uint16_t handle;
} le_characteristic_value_t;
typedef struct le_characteristic_value_event{
uint8_t type;
gatt_client_t * client;
le_characteristic_value_t characteristic_value;
uint16_t blob_length;
uint16_t value_offset;
uint8_t * value;
} le_characteristic_value_event_t;
void gatt_client_init();

40
src/daemon.c
View File

@ -156,22 +156,30 @@ static void daemon_no_connections_timeout(struct timer *ts){
#define CHARACTERISTIC_LENGTH 24
#define CHARACTERISTIC_DESCRIPTOR_LENGTH 18
// ??
#define CHARACTERISTIC_VALUE_LENGTH 6
// ATT_MTU - 1
#define ATT_MAX_ATTRIBUTE_SIZE 22
typedef struct gatt_client_helper {
uint16_t characteristic_length;
} gatt_client_helper_t;
static gatt_client_t * daemon_provide_gatt_client_context_for_handle(uint16_t handle){
gatt_client_t *context;
context = get_gatt_client_context_for_handle(handle);
if (!context){
context = (gatt_client_t*)malloc(sizeof(gatt_client_t) + ATT_MAX_LONG_ATTRIBUTE_SIZE);
context = (gatt_client_t*)malloc(sizeof(gatt_client_t) + sizeof(gatt_client_helper_t) + ATT_MAX_LONG_ATTRIBUTE_SIZE);
}
if (!context) return NULL;
gatt_client_start(context, handle);
return context;
}
gatt_client_helper_t * daemon_get_gatt_helper(gatt_client_t * context){
return (gatt_client_helper_t*) (((uint8_t *) context) + sizeof(gatt_client_t));
}
uint8_t * daemon_get_data_buffer(gatt_client_t *context) {
return ((uint8_t *) context) + sizeof(gatt_client_t);
return ((uint8_t *) context) + sizeof(gatt_client_t) + sizeof(gatt_client_helper_t);
}
static void send_gatt_query_complete(connection_t * connection, uint8_t event_type, uint16_t handle, uint8_t status){
@ -243,11 +251,6 @@ void daemon_gatt_serialize_characteristic_descriptor(le_characteristic_descripto
swap128(characteristic_descriptor->uuid128, &event[offset+2]);
}
void daemon_gatt_serialize_characteristic_value(le_characteristic_value_t * characteristic_value, uint8_t * event, int offset){
bt_store_16(event, offset, characteristic_value->handle);
}
// setup events
void daemon_setup_service_event(le_event_t *le_event, uint8_t* event) {
le_service_event_t * service_event = (le_service_event_t *) le_event;
@ -276,9 +279,12 @@ void daemon_setup_characteristic_descriptor_event(le_event_t *le_event, uint8_t*
void daemon_setup_characteristic_value_event(le_event_t *le_event, uint8_t* event) {
le_characteristic_value_event_t * cvalue_event = (le_characteristic_value_event_t *) le_event;
event[0] = le_event->type;
event[1] = CHARACTERISTIC_VALUE_LENGTH;
event[1] = 2 + (2 + 2 + cvalue_event->blob_length);
bt_store_16(event, 2, cvalue_event->client->handle);
daemon_gatt_serialize_characteristic_value(&cvalue_event->characteristic_value, event, 4);
bt_store_16(event, 4, cvalue_event->value_handle);
// TODO bt_store_16(event, 6, cvalue_event->blob_length);
event[6] = cvalue_event->blob_length;
memcpy(&event[7], cvalue_event->blob, cvalue_event->blob_length); // &event[8] with 2 byte length
}
#endif
@ -593,6 +599,7 @@ static int btstack_command_handler(connection_t *connection, uint8_t *packet, ui
daemon_gatt_deserialize_characteristic(packet, 5, &characteristic);
data_length = READ_BT_16(packet, 5 + CHARACTERISTIC_LENGTH);
data = daemon_get_data_buffer(context);
hci_dump_log("GATT_WRITE_VALUE_OF_CHARACTERISTIC handle %x, len %u\n", characteristic.value_handle, data_length);
memcpy(data, &packet[7 + CHARACTERISTIC_LENGTH], data_length);
gatt_client_write_value_of_characteristic(context, characteristic.value_handle, data_length, data);
break;
@ -1086,19 +1093,22 @@ static void handle_gatt_client_event(le_event_t * le_event){
break;
}
case GATT_CHARACTERISTIC_VALUE_QUERY_RESULT:
case GATT_LONG_CHARACTERISTIC_VALUE_QUERY_RESULT:{
uint8_t event[4 + CHARACTERISTIC_VALUE_LENGTH];
case GATT_CHARACTERISTIC_VALUE_QUERY_RESULT: {
uint8_t event[4 + 2 + 1 + ATT_MAX_ATTRIBUTE_SIZE]; // (type, len, handle), handle, len, data
daemon_setup_characteristic_value_event(le_event, event);
hci_dump_packet(HCI_EVENT_PACKET, 0, event, sizeof(event));
socket_connection_send_packet((connection_t *)le_event->client->context, HCI_EVENT_PACKET, 0, event, sizeof(event));
break;
}
case GATT_LONG_CHARACTERISTIC_VALUE_QUERY_RESULT:
// TODO
break;
case GATT_NOTIFICATION:
// TODO
break;
case GATT_INDICATION:
// TODO
break;
case GATT_SERVICE_QUERY_COMPLETE:

7
test/gatt_client/le_central.c
View File

@ -54,9 +54,10 @@ static void handle_ble_client_event(le_event_t * event){
advertisement_received = 1;
verify_advertisement((ad_event_t *) event);
break;
case GATT_CONNECTION_COMPLETE: {
connected = 1;
break;
// TODO handle hci le connection complete event instead of this
// case GATT_CONNECTION_COMPLETE: {
// connected = 1;
// break;
}
default:
printf("le_event_t");