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

Merge with main.

Browse source
This commit is contained in:
Jason Chestnut 2020-10-01 12:39:47 -04:00
commit c9d53ffe34
3 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/clang-format-lint.yml vendored
View file

@ -6,11 +6,15 @@ on:
- "app/boards/**/*.c"
- "app/include/**/*.h"
- "app/src/**"
- "app/drivers/**/*.c"
- "app/drivers/**/*.h"
pull_request:
paths:
- "app/boards/**/*.c"
- "app/include/**/*.h"
- "app/src/**"
- "app/drivers/**/*.c"
- "app/drivers/**/*.h"
jobs:
build:

37
app/drivers/zephyr/kscan_gpio_matrix.c
View file

@ -102,16 +102,17 @@ static int kscan_gpio_config_interrupts(struct device **devices,
COND_CODE_0(DT_ENUM_IDX(DT_DRV_INST(n), diode_direction), (cfg->rows), (cfg->cols))); \
} \
COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, \
(static int kscan_gpio_enable_interrupts_##n(struct device *dev) { \
( \
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); \
} 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_DEBOUNCE | GPIO_INT_EDGE_BOTH); \
} \
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); \
}), ()) \
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) { \
for (int i = 0; i < INST_OUTPUT_LEN(n); i++) { \
struct device *in_dev = kscan_gpio_output_devices_##n(dev)[i]; \
@ -134,8 +135,8 @@ 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);),()) \
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]; \
@ -153,8 +154,7 @@ 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);), ()) \
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]; \
@ -204,20 +204,15 @@ static int kscan_gpio_config_interrupts(struct device **devices,
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);), \
if (err) { return err; } return kscan_gpio_read_##n(dev);), \
(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;)) \
}; \
static int kscan_gpio_disable_##n(struct device *dev) { \
COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, \
(return kscan_gpio_disable_interrupts_##n(dev);), \
(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;)) \
}; \
COND_CODE_0(CONFIG_ZMK_KSCAN_MATRIX_POLLING, (), \
(static void kscan_gpio_timer_handler(struct k_timer *timer) { \