Skip to content

Commit 525dad7

Browse files
committed
Add RuntimeError_varg and fix imx capitalization
1 parent a56e97d commit 525dad7

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

ports/mimxrt10xx/common-hal/busio/SPI.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,10 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self, const uint8_t *data_ou
367367
if (len == 0) {
368368
return true;
369369
}
370-
if (self->MOSI == NULL && data_out != NULL) {
370+
if (self->mosi == NULL && data_out != NULL) {
371371
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_mosi);
372372
}
373-
if (self->MISO == NULL && data_in != NULL) {
373+
if (self->miso == NULL && data_in != NULL) {
374374
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_miso);
375375
}
376376

py/runtime.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,6 +1655,13 @@ NORETURN MP_COLD void mp_raise_RuntimeError(const compressed_string_t *msg) {
16551655
mp_raise_msg(&mp_type_RuntimeError, msg);
16561656
}
16571657

1658+
NORETURN MP_COLD void mp_raise_RuntimeError_varg(const compressed_string_t *fmt, ...) {
1659+
va_list argptr;
1660+
va_start(argptr,fmt);
1661+
mp_raise_msg_vlist(&mp_type_RuntimeError, fmt, argptr);
1662+
va_end(argptr);
1663+
}
1664+
16581665
NORETURN MP_COLD void mp_raise_ImportError(const compressed_string_t *msg) {
16591666
mp_raise_msg(&mp_type_ImportError, msg);
16601667
}

py/runtime.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ NORETURN void mp_raise_TypeError(const compressed_string_t *msg);
219219
NORETURN void mp_raise_TypeError_varg(const compressed_string_t *fmt, ...);
220220
NORETURN void mp_raise_AttributeError(const compressed_string_t *msg);
221221
NORETURN void mp_raise_RuntimeError(const compressed_string_t *msg);
222+
NORETURN void mp_raise_RuntimeError_varg(const compressed_string_t *fmt, ...);
222223
NORETURN void mp_raise_ImportError(const compressed_string_t *msg);
223224
NORETURN void mp_raise_IndexError(const compressed_string_t *msg);
224225
NORETURN void mp_raise_IndexError_varg(const compressed_string_t *msg, ...);

0 commit comments

Comments
 (0)