Skip to content

Commit 4881e1f

Browse files
dhalbertdhalbert
committed
WIP: Central compiles; now will test
1 parent 24ac1fd commit 4881e1f

12 files changed

Lines changed: 78 additions & 162 deletions

File tree

‎ports/nrf/common-hal/bleio/Central.c‎

Lines changed: 31 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,22 @@
4141
#include "shared-bindings/bleio/UUID.h"
4242

4343
static bleio_service_obj_t *m_char_discovery_service;
44+
static volatile bool m_discovery_in_process;
4445
static volatile bool m_discovery_successful;
4546

4647
STATIC bool discover_next_services(bleio_central_obj_t *self, uint16_t start_handle) {
4748
m_discovery_successful = false;
49+
m_discovery_in_process = true;
4850

4951
uint32_t err_code = sd_ble_gattc_primary_services_discover(self->conn_handle, start_handle, NULL);
5052
if (err_code != NRF_SUCCESS) {
5153
mp_raise_OSError_msg(translate("Failed to discover services"));
5254
}
5355

54-
// Serialize discovery.
55-
err_code = sd_mutex_acquire(&m_discovery_mutex);
56-
if (err_code != NRF_SUCCESS) {
57-
mp_raise_OSError_msg(translate("Failed to acquire mutex"));
58-
}
59-
60-
// Wait for someone else to release m_discovery_mutex.
61-
while (sd_mutex_acquire(&m_discovery_mutex) == NRF_ERROR_SOC_MUTEX_ALREADY_TAKEN) {
62-
#ifdef MICROPY_VM_HOOK_LOOP
63-
MICROPY_VM_HOOK_LOOP
64-
#endif
65-
}
66-
67-
err_code = sd_mutex_release(&m_discovery_mutex);
68-
if (err_code != NRF_SUCCESS) {
69-
mp_raise_OSError_msg(translate("Failed to release mutex"));
56+
// Wait for a discovery event.
57+
while (m_discovery_in_process) {
58+
MICROPY_VM_HOOK_LOOP;
7059
}
71-
7260
return m_discovery_successful;
7361
}
7462

@@ -80,26 +68,17 @@ STATIC bool discover_next_characteristics(bleio_central_obj_t *self, bleio_servi
8068
handle_range.end_handle = service->end_handle;
8169

8270
m_discovery_successful = false;
71+
m_discovery_in_process = true;
8372

8473
uint32_t err_code = sd_ble_gattc_characteristics_discover(self->conn_handle, &handle_range);
8574
if (err_code != NRF_SUCCESS) {
8675
return false;
8776
}
8877

89-
err_code = sd_mutex_acquire(&m_discovery_mutex);
90-
if (err_code != NRF_SUCCESS) {
91-
mp_raise_OSError_msg(translate("Failed to acquire mutex"));
92-
}
93-
94-
while (sd_mutex_acquire(&m_discovery_mutex) == NRF_ERROR_SOC_MUTEX_ALREADY_TAKEN) {
78+
// Wait for a discovery event.
79+
while (m_discovery_in_process) {
9580
MICROPY_VM_HOOK_LOOP;
9681
}
97-
98-
err_code = sd_mutex_release(&m_discovery_mutex);
99-
if (err_code != NRF_SUCCESS) {
100-
mp_raise_OSError_msg(translate("Failed to release mutex"));
101-
}
102-
10382
return m_discovery_successful;
10483
}
10584

@@ -109,7 +88,7 @@ STATIC void on_primary_srv_discovery_rsp(ble_gattc_evt_prim_srvc_disc_rsp_t *res
10988

11089
bleio_service_obj_t *service = m_new_obj(bleio_service_obj_t);
11190
service->base.type = &bleio_service_type;
112-
service->device = central;
91+
service->device = MP_OBJ_FROM_PTR(central);
11392
service->characteristic_list = mp_obj_new_list(0, NULL);
11493
service->start_handle = gattc_service->handle_range.start_handle;
11594
service->end_handle = gattc_service->handle_range.end_handle;
@@ -125,11 +104,7 @@ STATIC void on_primary_srv_discovery_rsp(ble_gattc_evt_prim_srvc_disc_rsp_t *res
125104
if (response->count > 0) {
126105
m_discovery_successful = true;
127106
}
128-
129-
const uint32_t err_code = sd_mutex_release(&m_discovery_mutex);
130-
if (err_code != NRF_SUCCESS) {
131-
mp_raise_OSError_msg(translate("Failed to release mutex"));
132-
}
107+
m_discovery_in_process = false;
133108
}
134109

135110
STATIC void on_char_discovery_rsp(ble_gattc_evt_char_disc_rsp_t *response, bleio_central_obj_t *central) {
@@ -159,11 +134,7 @@ STATIC void on_char_discovery_rsp(ble_gattc_evt_char_disc_rsp_t *response, bleio
159134
if (response->count > 0) {
160135
m_discovery_successful = true;
161136
}
162-
163-
const uint32_t err_code = sd_mutex_release(&m_discovery_mutex);
164-
if (err_code != NRF_SUCCESS) {
165-
mp_raise_OSError_msg(translate("Failed to release mutex"));
166-
}
137+
m_discovery_in_process = false;
167138
}
168139

169140
STATIC void on_ble_evt(ble_evt_t *ble_evt, void *central_in) {
@@ -189,6 +160,8 @@ STATIC void on_ble_evt(ble_evt_t *ble_evt, void *central_in) {
189160

190161
case BLE_GAP_EVT_DISCONNECTED:
191162
central->conn_handle = BLE_CONN_HANDLE_INVALID;
163+
m_discovery_successful = false;
164+
m_discovery_in_process = false;
192165
break;
193166

194167
case BLE_GATTC_EVT_PRIM_SRVC_DISC_RSP:
@@ -220,10 +193,22 @@ STATIC void on_ble_evt(ble_evt_t *ble_evt, void *central_in) {
220193
}
221194
}
222195

196+
void common_hal_bleio_central_construct(bleio_central_obj_t *self, bleio_address_obj_t *address) {
197+
common_hal_bleio_adapter_set_enabled(true);
198+
199+
self->service_list = mp_obj_new_list(0, NULL);
200+
self->gatt_role = GATT_ROLE_CLIENT;
201+
self->conn_handle = BLE_CONN_HANDLE_INVALID;
202+
}
203+
223204
void common_hal_bleio_central_connect(bleio_central_obj_t *self, mp_float_t timeout) {
224205
common_hal_bleio_adapter_set_enabled(true);
225206
ble_drv_add_event_handler(on_ble_evt, self);
226207

208+
ble_gap_addr_t addr;
209+
addr.addr_type = self->address.type;
210+
memcpy(addr.addr, self->address.bytes, NUM_BLEIO_ADDRESS_BYTES);
211+
227212
ble_gap_scan_params_t scan_params = {
228213
.interval = MSEC_TO_UNITS(100, UNIT_0_625_MS),
229214
.window = MSEC_TO_UNITS(100, UNIT_0_625_MS),
@@ -241,7 +226,7 @@ void common_hal_bleio_central_connect(bleio_central_obj_t *self, mp_float_t time
241226

242227
self->attempting_to_connect = true;
243228

244-
uint32_t err_code = sd_ble_gap_connect(&scan_params, &m_scan_buffer);
229+
uint32_t err_code = sd_ble_gap_connect(&addr, &scan_params, &conn_params, BLE_CONN_CFG_TAG_CUSTOM);
245230

246231
if (err_code != NRF_SUCCESS) {
247232
mp_raise_OSError_msg_varg(translate("Failed to start connecting, error 0x%04x"), err_code);
@@ -266,7 +251,7 @@ void common_hal_bleio_central_connect(bleio_central_obj_t *self, mp_float_t time
266251
next_start_handle = BLE_GATT_HANDLE_START;
267252

268253
while (1) {
269-
if(!discover_next_services(self, discovery_start_handle)) {
254+
if(!discover_next_services(self, next_start_handle)) {
270255
break;
271256
}
272257

@@ -310,3 +295,7 @@ void common_hal_bleio_central_connect(bleio_central_obj_t *self, mp_float_t time
310295
void common_hal_bleio_central_disconnect(bleio_central_obj_t *self) {
311296
sd_ble_gap_disconnect(self->conn_handle, BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION);
312297
}
298+
299+
mp_obj_t common_hal_bleio_central_get_remote_services(bleio_central_obj_t *self) {
300+
return self->service_list;
301+
}

‎ports/nrf/common-hal/bleio/Central.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030

3131
#include <stdbool.h>
3232

33+
#include "shared-module/bleio/__init__.h"
3334
#include "shared-module/bleio/Address.h"
3435

3536
typedef struct {
3637
mp_obj_base_t base;
37-
mp_obj_t remote_name;
38+
gatt_role_t gatt_role;
3839
bleio_address_obj_t address;
3940
volatile bool attempting_to_connect;
4041
volatile uint16_t conn_handle;
4142
mp_obj_t service_list;
42-
mp_obj_t conn_handler;
4343
} bleio_central_obj_t;
4444

4545
#endif // MICROPY_INCLUDED_SHARED_MODULE_BLEIO_CENTRAL_H

‎ports/nrf/common-hal/bleio/Characteristic.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ STATIC void gattc_read(bleio_characteristic_obj_t *characteristic) {
152152

153153
STATIC void gattc_write(bleio_characteristic_obj_t *characteristic, mp_buffer_info_t *bufinfo) {
154154
const uint16_t conn_handle = common_hal_bleio_device_get_conn_handle(characteristic->service->device);
155-
uint32_t err_code;
156155

157156
ble_gattc_write_params_t write_params = {
158157
.flags = BLE_GATT_EXEC_WRITE_FLAG_PREPARED_CANCEL,
@@ -163,7 +162,7 @@ STATIC void gattc_write(bleio_characteristic_obj_t *characteristic, mp_buffer_in
163162
};
164163

165164
while (1) {
166-
uint32 err_code = sd_ble_gattc_write(conn_handle, &write_params);
165+
uint32_t err_code = sd_ble_gattc_write(conn_handle, &write_params);
167166
if (err_code == NRF_SUCCESS) {
168167
break;
169168
}

‎ports/nrf/common-hal/bleio/Service.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ typedef struct {
3737
bool is_secondary;
3838
bleio_uuid_obj_t *uuid;
3939
// May be a Peripheral, Central, etc.
40-
mp_obj_t *device;
40+
mp_obj_t device;
4141
mp_obj_t characteristic_list;
4242
// Range of attribute handles of this service.
4343
uint16_t start_handle;

‎ports/nrf/common-hal/bleio/__init__.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#include "shared-bindings/bleio/__init__.h"
3030
#include "shared-bindings/bleio/Adapter.h"
31+
#include "shared-bindings/bleio/Central.h"
3132
#include "shared-bindings/bleio/Peripheral.h"
3233
#include "common-hal/bleio/__init__.h"
3334

‎shared-bindings/bleio/Central.c‎

Lines changed: 17 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@
3535
#include "py/objstr.h"
3636
#include "py/runtime.h"
3737
#include "shared-bindings/bleio/Adapter.h"
38-
#include "shared-bindings/bleio/AddressType.h"
38+
#include "shared-bindings/bleio/Address.h"
3939
#include "shared-bindings/bleio/Characteristic.h"
4040
#include "shared-bindings/bleio/Central.h"
4141
#include "shared-bindings/bleio/Service.h"
42-
#include "shared-bindings/bleio/UUID.h"
4342

4443
//| .. currentmodule:: bleio
4544
//|
@@ -62,44 +61,28 @@
6261
//| break
6362
//|
6463
//| central = bleio.Central(my_entry.address)
65-
//| central.connect()
64+
//| central.connect(10.0) # timeout after 10 seconds
6665
//|
6766

68-
//| .. class:: Central(address=None, scan_entry=None)
69-
//|
70-
//| Create a new Central object. If the `address` or :py:data:`scan_entry` parameters are not `None`,
71-
//| the role is set to Central, otherwise it's set to Peripheral.
67+
//| .. class:: Central(address)
7268
//|
69+
//| Create a new Central object.
7370
//| :param bleio.Address address: The address of the central to connect to
74-
//| :param bleio.ScanEntry scan_entry: The scan entry returned from `bleio.Scanner`
7571
//|
76-
STATIC mp_obj_t bleio_central_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *pos_args) {
77-
mp_arg_check_num(n_args, n_kw, 0, 1, true);
72+
STATIC mp_obj_t bleio_central_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
73+
mp_arg_check_num(n_args, kw_args, 1, 1, false);
74+
7875
bleio_central_obj_t *self = m_new_obj(bleio_central_obj_t);
7976
self->base.type = &bleio_central_type;
80-
self->service_list = mp_obj_new_list(0, NULL);
81-
self->conn_handler = mp_const_none;
82-
self->conn_handle = 0xFFFF;
83-
84-
mp_map_t kw_args;
85-
mp_map_init_fixed_table(&kw_args, n_kw, pos_args + n_args);
86-
87-
enum { ARG_address, ARG_scan_entry };
88-
static const mp_arg_t allowed_args[] = {
89-
{ MP_QSTR_address, MP_ARG_OBJ, {.u_obj = mp_const_none} },
90-
{ MP_QSTR_scan_entry, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
91-
};
92-
93-
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
94-
mp_arg_parse_all(n_args, pos_args, &kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
95-
96-
const mp_obj_t address_obj = args[ARG_address].u_obj;
97-
const mp_obj_t scan_entry_obj = args[ARG_scan_entry].u_obj;
9877

78+
const mp_obj_t address_obj = pos_args[0];
9979
if (!MP_OBJ_IS_TYPE(address_obj, &bleio_address_type)) {
100-
mp_raise_ValueError("Expected an Address");
80+
mp_raise_ValueError(translate("Expected an Address"));
10181
}
10282

83+
bleio_address_obj_t *address = MP_OBJ_TO_PTR(address_obj);
84+
common_hal_bleio_central_construct(self, address);
85+
10386
return MP_OBJ_FROM_PTR(self);
10487
}
10588

@@ -109,19 +92,15 @@ STATIC mp_obj_t bleio_central_make_new(const mp_obj_type_t *type, size_t n_args,
10992
//|
11093
//| Attempts a connection to the remote peripheral. If the connection is successful,
11194
//|
112-
STATIC mp_obj_t bleio_central_connect(mp_obj_t self_in) {
95+
STATIC mp_obj_t bleio_central_connect(mp_obj_t self_in, mp_obj_t timeout_in) {
11396
bleio_central_obj_t *self = MP_OBJ_TO_PTR(self_in);
11497

115-
if (self->is_peripheral) {
116-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
117-
translate("Can't connect in Peripheral mode")));
118-
}
119-
120-
common_hal_bleio_central_connect(self);
98+
mp_float_t timeout = mp_obj_float_get(timeout_in);
99+
common_hal_bleio_central_connect(self, timeout);
121100

122101
return mp_const_none;
123102
}
124-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_central_connect_obj, bleio_central_connect);
103+
STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_central_connect_obj, bleio_central_connect);
125104

126105

127106
//| .. method:: disconnect()
@@ -137,25 +116,14 @@ STATIC mp_obj_t bleio_central_disconnect(mp_obj_t self_in) {
137116
}
138117
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_central_disconnect_obj, bleio_central_disconnect);
139118

140-
//| .. attribute:: remote_name (read-only)
141-
//|
142-
//| The name of the remote peripheral, if connected. May be None if no name was advertised.
143-
//|
144-
STATIC mp_obj_t bleio_central_get_remote_name(mp_obj_t self_in) {
145-
bleio_central_obj_t *self = MP_OBJ_TO_PTR(self_in);
146-
147-
return self->remote_name;
148-
}
149-
MP_DEFINE_CONST_FUN_OBJ_1(bleio_central_get_remote_name_obj, bleio_central_get_remote_name);
150-
151119
//| .. attribute:: remote_services (read-only)
152120
//|
153121
//| Empty until connected, then a list of services provided by the remote peripheral.
154122
//|
155123
STATIC mp_obj_t bleio_central_get_remote_services(mp_obj_t self_in) {
156124
bleio_central_obj_t *self = MP_OBJ_TO_PTR(self_in);
157125

158-
return self->service_list;
126+
return common_hal_bleio_central_get_remote_services(self);
159127
}
160128
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_central_get_remote_services_obj, bleio_central_get_remote_services);
161129

@@ -172,7 +140,6 @@ STATIC const mp_rom_map_elem_t bleio_central_locals_dict_table[] = {
172140
{ MP_ROM_QSTR(MP_QSTR_disconnect), MP_ROM_PTR(&bleio_central_disconnect_obj) },
173141

174142
// Properties
175-
{ MP_ROM_QSTR(MP_QSTR_remote_name), MP_ROM_PTR(&bleio_central_remote_name_obj) },
176143
{ MP_ROM_QSTR(MP_QSTR_remote_services), MP_ROM_PTR(&bleio_central_remote_services_obj) },
177144
};
178145

‎shared-bindings/bleio/Central.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@
3131
#include "common-hal/bleio/Central.h"
3232
#include "common-hal/bleio/Service.h"
3333

34-
extern const mp_obj_type_t bleio_device_type;
34+
extern const mp_obj_type_t bleio_central_type;
3535

36-
extern void common_hal_bleio_device_connect(bleio_device_obj_t *device);
37-
extern void common_hal_bleio_device_disconnect(bleio_device_obj_t *device);
36+
extern void common_hal_bleio_central_construct(bleio_central_obj_t *self, bleio_address_obj_t *address);
37+
extern void common_hal_bleio_central_connect(bleio_central_obj_t *self, mp_float_t timeout);
38+
extern void common_hal_bleio_central_disconnect(bleio_central_obj_t *self);
39+
extern mp_obj_t common_hal_bleio_central_get_remote_services(bleio_central_obj_t *self);
3840

3941
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_CENTRAL_H

‎shared-bindings/bleio/Characteristic.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ STATIC mp_obj_t bleio_characteristic_make_new(const mp_obj_type_t *type, size_t
6969
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
7070
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
7171

72-
const mp_obj_t uuid = args[ARG_uuid].u_obj;
72+
const mp_obj_t uuid_obj = args[ARG_uuid].u_obj;
7373

74-
if (!MP_OBJ_IS_TYPE(uuid, &bleio_uuid_type)) {
74+
if (!MP_OBJ_IS_TYPE(uuid_obj, &bleio_uuid_type)) {
7575
mp_raise_ValueError(translate("Expected a UUID"));
7676
}
77-
bleio_uuid_obj_t *uuid_obj = MP_OBJ_TO_PTR(uuid);
77+
bleio_uuid_obj_t *uuid = MP_OBJ_TO_PTR(uuid_obj);
7878

7979
bleio_characteristic_obj_t *self = m_new_obj(bleio_characteristic_obj_t);
8080
self->base.type = &bleio_characteristic_type;
@@ -88,7 +88,7 @@ STATIC mp_obj_t bleio_characteristic_make_new(const mp_obj_type_t *type, size_t
8888
properties.write = args[ARG_write].u_bool;
8989
properties.write_no_response = args[ARG_write_no_response].u_bool;
9090

91-
common_hal_bleio_characteristic_construct(self, uuid_obj, properties);
91+
common_hal_bleio_characteristic_construct(self, uuid, properties);
9292

9393
return MP_OBJ_FROM_PTR(self);
9494
}

‎shared-bindings/bleio/CharacteristicBuffer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ STATIC mp_obj_t bleio_characteristic_buffer_make_new(const mp_obj_type_t *type,
8686
bleio_characteristic_buffer_obj_t *self = m_new_obj(bleio_characteristic_buffer_obj_t);
8787
self->base.type = &bleio_characteristic_buffer_type;
8888

89-
common_hal_bleio_characteristic_buffer_construct(self, characteristic, timeout, buffer_size);
89+
common_hal_bleio_characteristic_buffer_construct(self, MP_OBJ_TO_PTR(characteristic), timeout, buffer_size);
9090

9191
return MP_OBJ_FROM_PTR(self);
9292
}

0 commit comments

Comments
 (0)