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

Merge aba769f1ba into a5c57fa224

Browse source
This commit is contained in:
Tokazio 2023-06-09 09:16:29 +00:00 • committed by GitHub
commit d8aa55cacf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/include/zmk/split/bluetooth/central.h
View file

@ -6,3 +6,5 @@
int zmk_split_bt_invoke_behavior(uint8_t source, struct zmk_behavior_binding *binding,
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);

8
app/src/behavior_queue.c
View file

@ -9,6 +9,8 @@
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <drivers/behavior.h>
#include <zmk/split/bluetooth/central.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
@ -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);

24
app/src/keymap.c
View file

@ -182,15 +182,23 @@ int zmk_keymap_apply_position_state(uint8_t source, int layer, uint32_t position
};
LOG_DBG("layer: %d position: %d, binding name: %s", layer, position, binding.behavior_dev);
return zmk_run_behavior(&binding,event,source,pressed);
}
behavior = device_get_binding(binding.behavior_dev);
int zmk_run_behavior(struct zmk_behavior_binding *binding, struct zmk_behavior_binding_event event,uint8_t source,bool pressed){
LOG_DBG("layer: %d position: %d, binding name: %s", event.layer, event.position,
log_strdup(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;
@ -205,24 +213,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_SPLIT_BLE_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;