From 4bc24c4f6084e414f0fb00299aae7d7cfdb76aba Mon Sep 17 00:00:00 2001 From: arturo182 Date: Fri, 31 Aug 2018 21:34:01 +0200 Subject: bleio: Fix errors after rebase --- shared-bindings/bleio/Address.c | 4 ++-- shared-bindings/bleio/Characteristic.c | 2 +- shared-bindings/bleio/Device.c | 12 ++++++------ shared-bindings/bleio/ScanEntry.c | 2 +- shared-bindings/bleio/Service.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'shared-bindings') diff --git a/shared-bindings/bleio/Address.c b/shared-bindings/bleio/Address.c index 7ac42c740..ec23ff207 100644 --- a/shared-bindings/bleio/Address.c +++ b/shared-bindings/bleio/Address.c @@ -98,13 +98,13 @@ STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args, i -= is_long ? 3 : 2; } } else { - mp_raise_ValueError("Wrong address length"); + mp_raise_ValueError(translate("Wrong address length")); } } else if (MP_OBJ_IS_TYPE(address, &mp_type_bytearray) || MP_OBJ_IS_TYPE(address, &mp_type_bytes)) { mp_buffer_info_t buf_info; mp_get_buffer_raise(address, &buf_info, MP_BUFFER_READ); if (buf_info.len != BLEIO_ADDRESS_BYTES) { - mp_raise_ValueError("Wrong number of bytes provided"); + mp_raise_ValueError(translate("Wrong number of bytes provided")); } for (size_t b = 0; b < BLEIO_ADDRESS_BYTES; ++b) { diff --git a/shared-bindings/bleio/Characteristic.c b/shared-bindings/bleio/Characteristic.c index 3563d3895..369f3f991 100644 --- a/shared-bindings/bleio/Characteristic.c +++ b/shared-bindings/bleio/Characteristic.c @@ -122,7 +122,7 @@ STATIC mp_obj_t bleio_characteristic_make_new(const mp_obj_type_t *type, size_t self->uuid = MP_OBJ_TO_PTR(uuid); } else { nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, - "Invalid UUID parameter")); + translate("Invalid UUID parameter"))); } common_hal_bleio_characteristic_construct(self); diff --git a/shared-bindings/bleio/Device.c b/shared-bindings/bleio/Device.c index 64cfb762f..94834ef7c 100644 --- a/shared-bindings/bleio/Device.c +++ b/shared-bindings/bleio/Device.c @@ -194,7 +194,7 @@ STATIC mp_obj_t bleio_device_make_new(const mp_obj_type_t *type, size_t n_args, self->address.type = scan_entry->address.type; memcpy(self->address.value, scan_entry->address.value, BLEIO_ADDRESS_BYTES); } else { - self->name = mp_obj_new_str(default_name, strlen(default_name), false); + self->name = mp_obj_new_str(default_name, strlen(default_name)); common_hal_bleio_adapter_get_address(&self->address); } @@ -207,7 +207,7 @@ STATIC mp_obj_t bleio_device_add_service(mp_obj_t self_in, mp_obj_t service_in) if (!self->is_peripheral) { nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, - "Can't add services in Central mode")); + translate("Can't add services in Central mode"))); } service->device = self; @@ -223,7 +223,7 @@ STATIC mp_obj_t bleio_device_connect(mp_obj_t self_in) { if (self->is_peripheral) { nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, - "Can't connect in Peripheral mode")); + translate("Can't connect in Peripheral mode"))); } common_hal_bleio_device_connect(self); @@ -253,7 +253,7 @@ static mp_obj_t bleio_device_set_name(mp_obj_t self_in, mp_obj_t value) { if (!self->is_peripheral) { nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, - "Can't change the name in Central mode")); + translate("Can't change the name in Central mode"))); } self->name = value; @@ -274,7 +274,7 @@ STATIC mp_obj_t bleio_device_start_advertising(mp_uint_t n_args, const mp_obj_t if (!self->is_peripheral) { nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, - "Can't advertise in Central mode")); + translate("Can't advertise in Central mode"))); } enum { ARG_connectable, ARG_data }; @@ -310,7 +310,7 @@ STATIC mp_obj_t bleio_device_stop_advertising(mp_obj_t self_in) { if (!self->is_peripheral) { nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, - "Can't advertise in Central mode")); + translate("Can't advertise in Central mode"))); } common_hal_bleio_device_stop_advertising(self); diff --git a/shared-bindings/bleio/ScanEntry.c b/shared-bindings/bleio/ScanEntry.c index 2eed24cd8..e452c7267 100644 --- a/shared-bindings/bleio/ScanEntry.c +++ b/shared-bindings/bleio/ScanEntry.c @@ -177,7 +177,7 @@ STATIC mp_obj_t scanentry_get_name(mp_obj_t self_in) { return mp_const_none; } - return mp_obj_new_str((const char*)name, name_len - 1, false); + return mp_obj_new_str((const char*)name, name_len - 1); } STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluepy_scanentry_get_name_obj, scanentry_get_name); diff --git a/shared-bindings/bleio/Service.c b/shared-bindings/bleio/Service.c index 6e112880a..2d09cbc3c 100644 --- a/shared-bindings/bleio/Service.c +++ b/shared-bindings/bleio/Service.c @@ -102,7 +102,7 @@ STATIC mp_obj_t bleio_service_make_new(const mp_obj_type_t *type, size_t n_args, self->uuid = MP_OBJ_TO_PTR(uuid); } else { nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, - "Invalid UUID parameter")); + translate("Invalid UUID parameter"))); } return MP_OBJ_FROM_PTR(self); -- cgit v1.2.3