Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve preserve locality outside of direct keymap bindings #1630

Closed
wants to merge 1 commit into from
+25 −13
Closed

Resolve preserve locality outside of direct keymap bindings #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/include/zmk/split/bluetooth/central.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@
#include <zmk/behavior.h>

int zmk_split_bt_invoke_behavior(uint8_t source, struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event, bool state);
struct zmk_behavior_binding_event event, bool state);

int zmk_run_behavior(struct zmk_behavior_binding *binding, struct zmk_behavior_binding_event event,uint8_t source,bool pressed);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this general functionality is useful, but a few things:

  • This should be in keymap.h, not this header.
  • I don't love the name. We are triggering the pressed/released callbacks, not "running" something.

8 changes: 6 additions & 2 deletions app/src/behavior_queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <kernel.h>
#include <logging/log.h>
#include <drivers/behavior.h>
#include <zmk/split/bluetooth/central.h>


LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

Expand All @@ -35,9 +37,11 @@ static void behavior_queue_process_next(struct k_work *work) {
.timestamp = k_uptime_get()};

if (item.press) {
behavior_keymap_binding_pressed(&item.binding, event);
zmk_run_behavior(&item.binding, event,0,true);
// behavior_keymap_binding_pressed(&item.binding, event);
} else {
behavior_keymap_binding_released(&item.binding, event);
zmk_run_behavior(&item.binding, event,0,false);
// behavior_keymap_binding_released(&item.binding, event);
}

LOG_DBG("Processing next queued behavior in %dms", item.wait);
Expand Down
26 changes: 16 additions & 10 deletions app/src/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,23 @@ int zmk_keymap_apply_position_state(uint8_t source, int layer, uint32_t position
.timestamp = timestamp,
};

LOG_DBG("layer: %d position: %d, binding name: %s", layer, position,
log_strdup(binding.behavior_dev));
return zmk_run_behavior(&binding,event,source,pressed);
}

int zmk_run_behavior(struct zmk_behavior_binding *binding, struct zmk_behavior_binding_event event,uint8_t source,bool pressed){
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

binding probably should be const here. Also, be sure to run clang-format on any changed files for consistent formatting.


LOG_DBG("layer: %d position: %d, binding name: %s", event.layer, event.position,
log_strdup(binding->behavior_dev));


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);
LOG_WRN("No behavior assigned to %d on layer %d", event.position, event.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;
Expand All @@ -204,24 +210,24 @@ int zmk_keymap_apply_position_state(uint8_t source, int layer, uint32_t position

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;
Expand Down