summaryrefslogtreecommitdiff
path: root/app/src/keymap.c
diff options
context:
space:
mode:
authorOkke Formsma <okke@formsma.nl>2020-12-12 20:31:42 +0100
committerPete Johanson <peter@peterjohanson.com>2021-02-02 00:43:26 -0500
commit84d19fe79b04af0fca87621306b1526a629a7957 (patch)
tree59efb148654999fbee4bb6f37ba83d151bcfe525 /app/src/keymap.c
parentf39121f82e45d42cee06dec852f164494597245a (diff)
refactor(behaviors): factor out multiple uses of _TRANSFORM_ENTRY
Diffstat (limited to 'app/src/keymap.c')
-rw-r--r--app/src/keymap.c14
1 files changed, 3 insertions, 11 deletions
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) \