Handle None for BLE name; fix ScanEntry bug; compile issue

2 files changed, 2 insertions, 4 deletions

diff --git a/shared-bindings/bleio/Peripheral.c b/shared-bindings/bleio/Peripheral.c
index ca703bd53..4492a8e26 100644
--- a/shared-bindings/bleio/Peripheral.c
+++ b/shared-bindings/bleio/Peripheral.c
@@ -117,11 +117,8 @@ STATIC mp_obj_t bleio_peripheral_make_new(const mp_obj_type_t *type, size_t n_ar
     }
 
     const mp_obj_t name = args[ARG_name].u_obj;
-    if (name == MP_OBJ_NULL) {
+    if (name == MP_OBJ_NULL || name == mp_const_none) {
         self->name = mp_obj_new_str(default_name, strlen(default_name));
-    } else if (name == mp_const_none) {
-        // Make None be the empty string.
-        self->name =  MP_OBJ_NEW_QSTR(MP_QSTR_);
     } else if (MP_OBJ_IS_STR(name)) {
         self->name = name;
     } else {
diff --git a/shared-bindings/bleio/ScanEntry.c b/shared-bindings/bleio/ScanEntry.c
index 475bade15..f66b3df4b 100644
--- a/shared-bindings/bleio/ScanEntry.c
+++ b/shared-bindings/bleio/ScanEntry.c
@@ -55,6 +55,7 @@ STATIC mp_obj_t bleio_scanentry_get_address(mp_obj_t self_in) {
     bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     bleio_address_obj_t *address = m_new_obj(bleio_address_obj_t);
+    address->base.type = &bleio_address_type;
     memcpy(address->bytes, self->address.bytes, NUM_BLEIO_ADDRESS_BYTES);
     address->type = self->address.type;
     return MP_OBJ_TO_PTR(address);