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

Made error message clear and reduce calls

This commit is contained in:
gamblor21 2021-08-19 20:03:49 -05:00
parent d02a4b9f71
commit 47db00f0af
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
locale/circuitpython.pot
View File

@ -67,7 +67,7 @@ msgid ""
msgstr ""
#: shared-bindings/microcontroller/Pin.c
msgid "%q and %q contain duplicate objects"
msgid "%q and %q contain duplicate pins"
msgstr ""
#: shared-bindings/microcontroller/Pin.c

2
shared-bindings/keypad/KeyMatrix.c
View File

@ -90,8 +90,6 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
mcu_pin_obj_t *row_pins_array[num_row_pins];
mcu_pin_obj_t *column_pins_array[num_column_pins];
validate_no_duplicate_pins(row_pins, MP_QSTR_row_pins);
validate_no_duplicate_pins(column_pins, MP_QSTR_column_pins);
validate_no_duplicate_pins_2(row_pins, column_pins, MP_QSTR_row_pins, MP_QSTR_column_pins);
for (size_t row = 0; row < num_row_pins; row++) {

5
shared-bindings/microcontroller/Pin.c
View File

@ -127,6 +127,9 @@ void validate_no_duplicate_pins_2(mp_obj_t seq1, mp_obj_t seq2, qstr arg_name1,
const size_t num_pins_1 = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(seq1));
const size_t num_pins_2 = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(seq2));
validate_no_duplicate_pins(seq1, arg_name1);
validate_no_duplicate_pins(seq2, arg_name2);
for (size_t pin_cnt_1 = 0; pin_cnt_1 < num_pins_1; pin_cnt_1++) {
mp_obj_t pin1_obj = mp_obj_subscr(seq1, MP_OBJ_NEW_SMALL_INT(pin_cnt_1), MP_OBJ_SENTINEL);
mcu_pin_obj_t *pin1 = validate_obj_is_pin(pin1_obj);
@ -135,7 +138,7 @@ void validate_no_duplicate_pins_2(mp_obj_t seq1, mp_obj_t seq2, qstr arg_name1,
mp_obj_t pin2_obj = mp_obj_subscr(seq2, MP_OBJ_NEW_SMALL_INT(pin_cnt_2), MP_OBJ_SENTINEL);
mcu_pin_obj_t *pin2 = validate_obj_is_pin(pin2_obj);
if (pin1 == pin2) {
mp_raise_TypeError_varg(translate("%q and %q contain duplicate objects"), arg_name1, arg_name2);
mp_raise_TypeError_varg(translate("%q and %q contain duplicate pins"), arg_name1, arg_name2);
}
}
}