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

refactor(events): Pass structs instead of many parameters

Browse source
This commit is contained in:
Okke Formsma 2021-02-07 14:00:47 +01:00
parent 57661362ea
commit 87232cbc5a
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/include/zmk/keymap.h
View file

@ -6,6 +6,8 @@
#pragma once #pragma once
#include <zmk/events/position_state_changed.h>
typedef uint32_t zmk_keymap_layers_state_t; typedef uint32_t zmk_keymap_layers_state_t;
uint8_t zmk_keymap_layer_default(); uint8_t zmk_keymap_layer_default();
@ -18,7 +20,7 @@ int zmk_keymap_layer_toggle(uint8_t layer);
int zmk_keymap_layer_to(uint8_t layer); int zmk_keymap_layer_to(uint8_t layer);
const char *zmk_keymap_layer_label(uint8_t layer); const char *zmk_keymap_layer_label(uint8_t layer);
int zmk_keymap_position_state_changed(uint32_t position, bool pressed, int64_t timestamp); int zmk_keymap_position_state_changed(const struct zmk_position_state_changed *pos_ev);
#define ZMK_KEYMAP_EXTRACT_BINDING(idx, drv_inst) \ #define ZMK_KEYMAP_EXTRACT_BINDING(idx, drv_inst) \
{ \ { \

47
app/src/keymap.c
View file

@ -152,24 +152,24 @@ const char *zmk_keymap_layer_label(uint8_t layer) {
return zmk_keymap_layer_names[layer]; return zmk_keymap_layer_names[layer];
} }
int zmk_keymap_apply_position_state(int layer, uint32_t position, bool pressed, int64_t timestamp) { int zmk_keymap_apply_position_state(const struct zmk_position_state_changed *pos_ev, int layer) {
// We want to make a copy of this, since it may be converted from // We want to make a copy of this, since it may be converted from
// relative to absolute before being invoked // relative to absolute before being invoked
struct zmk_behavior_binding binding = zmk_keymap[layer][position]; struct zmk_behavior_binding binding = zmk_keymap[layer][pos_ev->position];
const struct device *behavior; const struct device *behavior;
struct zmk_behavior_binding_event event = { struct zmk_behavior_binding_event event = {
.layer = layer, .layer = layer,
.position = position, .position = pos_ev->position,
.timestamp = timestamp, .timestamp = pos_ev->timestamp,
}; };
LOG_DBG("layer: %d position: %d, binding name: %s", layer, position, LOG_DBG("layer: %d position: %d, binding name: %s", event.layer, event.position,
log_strdup(binding.behavior_dev)); log_strdup(binding.behavior_dev));
behavior = device_get_binding(binding.behavior_dev); behavior = device_get_binding(binding.behavior_dev);
if (!behavior) { if (!behavior) {
LOG_DBG("No behavior assigned to %d on layer %d", position, layer); LOG_DBG("No behavior assigned to %d on layer %d", event.position, event.layer);
return 1; return 1;
} }
@ -179,20 +179,21 @@ int zmk_keymap_apply_position_state(int layer, uint32_t position, bool pressed,
return err; return err;
} }
if (pressed) { if (pos_ev->state) {
return behavior_keymap_binding_pressed(&binding, event); return behavior_keymap_binding_pressed(&binding, event);
} else { } else {
return behavior_keymap_binding_released(&binding, event); return behavior_keymap_binding_released(&binding, event);
} }
} }
int zmk_keymap_position_state_changed(uint32_t position, bool pressed, int64_t timestamp) { int zmk_keymap_position_state_changed(const struct zmk_position_state_changed *pos_ev) {
if (pressed) { if (pos_ev->state) {
zmk_keymap_active_behavior_layer[position] = _zmk_keymap_layer_state; zmk_keymap_active_behavior_layer[pos_ev->position] = _zmk_keymap_layer_state;
} }
for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= _zmk_keymap_layer_default; layer--) { for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= _zmk_keymap_layer_default; layer--) {
if (zmk_keymap_layer_active_with_state(layer, zmk_keymap_active_behavior_layer[position])) { if (zmk_keymap_layer_active_with_state(
int ret = zmk_keymap_apply_position_state(layer, position, pressed, timestamp); layer, zmk_keymap_active_behavior_layer[pos_ev->position])) {
int ret = zmk_keymap_apply_position_state(pos_ev, layer);
if (ret > 0) { if (ret > 0) {
LOG_DBG("behavior processing to continue to next layer"); LOG_DBG("behavior processing to continue to next layer");
continue; continue;
@ -209,25 +210,25 @@ int zmk_keymap_position_state_changed(uint32_t position, bool pressed, int64_t t
} }
#if ZMK_KEYMAP_HAS_SENSORS #if ZMK_KEYMAP_HAS_SENSORS
int zmk_keymap_sensor_triggered(uint8_t sensor_number, const struct device *sensor, int zmk_keymap_sensor_triggered(const struct zmk_sensor_event *sensor_ev) {
int64_t timestamp) {
for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= _zmk_keymap_layer_default; layer--) { for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= _zmk_keymap_layer_default; layer--) {
if (zmk_keymap_layer_active(layer) && zmk_sensor_keymap[layer] != NULL) { if (zmk_keymap_layer_active(layer) && zmk_sensor_keymap[layer] != NULL) {
struct zmk_behavior_binding *binding = &zmk_sensor_keymap[layer][sensor_number]; struct zmk_behavior_binding *binding =
&zmk_sensor_keymap[layer][sensor_ev->sensor_number];
const struct device *behavior; const struct device *behavior;
int ret; int ret;
LOG_DBG("layer: %d sensor_number: %d, binding name: %s", layer, sensor_number, LOG_DBG("layer: %d sensor_number: %d, binding name: %s", layer,
log_strdup(binding->behavior_dev)); sensor_ev->sensor_number, log_strdup(binding->behavior_dev));
behavior = device_get_binding(binding->behavior_dev); behavior = device_get_binding(binding->behavior_dev);
if (!behavior) { if (!behavior) {
LOG_DBG("No behavior assigned to %d on layer %d", sensor_number, layer); LOG_DBG("No behavior assigned to %d on layer %d", sensor_ev->sensor_number, layer);
continue; continue;
} }
ret = behavior_sensor_keymap_binding_triggered(binding, sensor_ev->sensor,
ret = behavior_sensor_keymap_binding_triggered(binding, sensor, timestamp); sensor_ev->timestamp);
if (ret > 0) { if (ret > 0) {
LOG_DBG("behavior processing to continue to next layer"); LOG_DBG("behavior processing to continue to next layer");
@ -249,15 +250,13 @@ int zmk_keymap_sensor_triggered(uint8_t sensor_number, const struct device *sens
int keymap_listener(const zmk_event_t *eh) { int keymap_listener(const zmk_event_t *eh) {
const struct zmk_position_state_changed *pos_ev; const struct zmk_position_state_changed *pos_ev;
if ((pos_ev = as_zmk_position_state_changed(eh)) != NULL) { if ((pos_ev = as_zmk_position_state_changed(eh)) != NULL) {
return zmk_keymap_position_state_changed(pos_ev->position, pos_ev->state, return zmk_keymap_position_state_changed(pos_ev);
pos_ev->timestamp);
} }
#if ZMK_KEYMAP_HAS_SENSORS #if ZMK_KEYMAP_HAS_SENSORS
const struct zmk_sensor_event *sensor_ev; const struct zmk_sensor_event *sensor_ev;
if ((sensor_ev = as_zmk_sensor_event(eh)) != NULL) { if ((sensor_ev = as_zmk_sensor_event(eh)) != NULL) {
return zmk_keymap_sensor_triggered(sensor_ev->sensor_number, sensor_ev->sensor, return zmk_keymap_sensor_triggered(sensor_ev);
sensor_ev->timestamp);
} }
#endif /* ZMK_KEYMAP_HAS_SENSORS */ #endif /* ZMK_KEYMAP_HAS_SENSORS */