kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(kscan): Infer pull flags, use LISTIFY.

Browse source 
* To avoid issues with platforms that enforce no pull flags when
  pins are used as outputs, infer the pull flags in code instead of
  setting them in the DTS for charlieplex kscan driver.
* Use `LISTIFY` macro instead of deprecated `UTIL_LISTIFY`.
This commit is contained in:
Peter Johanson 2023-11-24 05:45:42 +00:00
parent 90e18c2456
commit 03e663a56a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/module/drivers/kscan/kscan_gpio_charlieplex.c
View file

@ -110,7 +110,9 @@ static int kscan_charlieplex_set_as_input(const struct gpio_dt_spec *gpio) {
return -ENODEV;
}
int err = gpio_pin_configure_dt(gpio, GPIO_INPUT);
gpio_flags_t pull_flag = (gpio->dt_flags & GPIO_ACTIVE_HIGH) ? GPIO_PULL_DOWN : GPIO_PULL_UP;
int err = gpio_pin_configure_dt(gpio, GPIO_INPUT | pull_flag);
if (err) {
LOG_ERR("Unable to configure pin %u on %s for input", gpio->pin, gpio->port->name);
return err;
@ -393,7 +395,7 @@ static const struct kscan_driver_api kscan_charlieplex_api = {
\
static struct zmk_debounce_state kscan_charlieplex_state_##n[INST_CHARLIEPLEX_LEN(n)]; \
static const struct gpio_dt_spec kscan_charlieplex_cells_##n[] = { \
UTIL_LISTIFY(INST_LEN(n), KSCAN_GPIO_CFG_INIT, n)}; \
LISTIFY(INST_LEN(n), KSCAN_GPIO_CFG_INIT, (, ), n)}; \
static struct kscan_charlieplex_data kscan_charlieplex_data_##n = { \
.charlieplex_state = kscan_charlieplex_state_##n, \
}; \