Rename function again
This commit is contained in:
parent
83ca29b3ec
commit
9ccf174dda
7 changed files with 17 additions and 17 deletions
|
@ -28,8 +28,8 @@ const char *zmk_keymap_layer_name(uint8_t layer);
|
|||
int zmk_keymap_position_state_changed(uint8_t source, uint32_t position, bool pressed,
|
||||
int64_t timestamp);
|
||||
|
||||
int zmk_trigger_behavior_callbacks(struct zmk_behavior_binding *binding,
|
||||
struct zmk_behavior_binding_event event, bool pressed);
|
||||
int zmk_invoke_behavior_binding(struct zmk_behavior_binding *binding,
|
||||
struct zmk_behavior_binding_event event, bool pressed);
|
||||
|
||||
#define ZMK_KEYMAP_EXTRACT_BINDING(idx, drv_inst) \
|
||||
{ \
|
||||
|
|
|
@ -37,9 +37,9 @@ static void behavior_queue_process_next(struct k_work *work) {
|
|||
.position = item.position, .timestamp = k_uptime_get(), .source = item.source};
|
||||
|
||||
if (item.press) {
|
||||
zmk_trigger_behavior_callbacks(&item.binding, event, true);
|
||||
zmk_invoke_behavior_binding(&item.binding, event, true);
|
||||
} else {
|
||||
zmk_trigger_behavior_callbacks(&item.binding, event, false);
|
||||
zmk_invoke_behavior_binding(&item.binding, event, false);
|
||||
}
|
||||
|
||||
LOG_DBG("Processing next queued behavior in %dms", item.wait);
|
||||
|
|
|
@ -408,7 +408,7 @@ static int press_hold_binding(struct active_hold_tap *hold_tap) {
|
|||
|
||||
struct zmk_behavior_binding binding = {.behavior_dev = hold_tap->config->hold_behavior_dev,
|
||||
.param1 = hold_tap->param_hold};
|
||||
return zmk_trigger_behavior_callbacks(&binding, event, true);
|
||||
return zmk_invoke_behavior_binding(&binding, event, true);
|
||||
}
|
||||
|
||||
static int press_tap_binding(struct active_hold_tap *hold_tap) {
|
||||
|
@ -421,7 +421,7 @@ static int press_tap_binding(struct active_hold_tap *hold_tap) {
|
|||
struct zmk_behavior_binding binding = {.behavior_dev = hold_tap->config->tap_behavior_dev,
|
||||
.param1 = hold_tap->param_tap};
|
||||
store_last_hold_tapped(hold_tap);
|
||||
return zmk_trigger_behavior_callbacks(&binding, event, true);
|
||||
return zmk_invoke_behavior_binding(&binding, event, true);
|
||||
}
|
||||
|
||||
static int release_hold_binding(struct active_hold_tap *hold_tap) {
|
||||
|
@ -433,7 +433,7 @@ static int release_hold_binding(struct active_hold_tap *hold_tap) {
|
|||
|
||||
struct zmk_behavior_binding binding = {.behavior_dev = hold_tap->config->hold_behavior_dev,
|
||||
.param1 = hold_tap->param_hold};
|
||||
return zmk_trigger_behavior_callbacks(&binding, event, false);
|
||||
return zmk_invoke_behavior_binding(&binding, event, false);
|
||||
}
|
||||
|
||||
static int release_tap_binding(struct active_hold_tap *hold_tap) {
|
||||
|
@ -445,7 +445,7 @@ static int release_tap_binding(struct active_hold_tap *hold_tap) {
|
|||
|
||||
struct zmk_behavior_binding binding = {.behavior_dev = hold_tap->config->tap_behavior_dev,
|
||||
.param1 = hold_tap->param_tap};
|
||||
return zmk_trigger_behavior_callbacks(&binding, event, false);
|
||||
return zmk_invoke_behavior_binding(&binding, event, false);
|
||||
}
|
||||
|
||||
static int press_binding(struct active_hold_tap *hold_tap) {
|
||||
|
|
|
@ -52,7 +52,7 @@ static int on_mod_morph_binding_pressed(struct zmk_behavior_binding *binding,
|
|||
} else {
|
||||
data->pressed_binding = (struct zmk_behavior_binding *)&cfg->normal_binding;
|
||||
}
|
||||
return zmk_trigger_behavior_callbacks(data->pressed_binding, event, true);
|
||||
return zmk_invoke_behavior_binding(data->pressed_binding, event, true);
|
||||
}
|
||||
|
||||
static int on_mod_morph_binding_released(struct zmk_behavior_binding *binding,
|
||||
|
@ -68,7 +68,7 @@ static int on_mod_morph_binding_released(struct zmk_behavior_binding *binding,
|
|||
struct zmk_behavior_binding *pressed_binding = data->pressed_binding;
|
||||
data->pressed_binding = NULL;
|
||||
int err;
|
||||
err = zmk_trigger_behavior_callbacks(pressed_binding, event, false);
|
||||
err = zmk_invoke_behavior_binding(pressed_binding, event, false);
|
||||
zmk_hid_masked_modifiers_clear();
|
||||
return err;
|
||||
}
|
||||
|
|
|
@ -105,7 +105,7 @@ static inline int press_sticky_key_behavior(struct active_sticky_key *sticky_key
|
|||
.timestamp = timestamp,
|
||||
.source = sticky_key->source,
|
||||
};
|
||||
return zmk_trigger_behavior_callbacks(&binding, event, true);
|
||||
return zmk_invoke_behavior_binding(&binding, event, true);
|
||||
}
|
||||
|
||||
static inline int release_sticky_key_behavior(struct active_sticky_key *sticky_key,
|
||||
|
@ -122,7 +122,7 @@ static inline int release_sticky_key_behavior(struct active_sticky_key *sticky_k
|
|||
};
|
||||
|
||||
clear_sticky_key(sticky_key);
|
||||
return zmk_trigger_behavior_callbacks(&binding, event, false);
|
||||
return zmk_invoke_behavior_binding(&binding, event, false);
|
||||
}
|
||||
|
||||
static inline void on_sticky_key_timeout(struct active_sticky_key *sticky_key) {
|
||||
|
|
|
@ -113,7 +113,7 @@ static inline int press_tap_dance_behavior(struct active_tap_dance *tap_dance, i
|
|||
.timestamp = timestamp,
|
||||
.source = tap_dance->source,
|
||||
};
|
||||
return zmk_trigger_behavior_callbacks(&binding, event, true);
|
||||
return zmk_invoke_behavior_binding(&binding, event, true);
|
||||
}
|
||||
|
||||
static inline int release_tap_dance_behavior(struct active_tap_dance *tap_dance,
|
||||
|
@ -125,7 +125,7 @@ static inline int release_tap_dance_behavior(struct active_tap_dance *tap_dance,
|
|||
.source = tap_dance->source,
|
||||
};
|
||||
clear_tap_dance(tap_dance);
|
||||
return zmk_trigger_behavior_callbacks(&binding, event, false);
|
||||
return zmk_invoke_behavior_binding(&binding, event, false);
|
||||
}
|
||||
|
||||
static int on_tap_dance_binding_pressed(struct zmk_behavior_binding *binding,
|
||||
|
|
|
@ -186,11 +186,11 @@ 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_trigger_behavior_callbacks(&binding, event, pressed);
|
||||
return zmk_invoke_behavior_binding(&binding, event, pressed);
|
||||
}
|
||||
|
||||
int zmk_trigger_behavior_callbacks(struct zmk_behavior_binding *binding,
|
||||
struct zmk_behavior_binding_event event, bool pressed) {
|
||||
int zmk_invoke_behavior_binding(struct zmk_behavior_binding *binding,
|
||||
struct zmk_behavior_binding_event event, bool pressed) {
|
||||
const struct device *behavior = zmk_behavior_get_binding(binding->behavior_dev);
|
||||
|
||||
if (!behavior) {
|
||||
|
|
Loading…
Add table
Reference in a new issue