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

Check for duplicate pins in rows and columns

This commit is contained in:
gamblor21 2021-08-10 18:18:21 -05:00
parent 88a0088d12
commit e18ceea9ba
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
locale/circuitpython.pot
View File

@ -1998,6 +1998,10 @@ msgstr ""
msgid "Row entry must be digitalio.DigitalInOut"
msgstr ""
#: shared-bindings/keypad/KeyMatrix.c
msgid "Row or Column pin duplicated"
msgstr ""
#: main.c
msgid "Running in safe mode! Not running saved code.\n"
msgstr ""

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

@ -102,6 +102,28 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar
column_pins_array[column] = pin;
}
for (size_t row = 0; row < num_row_pins; row++) {
for (size_t row2 = row + 1; row2 < num_row_pins; row2++) {
if (row_pins_array[row] == row_pins_array[row2]) {
mp_raise_ValueError(translate("Row or Column pin duplicated"));
}
}
for (size_t column = 0; column < num_column_pins; column++) {
if (row_pins_array[row] == column_pins_array[column]) {
mp_raise_ValueError(translate("Row or Column pin duplicated"));
}
}
}
for (size_t column = 0; column < num_column_pins; column++) {
for (size_t column2 = column + 1; column2 < num_column_pins; column2++) {
if (column_pins_array[column] == column_pins_array[column2]) {
mp_raise_ValueError(translate("Row or Column pin duplicated"));
}
}
}
common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_column_pins, column_pins_array, args[ARG_columns_to_anodes].u_bool, interval, max_events);
return MP_OBJ_FROM_PTR(self);
}