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

nrf5/modules/ubluepy: Continue primary service discovery until nothing more is found in connect proceedure.

This commit is contained in:
Glenn Ruben Bakke 2017-05-13 18:10:33 +02:00 committed by glennrub
parent b4f96a1dc3
commit 370c20ff6c
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nrf5/modules/ubluepy/ubluepy_peripheral.c
View File

@ -389,10 +389,21 @@ STATIC mp_obj_t peripheral_connect(mp_uint_t n_args, const mp_obj_t *pos_args, m
ble_drv_gattc_event_handler_set(MP_OBJ_FROM_PTR(self), gattc_event_handler);
bool retval = ble_drv_discover_services(self, self->conn_handle, disc_add_service);
if (retval != true) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
"Error during service discovery"));
bool service_disc_retval = ble_drv_discover_services(self, self->conn_handle, 0x0001, disc_add_service);
// continue discovery of primary services ...
while (service_disc_retval) {
// locate the last added service
mp_obj_t * services = NULL;
mp_uint_t num_services;
mp_obj_get_array(self->service_list, &num_services, &services);
ubluepy_service_obj_t * p_service = (ubluepy_service_obj_t *)services[num_services - 1];
service_disc_retval = ble_drv_discover_services(self,
self->conn_handle,
p_service->end_handle,
disc_add_service);
}
// For each service perform a characteristic discovery