diff options
| author | Jim Mussared | 2020-03-02 22:35:22 +1100 |
|---|---|---|
| committer | Damien George | 2020-04-05 15:02:06 +1000 |
| commit | def76fe4d9bbc2c342594dc05861b24d7165d274 (patch) | |
| tree | d04ad778e2421de0a85835227ba5bcb08562ec24 /ports/zephyr | |
| parent | 85858e72dfdc3e941c2e620e94de05ad663138b1 (diff) | |
all: Use MP_ERROR_TEXT for all error messages.
Diffstat (limited to 'ports/zephyr')
| -rw-r--r-- | ports/zephyr/machine_i2c.c | 8 | ||||
| -rw-r--r-- | ports/zephyr/machine_pin.c | 6 | ||||
| -rw-r--r-- | ports/zephyr/modzsensor.c | 2 | ||||
| -rw-r--r-- | ports/zephyr/zephyr_storage.c | 10 |
4 files changed, 13 insertions, 13 deletions
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c index 0f16095cb..f00c1d342 100644 --- a/ports/zephyr/machine_i2c.c +++ b/ports/zephyr/machine_i2c.c @@ -68,19 +68,19 @@ mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz struct device *dev = device_get_binding(dev_name); if (dev == NULL) { - mp_raise_ValueError("device not found"); + mp_raise_ValueError(MP_ERROR_TEXT("device not found")); } if ((args[ARG_scl].u_obj != MP_OBJ_NULL) || (args[ARG_sda].u_obj != MP_OBJ_NULL)) { - mp_raise_NotImplementedError("explicit choice of scl/sda is not implemented"); + mp_raise_NotImplementedError(MP_ERROR_TEXT("explicit choice of scl/sda is not implemented")); } if ((args[ARG_freq].u_obj != MP_OBJ_NULL)) { - mp_raise_NotImplementedError("explicit choice of freq is not implemented"); + mp_raise_NotImplementedError(MP_ERROR_TEXT("explicit choice of freq is not implemented")); } if ((args[ARG_timeout].u_obj != MP_OBJ_NULL)) { - mp_raise_NotImplementedError("explicit choice of timeout is not implemented"); + mp_raise_NotImplementedError(MP_ERROR_TEXT("explicit choice of timeout is not implemented")); } machine_hard_i2c_obj_t *self = m_new_obj(machine_hard_i2c_obj_t); diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c index 032be7d8e..ad5f54baa 100644 --- a/ports/zephyr/machine_pin.c +++ b/ports/zephyr/machine_pin.c @@ -74,7 +74,7 @@ STATIC mp_obj_t machine_pin_obj_init_helper(machine_pin_obj_t *self, size_t n_ar int ret = gpio_pin_configure(self->port, self->pin, mode | pull | init); if (ret) { - mp_raise_ValueError("invalid pin"); + mp_raise_ValueError(MP_ERROR_TEXT("invalid pin")); } return mp_const_none; @@ -86,7 +86,7 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, // get the wanted port if (!mp_obj_is_type(args[0], &mp_type_tuple)) { - mp_raise_ValueError("Pin id must be tuple of (\"GPIO_x\", pin#)"); + mp_raise_ValueError(MP_ERROR_TEXT("Pin id must be tuple of (\"GPIO_x\", pin#)")); } mp_obj_t *items; mp_obj_get_array_fixed_n(args[0], 2, &items); @@ -94,7 +94,7 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, int wanted_pin = mp_obj_get_int(items[1]); struct device *wanted_port = device_get_binding(drv_name); if (!wanted_port) { - mp_raise_ValueError("invalid port"); + mp_raise_ValueError(MP_ERROR_TEXT("invalid port")); } machine_pin_obj_t *pin = m_new_obj(machine_pin_obj_t); diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c index 736cd221e..1dbf34568 100644 --- a/ports/zephyr/modzsensor.c +++ b/ports/zephyr/modzsensor.c @@ -44,7 +44,7 @@ STATIC mp_obj_t sensor_make_new(const mp_obj_type_t *type, size_t n_args, size_t o->base.type = type; o->dev = device_get_binding(mp_obj_str_get_str(args[0])); if (o->dev == NULL) { - mp_raise_ValueError("dev not found"); + mp_raise_ValueError(MP_ERROR_TEXT("dev not found")); } return MP_OBJ_FROM_PTR(o); } diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c index c592881e1..c533cb8fd 100644 --- a/ports/zephyr/zephyr_storage.c +++ b/ports/zephyr/zephyr_storage.c @@ -59,15 +59,15 @@ STATIC mp_obj_t zephyr_disk_access_make_new(const mp_obj_type_t *type, size_t n_ self->pdrv = mp_obj_str_get_str(args[0]); if (disk_access_init(self->pdrv) != 0) { - mp_raise_ValueError("disk not found"); + mp_raise_ValueError(MP_ERROR_TEXT("disk not found")); } if (disk_access_ioctl(self->pdrv, DISK_IOCTL_GET_SECTOR_SIZE, &self->block_size)) { - mp_raise_ValueError("unable to get sector size"); + mp_raise_ValueError(MP_ERROR_TEXT("unable to get sector size")); } if (disk_access_ioctl(self->pdrv, DISK_IOCTL_GET_SECTOR_COUNT, &self->block_count)) { - mp_raise_ValueError("unable to get block count"); + mp_raise_ValueError(MP_ERROR_TEXT("unable to get block count")); } return MP_OBJ_FROM_PTR(self); @@ -162,11 +162,11 @@ STATIC mp_obj_t zephyr_flash_area_make_new(const mp_obj_type_t *type, size_t n_a self->block_size = mp_obj_get_int(args[1]); if (self->block_size <= 0) { - mp_raise_ValueError("invalid block size"); + mp_raise_ValueError(MP_ERROR_TEXT("invalid block size")); } if (flash_area_open(self->id, &self->area) != 0) { - mp_raise_ValueError("unable to open flash area"); + mp_raise_ValueError(MP_ERROR_TEXT("unable to open flash area")); } self->block_count = self->area->fa_size / self->block_size; |
