RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 05:32:45 +01:00
Code Releases Activity

matrix_keypad: use gpio_is_valid

Browse Source 
Bit of future proofing this module and use gpio_is_valid instead of
GPIO_UNDEF everywhere
This commit is contained in:
Koen Zandberg 2023-01-17 11:03:01 +01:00
parent b5af66cdd8
commit 21ac46c89d
No known key found for this signature in database
GPG Key ID: BA1718B37D79F51C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/matrix_keypad/matrix_keypad.c
View File

@ -39,7 +39,7 @@ static void _setup_columns(matrix_keypad_t *dev)
{ {
for (size_t i = 0; i < CONFIG_MATRIX_KEYPAD_NUM_COLUMNS; i++) { for (size_t i = 0; i < CONFIG_MATRIX_KEYPAD_NUM_COLUMNS; i++) {
gpio_t column = dev->params->columns[i]; gpio_t column = dev->params->columns[i];
if (column != GPIO_UNDEF) { if (gpio_is_valid(column)) {
gpio_init(column, GPIO_IN_PU); gpio_init(column, GPIO_IN_PU);
} }
} }
@ -49,7 +49,7 @@ static void _setup_rows(matrix_keypad_t *dev)
{ {
for (size_t i = 0; i < CONFIG_MATRIX_KEYPAD_NUM_ROWS; i++) { for (size_t i = 0; i < CONFIG_MATRIX_KEYPAD_NUM_ROWS; i++) {
gpio_t row = dev->params->rows[i]; gpio_t row = dev->params->rows[i];
if (row != GPIO_UNDEF) { if (gpio_is_valid(row)) {
gpio_init(row, MATRIX_KEYPAD_ROWS_GPIO_MODE); /* Open drain to ensure rows don't conflict */ gpio_init(row, MATRIX_KEYPAD_ROWS_GPIO_MODE); /* Open drain to ensure rows don't conflict */
gpio_set(row); gpio_set(row);
} }
@ -107,7 +107,7 @@ size_t matrix_keypad_scan(matrix_keypad_t *dev)
for (size_t i = 0; i < CONFIG_MATRIX_KEYPAD_NUM_ROWS; i++) { for (size_t i = 0; i < CONFIG_MATRIX_KEYPAD_NUM_ROWS; i++) {
gpio_t row = dev->params->rows[i]; gpio_t row = dev->params->rows[i];
if (row == GPIO_UNDEF) { if (!gpio_is_valid(row)) {
continue; continue;
} }
@ -122,7 +122,7 @@ size_t matrix_keypad_scan(matrix_keypad_t *dev)
/* Scan columns */ /* Scan columns */
for (size_t j = 0; j < CONFIG_MATRIX_KEYPAD_NUM_COLUMNS; j++) { for (size_t j = 0; j < CONFIG_MATRIX_KEYPAD_NUM_COLUMNS; j++) {
gpio_t column = dev->params->columns[j]; gpio_t column = dev->params->columns[j];
if (column == GPIO_UNDEF) { if (!gpio_is_valid(column)) {
continue; continue;
} }
bool status = !gpio_read(column); bool status = !gpio_read(column);