From 8920952e7a8ca1ada5441887a12e4252ba2d0884 Mon Sep 17 00:00:00 2001 From: tokazio Date: Tue, 17 Jan 2023 22:54:33 +0100 Subject: [PATCH] global if behavior name starts with 'layer' --- app/src/keymap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/keymap.c b/app/src/keymap.c index 5ae1b97b..b53f0962 100644 --- a/app/src/keymap.c +++ b/app/src/keymap.c @@ -187,14 +187,14 @@ int zmk_keymap_apply_position_state(uint8_t source, int layer, uint32_t position int zmk_run_behavior(struct zmk_behavior_binding *binding, struct zmk_behavior_binding_event event,bool pressed){ - const struct device *behavior = device_get_binding(binding.behavior_dev); + const struct device *behavior = device_get_binding(binding->behavior_dev); if (!behavior) { LOG_WRN("No behavior assigned to %d on layer %d", position, layer); return 1; } - int err = behavior_keymap_binding_convert_central_state_dependent_params(&binding, event); + int err = behavior_keymap_binding_convert_central_state_dependent_params(binding, event); if (err) { LOG_ERR("Failed to convert relative to absolute behavior binding (err %d)", err); return err; @@ -209,24 +209,24 @@ int zmk_run_behavior(struct zmk_behavior_binding *binding, struct zmk_behavior_b switch (locality) { case BEHAVIOR_LOCALITY_CENTRAL: - return invoke_locally(&binding, event, pressed); + return invoke_locally(binding, event, pressed); case BEHAVIOR_LOCALITY_EVENT_SOURCE: #if ZMK_BLE_IS_CENTRAL if (source == ZMK_POSITION_STATE_CHANGE_SOURCE_LOCAL) { - return invoke_locally(&binding, event, pressed); + return invoke_locally(binding, event, pressed); } else { return zmk_split_bt_invoke_behavior(source, &binding, event, pressed); } #else - return invoke_locally(&binding, event, pressed); + return invoke_locally(binding, event, pressed); #endif case BEHAVIOR_LOCALITY_GLOBAL: #if ZMK_BLE_IS_CENTRAL for (int i = 0; i < ZMK_BLE_SPLIT_PERIPHERAL_COUNT; i++) { - zmk_split_bt_invoke_behavior(i, &binding, event, pressed); + zmk_split_bt_invoke_behavior(i, binding, event, pressed); } #endif - return invoke_locally(&binding, event, pressed); + return invoke_locally(binding, event, pressed); } return -ENOTSUP;