nrf: Move the Service class from ubluepy to the shared bleio module

4 files changed, 9 insertions, 214 deletions

diff --git a/ports/nrf/modules/ubluepy/modubluepy.c b/ports/nrf/modules/ubluepy/modubluepy.c
index 2d1a6a550..f8266a82d 100644
--- a/ports/nrf/modules/ubluepy/modubluepy.c
+++ b/ports/nrf/modules/ubluepy/modubluepy.c
@@ -36,7 +36,6 @@ STATIC const mp_rom_map_elem_t mp_module_ubluepy_globals_table[] = {
 #if MICROPY_PY_UBLUEPY_PERIPHERAL
     { MP_ROM_QSTR(MP_QSTR_Peripheral),      MP_ROM_PTR(&ubluepy_peripheral_type) },
 #endif
-    { MP_ROM_QSTR(MP_QSTR_Service),         MP_ROM_PTR(&ubluepy_service_type) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_ubluepy_globals, mp_module_ubluepy_globals_table);
diff --git a/ports/nrf/modules/ubluepy/modubluepy.h b/ports/nrf/modules/ubluepy/modubluepy.h
index ad33001cb..e301f0476 100644
--- a/ports/nrf/modules/ubluepy/modubluepy.h
+++ b/ports/nrf/modules/ubluepy/modubluepy.h
@@ -74,15 +74,9 @@ p.advertise(device_name="micr", services=[s])
 #include "common-hal/bleio/UUID.h"
 #include "py/obj.h"
 
-extern const mp_obj_type_t ubluepy_service_type;
 extern const mp_obj_type_t ubluepy_peripheral_type;
 
 typedef enum {
-    UBLUEPY_SERVICE_PRIMARY = 1,
-    UBLUEPY_SERVICE_SECONDARY = 2
-} ubluepy_service_type_t;
-
-typedef enum {
     UBLUEPY_ADDR_TYPE_PUBLIC = 0,
     UBLUEPY_ADDR_TYPE_RANDOM_STATIC = 1,
     UBLUEPY_ADDR_TYPE_RANDOM_PRIVATE_RESOLVABLE = 2,
@@ -104,17 +98,6 @@ typedef struct _ubluepy_peripheral_obj_t {
     mp_obj_t            service_list;
 } ubluepy_peripheral_obj_t;
 
-typedef struct _ubluepy_service_obj_t {
-    mp_obj_base_t              base;
-    uint16_t                   handle;
-    uint8_t                    type;
-    bleio_uuid_obj_t         * p_uuid;
-    ubluepy_peripheral_obj_t * p_periph;
-    mp_obj_t                   char_list;
-    uint16_t                   start_handle;
-    uint16_t                   end_handle;
-} ubluepy_service_obj_t;
-
 typedef struct _ubluepy_advertise_data_t {
     uint8_t *  p_device_name;
     uint8_t    device_name_len;
diff --git a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
index 2a826db4d..3b1a0d279 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
@@ -35,6 +35,7 @@
 #include "ble_drv.h"
 #include "common-hal/bleio/UUID.h"
 #include "shared-bindings/bleio/Characteristic.h"
+#include "shared-bindings/bleio/Service.h"
 #include "shared-bindings/bleio/UUID.h"
 
 STATIC void ubluepy_peripheral_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
@@ -271,9 +272,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_peripheral_disconnect_obj, peripheral_d
 ///
 STATIC mp_obj_t peripheral_add_service(mp_obj_t self_in, mp_obj_t service) {
     ubluepy_peripheral_obj_t * self = MP_OBJ_TO_PTR(self_in);
-    ubluepy_service_obj_t    * p_service = MP_OBJ_TO_PTR(service);
+    bleio_service_obj_t    * p_service = MP_OBJ_TO_PTR(service);
 
-    p_service->p_periph = self;
+    p_service->periph = self_in;
 
     mp_obj_list_append(self->service_list, service);
 
@@ -294,13 +295,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_peripheral_get_services_obj, peripheral
 #if MICROPY_PY_UBLUEPY_CENTRAL
 
 void static disc_add_service(mp_obj_t self, ble_drv_service_data_t * p_service_data) {
-    ubluepy_service_obj_t * p_service = m_new_obj(ubluepy_service_obj_t);
-    p_service->base.type = &ubluepy_service_type;
+    bleio_service_obj_t * p_service = m_new_obj(bleio_service_obj_t);
+    p_service->base.type = &bleio_service_type;
 
     bleio_uuid_obj_t * p_uuid = m_new_obj(bleio_uuid_obj_t);
     p_uuid->base.type = &bleio_uuid_type;
 
-    p_service->p_uuid = p_uuid;
+    p_service->uuid = p_uuid;
 
     p_uuid->type = p_service_data->uuid_type;
     p_uuid->value[0] = p_service_data->uuid & 0xFF;
@@ -316,7 +317,7 @@ void static disc_add_service(mp_obj_t self, ble_drv_service_data_t * p_service_d
 }
 
 void static disc_add_char(mp_obj_t service_in, ble_drv_char_data_t * p_desc_data) {
-    ubluepy_service_obj_t        * p_service   = MP_OBJ_TO_PTR(service_in);
+    bleio_service_obj_t        * p_service   = MP_OBJ_TO_PTR(service_in);
     bleio_characteristic_obj_t * p_char = m_new_obj(bleio_characteristic_obj_t);
     p_char->base.type = &bleio_characteristic_type;
 
@@ -410,7 +411,7 @@ STATIC mp_obj_t peripheral_connect(mp_uint_t n_args, const mp_obj_t *pos_args, m
         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];
+        bleio_service_obj_t * p_service = (bleio_service_obj_t *)services[num_services - 1];
 
         service_disc_retval = ble_drv_discover_services(self,
                                                         self->conn_handle,
@@ -424,7 +425,7 @@ STATIC mp_obj_t peripheral_connect(mp_uint_t n_args, const mp_obj_t *pos_args, m
     mp_obj_get_array(self->service_list, &num_services, &services);
 
     for (uint16_t s = 0; s < num_services; s++) {
-        ubluepy_service_obj_t * p_service = (ubluepy_service_obj_t *)services[s];
+        bleio_service_obj_t * p_service = (bleio_service_obj_t *)services[s];
         bool char_disc_retval = ble_drv_discover_characteristic(p_service,
                                                                 self->conn_handle,
                                                                 p_service->start_handle,
diff --git a/ports/nrf/modules/ubluepy/ubluepy_service.c b/ports/nrf/modules/ubluepy/ubluepy_service.c
deleted file mode 100644
index 3834c61de..000000000
--- a/ports/nrf/modules/ubluepy/ubluepy_service.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Glenn Ruben Bakke
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "py/obj.h"
-#include "py/runtime.h"
-#include "py/objlist.h"
-#include "supervisor/shared/translate.h"
-
-#if MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
-
-#include "modubluepy.h"
-#include "ble_drv.h"
-#include "common-hal/bleio/UUID.h"
-#include "shared-bindings/bleio/UUID.h"
-
-STATIC void ubluepy_service_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
-    ubluepy_service_obj_t * self = (ubluepy_service_obj_t *)o;
-
-    mp_printf(print, "Service(handle: 0x" HEX2_FMT ")", self->handle);
-}
-
-STATIC mp_obj_t ubluepy_service_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-
-    enum { ARG_NEW_UUID, ARG_NEW_TYPE };
-
-    static const mp_arg_t allowed_args[] = {
-        { ARG_NEW_UUID, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { ARG_NEW_TYPE, MP_ARG_INT, {.u_int = UBLUEPY_SERVICE_PRIMARY} },
-    };
-
-    // parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    ubluepy_service_obj_t *s = m_new_obj(ubluepy_service_obj_t);
-    s->base.type = type;
-
-    mp_obj_t uuid_obj = args[ARG_NEW_UUID].u_obj;
-
-    if (uuid_obj == MP_OBJ_NULL) {
-        return MP_OBJ_FROM_PTR(s);
-    }
-
-    if (MP_OBJ_IS_TYPE(uuid_obj, &bleio_uuid_type)) {
-        s->p_uuid = MP_OBJ_TO_PTR(uuid_obj);
-
-        uint8_t type = args[ARG_NEW_TYPE].u_int;
-        if (type > 0 &&  type <= UBLUEPY_SERVICE_PRIMARY) {
-            s->type = type;
-        } else {
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
-                      translate("Invalid Service type")));
-        }
-
-        (void)ble_drv_service_add(s);
-
-    } else {
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
-                  translate("Invalid UUID parameter")));
-    }
-
-    // clear reference to peripheral
-    s->p_periph = NULL;
-    s->char_list = mp_obj_new_list(0, NULL);
-
-    return MP_OBJ_FROM_PTR(s);
-}
-
-/// \method addCharacteristic(Characteristic)
-/// Add Characteristic to the Service.
-///
-STATIC mp_obj_t service_add_characteristic(mp_obj_t self_in, mp_obj_t characteristic) {
-    ubluepy_service_obj_t        * self   = MP_OBJ_TO_PTR(self_in);
-    bleio_characteristic_obj_t * p_char = MP_OBJ_TO_PTR(characteristic);
-
-    p_char->service_handle = self->handle;
-
-    bool retval = ble_drv_characteristic_add(p_char);
-    if (retval) {
-        p_char->service = self_in;
-    }
-
-    mp_obj_list_append(self->char_list, characteristic);
-
-    // return mp_obj_new_bool(retval);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_service_add_char_obj, service_add_characteristic);
-
-/// \method getCharacteristics()
-/// Return list with all characteristics registered in the Service.
-///
-STATIC mp_obj_t service_get_chars(mp_obj_t self_in) {
-    ubluepy_service_obj_t * self = MP_OBJ_TO_PTR(self_in);
-
-    return self->char_list;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_service_get_chars_obj, service_get_chars);
-
-/// \method getCharacteristic(UUID)
-/// Return Characteristic with the given UUID.
-///
-STATIC mp_obj_t service_get_characteristic(mp_obj_t self_in, mp_obj_t uuid) {
-    ubluepy_service_obj_t * self   = MP_OBJ_TO_PTR(self_in);
-    bleio_uuid_obj_t    * p_uuid = MP_OBJ_TO_PTR(uuid);
-
-    // validate that there is an UUID object passed in as parameter
-    if (!(MP_OBJ_IS_TYPE(uuid, &bleio_uuid_type))) {
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
-                  translate("Invalid UUID parameter")));
-    }
-
-    mp_obj_t * chars     = NULL;
-    mp_uint_t  num_chars = 0;
-    mp_obj_get_array(self->char_list, &num_chars, &chars);
-
-    for (uint8_t i = 0; i < num_chars; i++) {
-        bleio_characteristic_obj_t * p_char = (bleio_characteristic_obj_t *)chars[i];
-
-        bool type_match = p_char->uuid->type == p_uuid->type;
-        bool uuid_match = ((uint16_t)(*(uint16_t *)&p_char->uuid->value[0]) ==
-                           (uint16_t)(*(uint16_t *)&p_uuid->value[0]));
-
-        if (type_match && uuid_match) {
-            return MP_OBJ_FROM_PTR(p_char);
-        }
-    }
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_service_get_char_obj, service_get_characteristic);
-
-/// \method uuid()
-/// Get UUID instance of the Service.
-///
-STATIC mp_obj_t service_uuid(mp_obj_t self_in) {
-    ubluepy_service_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_service_get_uuid_obj, service_uuid);
-
-STATIC const mp_rom_map_elem_t ubluepy_service_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_getCharacteristic),  MP_ROM_PTR(&ubluepy_service_get_char_obj) },
-    { MP_ROM_QSTR(MP_QSTR_addCharacteristic),  MP_ROM_PTR(&ubluepy_service_add_char_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getCharacteristics), MP_ROM_PTR(&ubluepy_service_get_chars_obj) },
-#if 0
-	// Properties
-    { MP_ROM_QSTR(MP_QSTR_peripheral), MP_ROM_PTR(&ubluepy_service_get_peripheral_obj) },
-#endif
-    { MP_ROM_QSTR(MP_QSTR_uuid),       MP_ROM_PTR(&ubluepy_service_get_uuid_obj) },
-    { MP_ROM_QSTR(MP_QSTR_PRIMARY),    MP_ROM_INT(UBLUEPY_SERVICE_PRIMARY) },
-    { MP_ROM_QSTR(MP_QSTR_SECONDARY),  MP_ROM_INT(UBLUEPY_SERVICE_SECONDARY) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(ubluepy_service_locals_dict, ubluepy_service_locals_dict_table);
-
-const mp_obj_type_t ubluepy_service_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Service,
-    .print = ubluepy_service_print,
-    .make_new = ubluepy_service_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_service_locals_dict
-};
-
-#endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL