diff options
| author | Okke Formsma <okke@formsma.nl> | 2020-12-12 20:31:42 +0100 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2021-02-02 00:43:26 -0500 |
| commit | 84d19fe79b04af0fca87621306b1526a629a7957 (patch) | |
| tree | 59efb148654999fbee4bb6f37ba83d151bcfe525 /app/src | |
| parent | f39121f82e45d42cee06dec852f164494597245a (diff) | |
refactor(behaviors): factor out multiple uses of _TRANSFORM_ENTRY
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/behaviors/behavior_sticky_key.c | 15 | ||||
| -rw-r--r-- | app/src/keymap.c | 14 |
2 files changed, 7 insertions, 22 deletions
diff --git a/app/src/behaviors/behavior_sticky_key.c b/app/src/behaviors/behavior_sticky_key.c index aa9fe9a..20af93a 100644 --- a/app/src/behaviors/behavior_sticky_key.c +++ b/app/src/behaviors/behavior_sticky_key.c @@ -18,6 +18,7 @@ #include <zmk/events/keycode_state_changed.h> #include <zmk/events/modifiers_state_changed.h> #include <zmk/hid.h> +#include <zmk/keymap.h> LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); @@ -260,18 +261,10 @@ static int behavior_sticky_key_init(const struct device *dev) { struct behavior_sticky_key_data {}; static struct behavior_sticky_key_data behavior_sticky_key_data; -#define _TRANSFORM_ENTRY(idx, node) \ - { \ - .behavior_dev = DT_LABEL(DT_INST_PHANDLE_BY_IDX(node, bindings, idx)), \ - .param1 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param1), (0), \ - (DT_INST_PHA_BY_IDX(node, bindings, idx, param1))), \ - .param2 = COND_CODE_0(DT_INST_PHA_HAS_CELL_AT_IDX(node, bindings, idx, param2), (0), \ - (DT_INST_PHA_BY_IDX(node, bindings, idx, param2))), \ - }, - #define KP_INST(n) \ static struct behavior_sticky_key_config behavior_sticky_key_config_##n = { \ - .behavior = _TRANSFORM_ENTRY(0, n).release_after_ms = DT_INST_PROP(n, release_after_ms), \ + .behavior = ZMK_KEYMAP_EXTRACT_BINDING(0, DT_DRV_INST(n)), \ + .release_after_ms = DT_INST_PROP(n, release_after_ms), \ .quick_release = DT_INST_PROP(n, quick_release), \ }; \ DEVICE_AND_API_INIT(behavior_sticky_key_##n, DT_INST_LABEL(n), behavior_sticky_key_init, \ @@ -280,4 +273,4 @@ static struct behavior_sticky_key_data behavior_sticky_key_data; DT_INST_FOREACH_STATUS_OKAY(KP_INST) -#endif
\ No newline at end of file +#endif diff --git a/app/src/keymap.c b/app/src/keymap.c index 31258e0..75ec6bf 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -28,18 +28,10 @@ static uint8_t _zmk_keymap_layer_default = 0; #define ZMK_KEYMAP_NODE DT_DRV_INST(0) #define ZMK_KEYMAP_LAYERS_LEN (DT_INST_FOREACH_CHILD(0, LAYER_CHILD_LEN) 0) -#define LAYER_NODE(l) DT_PHANDLE_BY_IDX(ZMK_KEYMAP_NODE, layers, l) +#define BINDING_WITH_COMMA(idx, drv_inst) ZMK_KEYMAP_EXTRACT_BINDING(idx, drv_inst), -#define _TRANSFORM_ENTRY(idx, layer) \ - { \ - .behavior_dev = DT_LABEL(DT_PHANDLE_BY_IDX(layer, bindings, idx)), \ - .param1 = COND_CODE_0(DT_PHA_HAS_CELL_AT_IDX(layer, bindings, idx, param1), (0), \ - (DT_PHA_BY_IDX(layer, bindings, idx, param1))), \ - .param2 = COND_CODE_0(DT_PHA_HAS_CELL_AT_IDX(layer, bindings, idx, param2), (0), \ - (DT_PHA_BY_IDX(layer, bindings, idx, param2))), \ - }, - -#define TRANSFORMED_LAYER(node) {UTIL_LISTIFY(DT_PROP_LEN(node, bindings), _TRANSFORM_ENTRY, node)}, +#define TRANSFORMED_LAYER(node) \ + {UTIL_LISTIFY(DT_PROP_LEN(node, bindings), BINDING_WITH_COMMA, node)}, #if ZMK_KEYMAP_HAS_SENSORS #define _TRANSFORM_SENSOR_ENTRY(idx, layer) \ |