Skip to content

Commit def76fe

Browse files
jimmodpgeorge
jimmo
authored and
dpgeorge
committed
all: Use MP_ERROR_TEXT for all error messages.
1 parent 85858e7 commit def76fe

File tree

192 files changed

+823
-919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+823
-919
lines changed

‎drivers/dht/dht.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ STATIC mp_obj_t dht_readinto(mp_obj_t pin_in, mp_obj_t buf_in) {
4545
mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_WRITE);
4646

4747
if (bufinfo.len < 5) {
48-
mp_raise_ValueError("buffer too small");
48+
mp_raise_ValueError(MP_ERROR_TEXT("buffer too small"));
4949
}
5050

5151
// issue start command

‎examples/natmod/features1/features1.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ STATIC mp_int_t fibonacci_helper(mp_int_t x) {
4545
STATIC mp_obj_t fibonacci(mp_obj_t x_in) {
4646
mp_int_t x = mp_obj_get_int(x_in);
4747
if (x < 0) {
48-
mp_raise_ValueError("can't compute negative Fibonacci number");
48+
mp_raise_ValueError(MP_ERROR_TEXT("can't compute negative Fibonacci number"));
4949
}
5050
return mp_obj_new_int(fibonacci_helper(x));
5151
}

‎examples/natmod/features2/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ STATIC mp_obj_t productf(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_o
5252
mp_buffer_info_t bufinfo;
5353
mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_RW);
5454
if (bufinfo.typecode != 'f') {
55-
mp_raise_ValueError("expecting float array");
55+
mp_raise_ValueError(MP_ERROR_TEXT("expecting float array"));
5656
}
5757

5858
// Compute product, store result back in first element of array

‎examples/natmod/ure/ure.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void mp_stack_check(void) {
1515
// Assumes descending stack on target
1616
volatile char dummy;
1717
if (stack_top - &dummy >= STACK_LIMIT) {
18-
mp_raise_msg(&mp_type_RuntimeError, "maximum recursion depth exceeded");
18+
mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("maximum recursion depth exceeded"));
1919
}
2020
}
2121

‎extmod/machine_i2c.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ STATIC mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, s
327327
extern mp_obj_t MICROPY_PY_MACHINE_I2C_MAKE_NEW(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args);
328328
return MICROPY_PY_MACHINE_I2C_MAKE_NEW(type, n_args, n_kw, args);
329329
#else
330-
mp_raise_ValueError("invalid I2C peripheral");
330+
mp_raise_ValueError(MP_ERROR_TEXT("invalid I2C peripheral"));
331331
#endif
332332
}
333333
--n_args;
@@ -367,7 +367,7 @@ STATIC mp_obj_t machine_i2c_start(mp_obj_t self_in) {
367367
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
368368
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
369369
if (i2c_p->start == NULL) {
370-
mp_raise_msg(&mp_type_OSError, "I2C operation not supported");
370+
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
371371
}
372372
int ret = i2c_p->start(self);
373373
if (ret != 0) {
@@ -381,7 +381,7 @@ STATIC mp_obj_t machine_i2c_stop(mp_obj_t self_in) {
381381
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
382382
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
383383
if (i2c_p->stop == NULL) {
384-
mp_raise_msg(&mp_type_OSError, "I2C operation not supported");
384+
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
385385
}
386386
int ret = i2c_p->stop(self);
387387
if (ret != 0) {
@@ -395,7 +395,7 @@ STATIC mp_obj_t machine_i2c_readinto(size_t n_args, const mp_obj_t *args) {
395395
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
396396
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
397397
if (i2c_p->read == NULL) {
398-
mp_raise_msg(&mp_type_OSError, "I2C operation not supported");
398+
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
399399
}
400400

401401
// get the buffer to read into
@@ -419,7 +419,7 @@ STATIC mp_obj_t machine_i2c_write(mp_obj_t self_in, mp_obj_t buf_in) {
419419
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
420420
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
421421
if (i2c_p->write == NULL) {
422-
mp_raise_msg(&mp_type_OSError, "I2C operation not supported");
422+
mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
423423
}
424424

425425
// get the buffer to write from

‎extmod/machine_mem.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
STATIC uintptr_t machine_mem_get_addr(mp_obj_t addr_o, uint align) {
4343
uintptr_t addr = mp_obj_int_get_truncated(addr_o);
4444
if ((addr & (align - 1)) != 0) {
45-
mp_raise_msg_varg(&mp_type_ValueError, "address %08x is not aligned to %d bytes", addr, align);
45+
mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("address %08x is not aligned to %d bytes"), addr, align);
4646
}
4747
return addr;
4848
}

‎extmod/machine_spi.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ mp_obj_t mp_machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
5252
extern mp_obj_t MICROPY_PY_MACHINE_SPI_MAKE_NEW(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args);
5353
return MICROPY_PY_MACHINE_SPI_MAKE_NEW(type, n_args, n_kw, args);
5454
#else
55-
mp_raise_ValueError("invalid SPI peripheral");
55+
mp_raise_ValueError(MP_ERROR_TEXT("invalid SPI peripheral"));
5656
#endif
5757
}
5858
--n_args;
@@ -119,7 +119,7 @@ STATIC mp_obj_t mp_machine_spi_write_readinto(mp_obj_t self, mp_obj_t wr_buf, mp
119119
mp_buffer_info_t dest;
120120
mp_get_buffer_raise(rd_buf, &dest, MP_BUFFER_WRITE);
121121
if (src.len != dest.len) {
122-
mp_raise_ValueError("buffers must be the same length");
122+
mp_raise_ValueError(MP_ERROR_TEXT("buffers must be the same length"));
123123
}
124124
mp_machine_spi_transfer(self, src.len, src.buf, dest.buf);
125125
return mp_const_none;
@@ -202,15 +202,15 @@ STATIC mp_obj_t mp_machine_soft_spi_make_new(const mp_obj_type_t *type, size_t n
202202
self->spi.polarity = args[ARG_polarity].u_int;
203203
self->spi.phase = args[ARG_phase].u_int;
204204
if (args[ARG_bits].u_int != 8) {
205-
mp_raise_ValueError("bits must be 8");
205+
mp_raise_ValueError(MP_ERROR_TEXT("bits must be 8"));
206206
}
207207
if (args[ARG_firstbit].u_int != MICROPY_PY_MACHINE_SPI_MSB) {
208-
mp_raise_ValueError("firstbit must be MSB");
208+
mp_raise_ValueError(MP_ERROR_TEXT("firstbit must be MSB"));
209209
}
210210
if (args[ARG_sck].u_obj == MP_OBJ_NULL
211211
|| args[ARG_mosi].u_obj == MP_OBJ_NULL
212212
|| args[ARG_miso].u_obj == MP_OBJ_NULL) {
213-
mp_raise_ValueError("must specify all of sck/mosi/miso");
213+
mp_raise_ValueError(MP_ERROR_TEXT("must specify all of sck/mosi/miso"));
214214
}
215215
self->spi.sck = mp_hal_get_pin_obj(args[ARG_sck].u_obj);
216216
self->spi.mosi = mp_hal_get_pin_obj(args[ARG_mosi].u_obj);

‎extmod/modbluetooth.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ STATIC mp_obj_t bluetooth_uuid_make_new(const mp_obj_type_t *type, size_t n_args
9191
self->type = MP_BLUETOOTH_UUID_TYPE_16;
9292
mp_int_t value = mp_obj_get_int(all_args[0]);
9393
if (value > 65535) {
94-
mp_raise_ValueError("invalid UUID");
94+
mp_raise_ValueError(MP_ERROR_TEXT("invalid UUID"));
9595
}
9696
self->data[0] = value & 0xff;
9797
self->data[1] = (value >> 8) & 0xff;
@@ -112,12 +112,12 @@ STATIC mp_obj_t bluetooth_uuid_make_new(const mp_obj_type_t *type, size_t n_args
112112
continue;
113113
}
114114
if (!unichar_isxdigit(c)) {
115-
mp_raise_ValueError("invalid char in UUID");
115+
mp_raise_ValueError(MP_ERROR_TEXT("invalid char in UUID"));
116116
}
117117
c = unichar_xdigit_value(c);
118118
uuid_i--;
119119
if (uuid_i < 0) {
120-
mp_raise_ValueError("UUID too long");
120+
mp_raise_ValueError(MP_ERROR_TEXT("UUID too long"));
121121
}
122122
if (uuid_i % 2 == 0) {
123123
// lower nibble
@@ -128,7 +128,7 @@ STATIC mp_obj_t bluetooth_uuid_make_new(const mp_obj_type_t *type, size_t n_args
128128
}
129129
}
130130
if (uuid_i > 0) {
131-
mp_raise_ValueError("UUID too short");
131+
mp_raise_ValueError(MP_ERROR_TEXT("UUID too short"));
132132
}
133133
}
134134
}
@@ -283,7 +283,7 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
283283
if (kwargs->used == 0) {
284284
// Get config value
285285
if (n_args != 2) {
286-
mp_raise_TypeError("must query one param");
286+
mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
287287
}
288288

289289
switch (mp_obj_str_get_qstr(args[1])) {
@@ -295,12 +295,12 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
295295
case MP_QSTR_rxbuf:
296296
return mp_obj_new_int(self->ringbuf.size);
297297
default:
298-
mp_raise_ValueError("unknown config param");
298+
mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
299299
}
300300
} else {
301301
// Set config value(s)
302302
if (n_args != 1) {
303-
mp_raise_TypeError("can't specify pos and kw args");
303+
mp_raise_TypeError(MP_ERROR_TEXT("can't specify pos and kw args"));
304304
}
305305

306306
for (size_t i = 0; i < kwargs->alloc; ++i) {
@@ -341,7 +341,7 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
341341
break;
342342
}
343343
default:
344-
mp_raise_ValueError("unknown config param");
344+
mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
345345
}
346346
}
347347
}
@@ -361,7 +361,7 @@ STATIC mp_obj_t bluetooth_ble_irq(size_t n_args, const mp_obj_t *pos_args, mp_ma
361361
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
362362
mp_obj_t callback = args[ARG_handler].u_obj;
363363
if (callback != mp_const_none && !mp_obj_is_callable(callback)) {
364-
mp_raise_ValueError("invalid callback");
364+
mp_raise_ValueError(MP_ERROR_TEXT("invalid callback"));
365365
}
366366

367367
// Update the callback.
@@ -414,7 +414,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bluetooth_ble_gap_advertise_obj, 1, bluetooth_
414414

415415
STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t characteristics_in, uint16_t **handles, size_t *num_handles) {
416416
if (!mp_obj_is_type(uuid_in, &bluetooth_uuid_type)) {
417-
mp_raise_ValueError("invalid service UUID");
417+
mp_raise_ValueError(MP_ERROR_TEXT("invalid service UUID"));
418418
}
419419
mp_obj_bluetooth_uuid_t *service_uuid = MP_OBJ_TO_PTR(uuid_in);
420420

@@ -451,11 +451,11 @@ STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t character
451451
mp_obj_get_array(characteristic_obj, &characteristic_len, &characteristic_items);
452452

453453
if (characteristic_len < 2 || characteristic_len > 3) {
454-
mp_raise_ValueError("invalid characteristic tuple");
454+
mp_raise_ValueError(MP_ERROR_TEXT("invalid characteristic tuple"));
455455
}
456456
mp_obj_t uuid_obj = characteristic_items[0];
457457
if (!mp_obj_is_type(uuid_obj, &bluetooth_uuid_type)) {
458-
mp_raise_ValueError("invalid characteristic UUID");
458+
mp_raise_ValueError(MP_ERROR_TEXT("invalid characteristic UUID"));
459459
}
460460

461461
(*handles)[handle_index++] = 0xffff;
@@ -487,7 +487,7 @@ STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t character
487487
mp_obj_get_array_fixed_n(descriptor_obj, 2, &descriptor_items);
488488
mp_obj_t desc_uuid_obj = descriptor_items[0];
489489
if (!mp_obj_is_type(desc_uuid_obj, &bluetooth_uuid_type)) {
490-
mp_raise_ValueError("invalid descriptor UUID");
490+
mp_raise_ValueError(MP_ERROR_TEXT("invalid descriptor UUID"));
491491
}
492492

493493
descriptor_uuids[descriptor_index] = MP_OBJ_TO_PTR(desc_uuid_obj);
@@ -567,7 +567,7 @@ STATIC mp_obj_t bluetooth_ble_gap_connect(size_t n_args, const mp_obj_t *args) {
567567
mp_buffer_info_t bufinfo = {0};
568568
mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
569569
if (bufinfo.len != 6) {
570-
mp_raise_ValueError("invalid addr");
570+
mp_raise_ValueError(MP_ERROR_TEXT("invalid addr"));
571571
}
572572
mp_int_t scan_duration_ms = MP_BLUETOOTH_CONNECT_DEFAULT_SCAN_DURATION_MS;
573573
if (n_args == 4) {

‎extmod/modframebuf.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ STATIC mp_obj_t framebuf_make_new(const mp_obj_type_t *type, size_t n_args, size
300300
case FRAMEBUF_GS8:
301301
break;
302302
default:
303-
mp_raise_ValueError("invalid format");
303+
mp_raise_ValueError(MP_ERROR_TEXT("invalid format"));
304304
}
305305

306306
return MP_OBJ_FROM_PTR(o);

‎extmod/modlwip.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ STATIC mp_obj_t lwip_slip_make_new(mp_obj_t type_in, size_t n_args, size_t n_kw,
144144

145145
ip_addr_t iplocal, ipremote;
146146
if (!ipaddr_aton(mp_obj_str_get_str(args[1]), &iplocal)) {
147-
mp_raise_ValueError("not a valid local IP");
147+
mp_raise_ValueError(MP_ERROR_TEXT("not a valid local IP"));
148148
}
149149
if (!ipaddr_aton(mp_obj_str_get_str(args[2]), &ipremote)) {
150-
mp_raise_ValueError("not a valid remote IP");
150+
mp_raise_ValueError(MP_ERROR_TEXT("not a valid remote IP"));
151151
}
152152

153153
struct netif *n = &lwip_slip_obj.lwip_netif;
154154
if (netif_add(n, &iplocal, IP_ADDR_BROADCAST, &ipremote, NULL, slipif_init, ip_input) == NULL) {
155-
mp_raise_ValueError("out of memory");
155+
mp_raise_ValueError(MP_ERROR_TEXT("out of memory"));
156156
}
157157
netif_set_up(n);
158158
netif_set_default(n);

0 commit comments

Comments
 (0)