Browse Source

Merge pull request #267 from nuxiom/fix-matrix-polling

Fix matrix polling conditional macro
xmkb
Pete Johanson 4 years ago committed by GitHub
parent
commit
367dcd4820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 25
      app/drivers/zephyr/kscan_gpio_matrix.c

25
app/drivers/zephyr/kscan_gpio_matrix.c

@ -181,19 +181,18 @@ static int kscan_gpio_config_interrupts(struct device **devices,
struct kscan_gpio_data_##n *data = CONTAINER_OF(work, struct kscan_gpio_data_##n, work); \ struct kscan_gpio_data_##n *data = CONTAINER_OF(work, struct kscan_gpio_data_##n, work); \
kscan_gpio_read_##n(data->dev); \ kscan_gpio_read_##n(data->dev); \
} \ } \
COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (), \ static void kscan_gpio_irq_callback_handler_##n(struct device *dev, struct gpio_callback *cb, \
(static void kscan_gpio_irq_callback_handler_##n( \ gpio_port_pins_t pin) { \
struct device *dev, struct gpio_callback *cb, gpio_port_pins_t pin) { \ struct kscan_gpio_irq_callback_##n *data = \
struct kscan_gpio_irq_callback_##n *data = \ CONTAINER_OF(cb, struct kscan_gpio_irq_callback_##n, callback); \
CONTAINER_OF(cb, struct kscan_gpio_irq_callback_##n, callback); \ COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (), \
kscan_gpio_disable_interrupts_##n(data->dev); \ (kscan_gpio_disable_interrupts_##n(data->dev);)) \
COND_CODE_0(DT_INST_PROP(n, debounce_period), \ COND_CODE_0(DT_INST_PROP(n, debounce_period), ({ k_work_submit(data->work); }), ({ \
({ k_work_submit(data->work); }), ({ \ k_delayed_work_cancel(data->work); \
k_delayed_work_cancel(data->work); \ k_delayed_work_submit(data->work, \
k_delayed_work_submit( \ K_MSEC(DT_INST_PROP(n, debounce_period))); \
data->work, K_MSEC(DT_INST_PROP(n, debounce_period))); \ })) \
})) \ } \
})) \
\ \
static struct kscan_gpio_data_##n kscan_gpio_data_##n = { \ static struct kscan_gpio_data_##n kscan_gpio_data_##n = { \
.rows = {[INST_MATRIX_ROWS(n) - 1] = NULL}, .cols = {[INST_MATRIX_COLS(n) - 1] = NULL}}; \ .rows = {[INST_MATRIX_ROWS(n) - 1] = NULL}, .cols = {[INST_MATRIX_COLS(n) - 1] = NULL}}; \

Loading…
Cancel
Save