Skip to content

unclean button lib fix #25638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

unclean button lib fix #25638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions lib/dk_buttons_and_leds/dk_buttons_and_leds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
static struct k_work_delayable buttons_scan;
static button_handler_t button_handler_cb;
static atomic_t my_buttons;
static struct gpio_callback gpio_cb;
static struct gpio_callback gpio_cb0, gpio_cb1;
static struct k_spinlock lock;
static sys_slist_t button_handlers;
static struct k_mutex button_handler_mut;
Expand Down Expand Up @@ -236,7 +236,7 @@

int dk_buttons_init(button_handler_t button_handler)
{
uint32_t pin_mask = 0;
uint32_t pin_mask0 = 0, pin_mask1 = 0;
int err;

button_handler_cb = button_handler;
Expand Down Expand Up @@ -269,13 +269,23 @@
return err;
}

pin_mask |= BIT(buttons[i].pin);
if (i < 3) {
pin_mask1 |= BIT(buttons[i].pin);
} else {
pin_mask0 |= BIT(buttons[i].pin);
}
}

gpio_init_callback(&gpio_cb, button_pressed, pin_mask);
gpio_init_callback(&gpio_cb0, button_pressed, pin_mask0);
gpio_init_callback(&gpio_cb1, button_pressed, pin_mask1);

for (size_t i = 0; i < ARRAY_SIZE(buttons); i++) {
err = gpio_add_callback(buttons[i].port, &gpio_cb);
if (i < 3)

Check failure on line 283 in lib/dk_buttons_and_leds/dk_buttons_and_leds.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

OPEN_BRACE 

lib/dk_buttons_and_leds/dk_buttons_and_leds.c:283  that open brace { should be on the previous line
{
err = gpio_add_callback(buttons[i].port, &gpio_cb1);
} else {
err = gpio_add_callback(buttons[i].port, &gpio_cb0);
}
if (err) {
LOG_ERR("Cannot add callback");
return err;
Expand Down
Loading