wip: advertising works, but not connection

6 files changed, 15 insertions, 26 deletions

diff --git a/shared-bindings/bleio/Address.c b/shared-bindings/bleio/Address.c
index d4c24e4e2..910938844 100644
--- a/shared-bindings/bleio/Address.c
+++ b/shared-bindings/bleio/Address.c
@@ -80,7 +80,7 @@ STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args,
 
     enum { ARG_address };
     static const mp_arg_t allowed_args[] = {
-        { ARG_address, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
diff --git a/shared-bindings/bleio/Descriptor.c b/shared-bindings/bleio/Descriptor.c
index 3d6423314..4022632ad 100644
--- a/shared-bindings/bleio/Descriptor.c
+++ b/shared-bindings/bleio/Descriptor.c
@@ -81,7 +81,7 @@ STATIC mp_obj_t bleio_descriptor_make_new(const mp_obj_type_t *type, size_t n_ar
 
     enum { ARG_uuid };
     static const mp_arg_t allowed_args[] = {
-        { ARG_uuid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_uuid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -99,13 +99,6 @@ STATIC mp_obj_t bleio_descriptor_make_new(const mp_obj_type_t *type, size_t n_ar
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void bleio_descriptor_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "Descriptor(uuid=");
-    bleio_uuid_print(print, self->uuid, kind);
-    mp_printf(print, ", handle=%04x", common_hal_bleio_descriptor_get_handle(self));
-}
-
 STATIC mp_obj_t bleio_descriptor_get_handle(mp_obj_t self_in) {
     bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -161,7 +154,6 @@ STATIC MP_DEFINE_CONST_DICT(bleio_descriptor_locals_dict, bleio_descriptor_local
 const mp_obj_type_t bleio_descriptor_type = {
     { &mp_type_type },
     .name = MP_QSTR_Descriptor,
-    .print = bleio_descriptor_print,
     .make_new = bleio_descriptor_make_new,
     .locals_dict = (mp_obj_dict_t*)&bleio_descriptor_locals_dict
 };
diff --git a/shared-bindings/bleio/Device.c b/shared-bindings/bleio/Device.c
index 94834ef7c..cf5eb6873 100644
--- a/shared-bindings/bleio/Device.c
+++ b/shared-bindings/bleio/Device.c
@@ -171,7 +171,7 @@ STATIC mp_obj_t bleio_device_make_new(const mp_obj_type_t *type, size_t n_args,
 
     enum { ARG_address, ARG_scan_entry };
     static const mp_arg_t allowed_args[] = {
-        { ARG_address, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_address, MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_scan_entry, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
     };
 
diff --git a/shared-bindings/bleio/Service.c b/shared-bindings/bleio/Service.c
index 129a1d0b7..a0673bb2d 100644
--- a/shared-bindings/bleio/Service.c
+++ b/shared-bindings/bleio/Service.c
@@ -45,23 +45,16 @@
 //|   To mark the service as secondary, pass `True` as :py:data:`secondary`.
 //|
 //|   :param bleio.UUID uuid: The uuid of the service
+//|   :param iterable characteristics: the Characteristic objects for this service
 //|   :param bool secondary: If the service is a secondary one
 //|
 
-STATIC void bleio_service_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in);
-
-    mp_printf(print, "Service(");
-    bleio_uuid_print(print, self->uuid, kind);
-    mp_printf(print, ")");
-}
-
 STATIC mp_obj_t bleio_service_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *pos_args) {
     mp_arg_check_num(n_args, n_kw, 2, 3, true);
     bleio_service_obj_t *self = m_new_obj(bleio_service_obj_t);
     self->char_list = mp_obj_new_list(0, NULL);
     self->base.type = &bleio_service_type;
-    self->device = NULL;
+    self->device = mp_const_none;
     self->handle = 0xFFFF;
 
     mp_map_t kw_args;
@@ -69,7 +62,7 @@ STATIC mp_obj_t bleio_service_make_new(const mp_obj_type_t *type, size_t n_args,
 
     enum { ARG_uuid, ARG_characteristics, ARG_secondary };
     static const mp_arg_t allowed_args[] = {
-        { ARG_uuid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_uuid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_characteristics, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_secondary, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
@@ -98,13 +91,17 @@ STATIC mp_obj_t bleio_service_make_new(const mp_obj_type_t *type, size_t n_args,
         }
         bleio_characteristic_obj_t *characteristic_ptr = MP_OBJ_TO_PTR(characteristic);
         if (common_hal_bleio_uuid_get_uuid128_reference(uuid) !=
-        common_hal_bleio_uuid_get_uuid128_reference(characteristic_ptr->uuid)) {
+            common_hal_bleio_uuid_get_uuid128_reference(characteristic_ptr->uuid)) {
             // The descriptor base UUID doesn't match the characteristic base UUID.
             mp_raise_ValueError(translate("Characteristic UUID doesn't match Service UUID"));
         }
         characteristic_ptr->service = self;
         mp_obj_list_append(self->char_list, characteristic);
     }
+
+    // Do port-specific initialization.
+    common_hal_bleio_service_construct(self);
+
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -155,7 +152,6 @@ STATIC MP_DEFINE_CONST_DICT(bleio_service_locals_dict, bleio_service_locals_dict
 const mp_obj_type_t bleio_service_type = {
     { &mp_type_type },
     .name = MP_QSTR_Service,
-    .print = bleio_service_print,
     .make_new = bleio_service_make_new,
     .locals_dict = (mp_obj_dict_t*)&bleio_service_locals_dict
 };
diff --git a/shared-bindings/bleio/Service.h b/shared-bindings/bleio/Service.h
index 77c751829..389db3b2e 100644
--- a/shared-bindings/bleio/Service.h
+++ b/shared-bindings/bleio/Service.h
@@ -32,6 +32,7 @@
 
 const mp_obj_type_t bleio_service_type;
 
-extern void common_hal_bleio_service_add_characteristic(bleio_service_obj_t *self, bleio_characteristic_obj_t *characteristic);
+extern void common_hal_bleio_service_construct(bleio_service_obj_t *self);
+extern void common_hal_bleio_service_add_all_characteristics(bleio_service_obj_t *self);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_SERVICE_H
diff --git a/shared-bindings/bleio/__init__.c b/shared-bindings/bleio/__init__.c
index 46822603f..21242e07c 100644
--- a/shared-bindings/bleio/__init__.c
+++ b/shared-bindings/bleio/__init__.c
@@ -31,7 +31,7 @@
 #include "shared-bindings/bleio/AdvertisementData.h"
 #include "shared-bindings/bleio/Characteristic.h"
 #include "shared-bindings/bleio/Descriptor.h"
-#include "shared-bindings/bleio/Device.h"
+#include "shared-bindings/bleio/LocalPeripheral.h"
 #include "shared-bindings/bleio/ScanEntry.h"
 #include "shared-bindings/bleio/Scanner.h"
 #include "shared-bindings/bleio/Service.h"
@@ -76,7 +76,7 @@ STATIC const mp_rom_map_elem_t bleio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AdvertisementData), MP_ROM_PTR(&bleio_advertisementdata_type) },
     { MP_ROM_QSTR(MP_QSTR_Characteristic),    MP_ROM_PTR(&bleio_characteristic_type) },
     { MP_ROM_QSTR(MP_QSTR_Descriptor),        MP_ROM_PTR(&bleio_descriptor_type) },
-    { MP_ROM_QSTR(MP_QSTR_Device),            MP_ROM_PTR(&bleio_device_type) },
+    { MP_ROM_QSTR(MP_QSTR_LocalPeripheral),   MP_ROM_PTR(&bleio_local_peripheral_type) },
     { MP_ROM_QSTR(MP_QSTR_ScanEntry),         MP_ROM_PTR(&bleio_scanentry_type) },
     { MP_ROM_QSTR(MP_QSTR_Scanner),           MP_ROM_PTR(&bleio_scanner_type) },
     { MP_ROM_QSTR(MP_QSTR_Service),           MP_ROM_PTR(&bleio_service_type) },