finish Makefile refactoring; nrf builds work

3 files changed, 4 insertions, 4 deletions

diff --git a/shared-bindings/bleio/Address.c b/shared-bindings/bleio/Address.c
index 6cf495d83..b7c76b7b2 100644
--- a/shared-bindings/bleio/Address.c
+++ b/shared-bindings/bleio/Address.c
@@ -88,7 +88,7 @@ STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args,
         GET_STR_DATA_LEN(address, str, str_len);
 
         size_t value_index = 0;
-        size_t str_index = str_len;
+        int str_index = str_len;
         bool error = false;
 
         // Loop until fewer than two characters left.
@@ -138,7 +138,7 @@ STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args,
 STATIC void bleio_address_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     bleio_address_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_printf(print, "Address('"HEX2_FMT":"HEX2_FMT":"HEX2_FMT":"HEX2_FMT":"HEX2_FMT":"HEX2_FMT"')",
+    mp_printf(print, "Address('%02x:%02x:%02x:%02x:%02x:%02x')",
         self->value[5], self->value[4], self->value[3],
         self->value[2], self->value[1], self->value[0]);
 }
diff --git a/shared-bindings/bleio/ScanEntry.c b/shared-bindings/bleio/ScanEntry.c
index b4a3c5504..3a57711ae 100644
--- a/shared-bindings/bleio/ScanEntry.c
+++ b/shared-bindings/bleio/ScanEntry.c
@@ -108,7 +108,7 @@ STATIC mp_obj_t scanentry_get_name(mp_obj_t self_in);
 
 STATIC void bleio_scanentry_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     bleio_scanentry_obj_t *self = (bleio_scanentry_obj_t *)self_in;
-    mp_printf(print, "ScanEntry(address: "HEX2_FMT":"HEX2_FMT":"HEX2_FMT":"HEX2_FMT":"HEX2_FMT":"HEX2_FMT"",
+    mp_printf(print, "ScanEntry(address: %02x:%02x:%02x:%02x:%02x:%02x",
         self->address.value[5], self->address.value[4], self->address.value[3],
         self->address.value[1], self->address.value[1], self->address.value[0]);
 
diff --git a/shared-bindings/bleio/UUID.c b/shared-bindings/bleio/UUID.c
index 8b868a1ae..c6ad9e626 100644
--- a/shared-bindings/bleio/UUID.c
+++ b/shared-bindings/bleio/UUID.c
@@ -79,7 +79,7 @@ STATIC mp_obj_t bleio_uuid_make_new(const mp_obj_type_t *type, size_t n_args, co
                 len == 36 && chars[8] == '-' && chars[13] == '-' && chars[18] == '-' && chars[23] == '-';
             if (good_uuid) {
                 size_t hex_idx = 0;
-                for (int i = 0; i < len; i++) {
+                for (size_t i = 0; i < len; i++) {
                     if (unichar_isxdigit(chars[i])) {
                         hex[hex_idx] = chars[i];
                         hex_idx++;