summaryrefslogtreecommitdiff
path: root/app/drivers/zephyr
diff options
context:
space:
mode:
authorPete Johanson <peter@peterjohanson.com>2020-10-06 17:32:35 -0400
committerGitHub <noreply@github.com>2020-10-06 17:32:35 -0400
commit12b9a37005cade72ad85134b8cfe31ccefec500d (patch)
tree130071af412462a462fbd268348756d683d1969e /app/drivers/zephyr
parentce59223efe9062ac1da77bae93a3578ce0463b66 (diff)
parenta7496ab06425cab7de5fc7164b4ce5a34dd7107b (diff)
Merge pull request #211 from petejohanson/core/keymap-port-event-exploration
Use PORT events for kscan matrix interrupts, add option for deep sleep.
Diffstat (limited to 'app/drivers/zephyr')
-rw-r--r--app/drivers/zephyr/kscan_gpio_matrix.c70
1 files changed, 39 insertions, 31 deletions
diff --git a/app/drivers/zephyr/kscan_gpio_matrix.c b/app/drivers/zephyr/kscan_gpio_matrix.c
index 62008e3..a0b22e4 100644
--- a/app/drivers/zephyr/kscan_gpio_matrix.c
+++ b/app/drivers/zephyr/kscan_gpio_matrix.c
@@ -64,6 +64,7 @@ static int kscan_gpio_config_interrupts(struct device **devices,
struct kscan_gpio_irq_callback_##n { \
struct COND_CODE_0(DT_INST_PROP(n, debounce_period), (k_work), (k_delayed_work)) * work; \
struct gpio_callback callback; \
+ struct device *dev; \
}; \
static struct kscan_gpio_irq_callback_##n irq_callbacks_##n[INST_INPUT_LEN(n)]; \
struct kscan_gpio_config_##n { \
@@ -72,7 +73,7 @@ static int kscan_gpio_config_interrupts(struct device **devices,
}; \
struct kscan_gpio_data_##n { \
kscan_callback_t callback; \
- COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (), (struct k_timer poll_timer;)) \
+ COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (struct k_timer poll_timer;), ()) \
struct COND_CODE_0(DT_INST_PROP(n, debounce_period), (k_work), (k_delayed_work)) work; \
bool matrix_state[INST_MATRIX_ROWS(n)][INST_MATRIX_COLS(n)]; \
struct device *rows[INST_MATRIX_ROWS(n)]; \
@@ -100,23 +101,25 @@ static int kscan_gpio_config_interrupts(struct device **devices,
return ( \
COND_CODE_0(DT_ENUM_IDX(DT_DRV_INST(n), diode_direction), (cfg->rows), (cfg->cols))); \
} \
- COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, \
+ COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (), \
( \
static int kscan_gpio_enable_interrupts_##n(struct device *dev) { \
return kscan_gpio_config_interrupts( \
kscan_gpio_input_devices_##n(dev), kscan_gpio_input_configs_##n(dev), \
- INST_INPUT_LEN(n), GPIO_INT_DEBOUNCE | GPIO_INT_EDGE_BOTH); \
+ INST_INPUT_LEN(n), GPIO_INT_LEVEL_ACTIVE); \
} static int kscan_gpio_disable_interrupts_##n(struct device *dev) { \
return kscan_gpio_config_interrupts(kscan_gpio_input_devices_##n(dev), \
kscan_gpio_input_configs_##n(dev), \
INST_INPUT_LEN(n), GPIO_INT_DISABLE); \
- }), \
- ()) \
+ })) \
static void kscan_gpio_set_output_state_##n(struct device *dev, int value) { \
+ int err; \
for (int i = 0; i < INST_OUTPUT_LEN(n); i++) { \
struct device *in_dev = kscan_gpio_output_devices_##n(dev)[i]; \
const struct kscan_gpio_item_config *cfg = &kscan_gpio_output_configs_##n(dev)[i]; \
- gpio_pin_set(in_dev, cfg->pin, value); \
+ if ((err = gpio_pin_set(in_dev, cfg->pin, value))) { \
+ LOG_DBG("FAILED TO SET OUTPUT %d to %d", cfg->pin, err); \
+ } \
} \
} \
static void kscan_gpio_set_matrix_state_##n( \
@@ -134,8 +137,6 @@ static int kscan_gpio_config_interrupts(struct device **devices,
/* Disable our interrupts temporarily while we scan, to avoid */ \
/* re-entry while we iterate columns and set them active one by one */ \
/* to get pressed state for each matrix cell. */ \
- COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (kscan_gpio_disable_interrupts_##n(dev);), \
- ()) \
kscan_gpio_set_output_state_##n(dev, 0); \
for (int o = 0; o < INST_OUTPUT_LEN(n); o++) { \
struct device *out_dev = kscan_gpio_output_devices_##n(dev)[o]; \
@@ -152,8 +153,6 @@ static int kscan_gpio_config_interrupts(struct device **devices,
} \
/* Set all our outputs as active again. */ \
kscan_gpio_set_output_state_##n(dev, 1); \
- /*Re-enable interrupts so that they can be triggered again for future press/release*/ \
- COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (kscan_gpio_enable_interrupts_##n(dev);), ()) \
for (int r = 0; r < INST_MATRIX_ROWS(n); r++) { \
for (int c = 0; c < INST_MATRIX_COLS(n); c++) { \
bool pressed = read_state[r][c]; \
@@ -172,6 +171,9 @@ static int kscan_gpio_config_interrupts(struct device **devices,
k_delayed_work_cancel(&data->work); \
k_delayed_work_submit(&data->work, K_MSEC(5)); \
})) \
+ } else { \
+ COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (), \
+ (kscan_gpio_enable_interrupts_##n(dev);)) \
} \
return 0; \
} \
@@ -179,16 +181,20 @@ static int kscan_gpio_config_interrupts(struct device **devices,
struct kscan_gpio_data_##n *data = CONTAINER_OF(work, struct kscan_gpio_data_##n, work); \
kscan_gpio_read_##n(data->dev); \
} \
- static void kscan_gpio_irq_callback_handler_##n(struct device *dev, struct gpio_callback *cb, \
- gpio_port_pins_t pin) { \
- struct kscan_gpio_irq_callback_##n *data = \
- CONTAINER_OF(cb, struct kscan_gpio_irq_callback_##n, callback); \
- COND_CODE_0(DT_INST_PROP(n, debounce_period), ({ k_work_submit(data->work); }), ({ \
- k_delayed_work_cancel(data->work); \
- k_delayed_work_submit(data->work, \
- K_MSEC(DT_INST_PROP(n, debounce_period))); \
- })) \
- } \
+ COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (), \
+ (static void kscan_gpio_irq_callback_handler_##n( \
+ struct device *dev, struct gpio_callback *cb, gpio_port_pins_t pin) { \
+ struct kscan_gpio_irq_callback_##n *data = \
+ CONTAINER_OF(cb, struct kscan_gpio_irq_callback_##n, callback); \
+ kscan_gpio_disable_interrupts_##n(data->dev); \
+ COND_CODE_0(DT_INST_PROP(n, debounce_period), \
+ ({ k_work_submit(data->work); }), ({ \
+ k_delayed_work_cancel(data->work); \
+ k_delayed_work_submit( \
+ data->work, K_MSEC(DT_INST_PROP(n, debounce_period))); \
+ })) \
+ })) \
+ \
static struct kscan_gpio_data_##n kscan_gpio_data_##n = { \
.rows = {[INST_MATRIX_ROWS(n) - 1] = NULL}, .cols = {[INST_MATRIX_COLS(n) - 1] = NULL}}; \
static int kscan_gpio_configure_##n(struct device *dev, kscan_callback_t callback) { \
@@ -201,24 +207,25 @@ static int kscan_gpio_config_interrupts(struct device **devices,
return 0; \
}; \
static int kscan_gpio_enable_##n(struct device *dev) { \
- COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, \
- (int err = kscan_gpio_enable_interrupts_##n(dev); \
- if (err) { return err; } return kscan_gpio_read_##n(dev);), \
+ COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, \
(struct kscan_gpio_data_##n *data = dev->driver_data; \
- k_timer_start(&data->poll_timer, K_MSEC(10), K_MSEC(10)); return 0;)) \
+ k_timer_start(&data->poll_timer, K_MSEC(10), K_MSEC(10)); return 0;), \
+ (int err = kscan_gpio_enable_interrupts_##n(dev); \
+ if (err) { return err; } return kscan_gpio_read_##n(dev);)) \
}; \
static int kscan_gpio_disable_##n(struct device *dev) { \
- COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, \
- (return kscan_gpio_disable_interrupts_##n(dev);), \
+ COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, \
(struct kscan_gpio_data_##n *data = dev->driver_data; \
- k_timer_stop(&data->poll_timer); return 0;)) \
+ k_timer_stop(&data->poll_timer); return 0;), \
+ (return kscan_gpio_disable_interrupts_##n(dev);)) \
}; \
- COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (), \
+ COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, \
(static void kscan_gpio_timer_handler(struct k_timer *timer) { \
struct kscan_gpio_data_##n *data = \
CONTAINER_OF(timer, struct kscan_gpio_data_##n, poll_timer); \
k_work_submit(&data->work.work); \
- })) \
+ }), \
+ ()) \
static int kscan_gpio_init_##n(struct device *dev) { \
struct kscan_gpio_data_##n *data = dev->driver_data; \
int err; \
@@ -238,6 +245,7 @@ static int kscan_gpio_config_interrupts(struct device **devices,
LOG_DBG("Configured pin %d on %s for input", in_cfg->pin, in_cfg->label); \
} \
irq_callbacks_##n[i].work = &data->work; \
+ irq_callbacks_##n[i].dev = dev; \
gpio_init_callback(&irq_callbacks_##n[i].callback, \
kscan_gpio_irq_callback_handler_##n, BIT(in_cfg->pin)); \
err = gpio_add_callback(input_devices[i], &irq_callbacks_##n[i].callback); \
@@ -263,8 +271,8 @@ static int kscan_gpio_config_interrupts(struct device **devices,
} \
} \
data->dev = dev; \
- COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (), \
- (k_timer_init(&data->poll_timer, kscan_gpio_timer_handler, NULL);)) \
+ COND_CODE_1(CONFIG_ZMK_KSCAN_MATRIX_POLLING, \
+ (k_timer_init(&data->poll_timer, kscan_gpio_timer_handler, NULL);), ()) \
(COND_CODE_0(DT_INST_PROP(n, debounce_period), (k_work_init), (k_delayed_work_init)))( \
&data->work, kscan_gpio_work_handler_##n); \
return 0; \
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 13:26:49 +0000