Skip to content

Commit 47db00f

Browse files
committed
Made error message clear and reduce calls
1 parent d02a4b9 commit 47db00f

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

locale/circuitpython.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ msgid ""
6767
msgstr ""
6868

6969
#: shared-bindings/microcontroller/Pin.c
70-
msgid "%q and %q contain duplicate objects"
70+
msgid "%q and %q contain duplicate pins"
7171
msgstr ""
7272

7373
#: shared-bindings/microcontroller/Pin.c

shared-bindings/keypad/KeyMatrix.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
9090
mcu_pin_obj_t *row_pins_array[num_row_pins];
9191
mcu_pin_obj_t *column_pins_array[num_column_pins];
9292

93-
validate_no_duplicate_pins(row_pins, MP_QSTR_row_pins);
94-
validate_no_duplicate_pins(column_pins, MP_QSTR_column_pins);
9593
validate_no_duplicate_pins_2(row_pins, column_pins, MP_QSTR_row_pins, MP_QSTR_column_pins);
9694

9795
for (size_t row = 0; row < num_row_pins; row++) {

shared-bindings/microcontroller/Pin.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ void validate_no_duplicate_pins_2(mp_obj_t seq1, mp_obj_t seq2, qstr arg_name1,
127127
const size_t num_pins_1 = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(seq1));
128128
const size_t num_pins_2 = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(seq2));
129129

130+
validate_no_duplicate_pins(seq1, arg_name1);
131+
validate_no_duplicate_pins(seq2, arg_name2);
132+
130133
for (size_t pin_cnt_1 = 0; pin_cnt_1 < num_pins_1; pin_cnt_1++) {
131134
mp_obj_t pin1_obj = mp_obj_subscr(seq1, MP_OBJ_NEW_SMALL_INT(pin_cnt_1), MP_OBJ_SENTINEL);
132135
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,
135138
mp_obj_t pin2_obj = mp_obj_subscr(seq2, MP_OBJ_NEW_SMALL_INT(pin_cnt_2), MP_OBJ_SENTINEL);
136139
mcu_pin_obj_t *pin2 = validate_obj_is_pin(pin2_obj);
137140
if (pin1 == pin2) {
138-
mp_raise_TypeError_varg(translate("%q and %q contain duplicate objects"), arg_name1, arg_name2);
141+
mp_raise_TypeError_varg(translate("%q and %q contain duplicate pins"), arg_name1, arg_name2);
139142
}
140143
}
141144
}

0 commit comments

Comments
 (0)