pwarren
/
zmk_mf68
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update kscan_direct_gpio.c 

- Fix logic in getting pulls from ACTIVE_LOW vs. ACTIVE_HIGH DT flags
- Add pulls on init
This commit is contained in:
Kurtis Lew 2022-05-17 18:23:21 -07:00 committed by Pete Johanson
parent f39c821d19
commit fec99c7d5e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/drivers/kscan/kscan_gpio_direct.c
View File

@ -126,9 +126,9 @@ static void kscan_direct_irq_callback_handler(const struct device *port, struct
#endif #endif
static gpio_flags_t kscan_gpio_get_flags(const struct gpio_dt_spec *gpio, bool active) { static gpio_flags_t kscan_gpio_get_flags(const struct gpio_dt_spec *gpio, bool active) {
gpio_flags_t flags = BIT_MASK(0) & gpio->dt_flags; gpio_flags_t flags = BIT(0) & gpio->dt_flags;
if (active) { if (!active) {
flags |= flags ? GPIO_PULL_DOWN : GPIO_PULL_UP; flags |= flags ? GPIO_PULL_UP : GPIO_PULL_DOWN;
} }
return flags; return flags;
} }
@ -259,13 +259,14 @@ static int kscan_direct_disable(const struct device *dev) {
} }
static int kscan_direct_init_input_inst(const struct device *dev, const struct gpio_dt_spec *gpio, static int kscan_direct_init_input_inst(const struct device *dev, const struct gpio_dt_spec *gpio,
const int index) { const int index, bool toggle_mode) {
if (!device_is_ready(gpio->port)) { if (!device_is_ready(gpio->port)) {
LOG_ERR("GPIO is not ready: %s", gpio->port->name); LOG_ERR("GPIO is not ready: %s", gpio->port->name);
return -ENODEV; return -ENODEV;
} }
int err = gpio_pin_configure_dt(
int err = gpio_pin_configure_dt(gpio, GPIO_INPUT); gpio, GPIO_INPUT | (toggle_mode ? kscan_gpio_get_flags(gpio, false) : 0));
LOG_DBG("Extra flags: %d", GPIO_INPUT | (toggle_mode ? kscan_gpio_get_flags(gpio, false) : 0));
if (err) { if (err) {
LOG_ERR("Unable to configure pin %u on %s for input", gpio->pin, gpio->port->name); LOG_ERR("Unable to configure pin %u on %s for input", gpio->pin, gpio->port->name);
return err; return err;
@ -294,7 +295,7 @@ static int kscan_direct_init_inputs(const struct device *dev) {
for (int i = 0; i < config->inputs.len; i++) { for (int i = 0; i < config->inputs.len; i++) {
const struct gpio_dt_spec *gpio = &config->inputs.gpios[i]; const struct gpio_dt_spec *gpio = &config->inputs.gpios[i];
int err = kscan_direct_init_input_inst(dev, gpio, i); int err = kscan_direct_init_input_inst(dev, gpio, i, config->toggle_mode);
if (err) { if (err) {
return err; return err;
} }