djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2cslave: Fix missing translate() when raising exceptions

Browse Source 
The translate() changes where applied after travis had checked the
i2cslave PR so this wasn't caught.
This commit is contained in:
Noralf Trønnes 2018-08-18 16:00:06 +02:00
parent 1a6f6ff8e4
commit eefb6842a0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
View File

@ -42,7 +42,7 @@ void common_hal_i2cslave_i2c_slave_construct(i2cslave_i2c_slave_obj_t *self,
uint32_t sda_pinmux, scl_pinmux; uint32_t sda_pinmux, scl_pinmux;
Sercom *sercom = samd_i2c_get_sercom(scl, sda, &sercom_index, &sda_pinmux, &scl_pinmux); Sercom *sercom = samd_i2c_get_sercom(scl, sda, &sercom_index, &sda_pinmux, &scl_pinmux);
if (sercom == NULL) { if (sercom == NULL) {
mp_raise_ValueError("Invalid pins"); mp_raise_ValueError(translate("Invalid pins"));
} }
self->sercom = sercom; self->sercom = sercom;

6
shared-bindings/i2cslave/I2CSlave.c
View File

@ -95,16 +95,16 @@ STATIC mp_obj_t i2cslave_i2c_slave_make_new(const mp_obj_type_t *type, size_t n_
while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) { while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
mp_int_t value; mp_int_t value;
if (!mp_obj_get_int_maybe(item, &value)) { if (!mp_obj_get_int_maybe(item, &value)) {
mp_raise_TypeError("can't convert address to int"); mp_raise_TypeError(translate("can't convert address to int"));
} }
if (value < 0x00 || value > 0x7f) { if (value < 0x00 || value > 0x7f) {
mp_raise_ValueError("address out of bounds"); mp_raise_ValueError(translate("address out of bounds"));
} }
addresses = m_renew(uint8_t, addresses, i, i + 1); addresses = m_renew(uint8_t, addresses, i, i + 1);
addresses[i++] = value; addresses[i++] = value;
} }
if (i == 0) { if (i == 0) {
mp_raise_ValueError("addresses is empty"); mp_raise_ValueError(translate("addresses is empty"));
} }
common_hal_i2cslave_i2c_slave_construct(self, scl, sda, addresses, i, args[ARG_smbus].u_bool); common_hal_i2cslave_i2c_slave_construct(self, scl, sda, addresses, i, args[ARG_smbus].u_bool);