djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf5/modules/ubluepy: Adding callback function to handle read response if gatt client has issued a read request. Also adding method for returning the uuid instance from the object.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-04-01 16:39:51 +02:00
parent 5a7ab4686c
commit 276073b494
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nrf5/modules/ubluepy/ubluepy_characteristic.c
View File

@ -78,20 +78,31 @@ STATIC mp_obj_t ubluepy_characteristic_make_new(const mp_obj_type_t *type, size_
// clear pointer to service // clear pointer to service
s->p_service = NULL; s->p_service = NULL;
// clear pointer to char value data
s->value_data = NULL;
return MP_OBJ_FROM_PTR(s); return MP_OBJ_FROM_PTR(s);
} }
void char_data_callback(mp_obj_t self_in, uint16_t length, uint8_t * p_data) {
ubluepy_characteristic_obj_t * self = MP_OBJ_TO_PTR(self_in);
self->value_data = mp_obj_new_bytearray(length, p_data);
}
/// \method read() /// \method read()
/// Read Characteristic value. /// Read Characteristic value.
/// ///
STATIC mp_obj_t char_read(mp_obj_t self_in) { STATIC mp_obj_t char_read(mp_obj_t self_in) {
ubluepy_characteristic_obj_t * self = MP_OBJ_TO_PTR(self_in); ubluepy_characteristic_obj_t * self = MP_OBJ_TO_PTR(self_in);
// TODO: free any previous allocation of value_data
ble_drv_attr_c_read(self->p_service->p_periph->conn_handle, ble_drv_attr_c_read(self->p_service->p_periph->conn_handle,
self->handle, self->handle,
0, self_in,
NULL); char_data_callback);
return mp_const_none; return self->value_data;
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_read_obj, char_read); STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_read_obj, char_read);
@ -130,6 +141,16 @@ STATIC mp_obj_t char_properties(mp_obj_t self_in) {
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_get_properties_obj, char_properties); STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_get_properties_obj, char_properties);
/// \method uuid()
/// Get UUID instance of the characteristic.
///
STATIC mp_obj_t char_uuid(mp_obj_t self_in) {
ubluepy_characteristic_obj_t * self = MP_OBJ_TO_PTR(self_in);
return MP_OBJ_FROM_PTR(self->p_uuid);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_characteristic_get_uuid_obj, char_uuid);
STATIC const mp_map_elem_t ubluepy_characteristic_locals_dict_table[] = { STATIC const mp_map_elem_t ubluepy_characteristic_locals_dict_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)(&ubluepy_characteristic_read_obj) }, { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)(&ubluepy_characteristic_read_obj) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)(&ubluepy_characteristic_write_obj) }, { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)(&ubluepy_characteristic_write_obj) },
@ -140,8 +161,8 @@ STATIC const mp_map_elem_t ubluepy_characteristic_locals_dict_table[] = {
// Properties // Properties
{ MP_OBJ_NEW_QSTR(MP_QSTR_peripheral), (mp_obj_t)(&ubluepy_characteristic_get_peripheral_obj) }, { MP_OBJ_NEW_QSTR(MP_QSTR_peripheral), (mp_obj_t)(&ubluepy_characteristic_get_peripheral_obj) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_uuid), (mp_obj_t)(&ubluepy_characteristic_get_uuid_obj) },
#endif #endif
{ MP_OBJ_NEW_QSTR(MP_QSTR_uuid), (mp_obj_t)(&ubluepy_characteristic_get_uuid_obj) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_properties), (mp_obj_t)(&ubluepy_characteristic_get_properties_obj) }, { MP_OBJ_NEW_QSTR(MP_QSTR_properties), (mp_obj_t)(&ubluepy_characteristic_get_properties_obj) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_PROP_BROADCAST), MP_OBJ_NEW_SMALL_INT(UBLUEPY_PROP_BROADCAST) }, { MP_OBJ_NEW_QSTR(MP_QSTR_PROP_BROADCAST), MP_OBJ_NEW_SMALL_INT(UBLUEPY_PROP_BROADCAST) },