Jacob/zmk
1
0
Fork 0
forked from kofal.net/zmk
Code Pull Requests Activity

refactor(sensors): Split data handling from triggers.

Browse Source 
* All sensor behaviors should see sensor data, then selectively
  only have some trigger their behaviors.
This commit is contained in:
Peter Johanson
2023-05-04 00:04:20 +00:00
committed by Pete Johanson
parent d781ec795b
commit 8b29f6d345
6 changed files with 135 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/behaviors/behavior_sensor_rotate.c
View File

@@ -13,7 +13,8 @@
#include "behavior_sensor_rotate_common.h"
static const struct behavior_driver_api behavior_sensor_rotate_driver_api = {
.sensor_binding_triggered = zmk_behavior_sensor_rotate_common_trigger};
.sensor_binding_data = zmk_behavior_sensor_rotate_common_data,
.sensor_binding_process = zmk_behavior_sensor_rotate_common_process};
static int behavior_sensor_rotate_init(const struct device *dev) { return 0; };

31
app/src/behaviors/behavior_sensor_rotate_common.c
View File

@@ -11,13 +11,12 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
int zmk_behavior_sensor_rotate_common_trigger(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event,
const struct zmk_sensor_config *sensor_config,
size_t channel_data_size,
const struct zmk_sensor_channel_data *channel_data) {
int zmk_behavior_sensor_rotate_common_data(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event,
const struct zmk_sensor_config *sensor_config,
size_t channel_data_size,
const struct zmk_sensor_channel_data *channel_data) {
const struct device *dev = device_get_binding(binding->behavior_dev);
const struct behavior_sensor_rotate_config *cfg = dev->config;
struct behavior_sensor_rotate_data *data = dev->data;
const struct sensor_value value = channel_data[0].value;
@@ -52,6 +51,26 @@ int zmk_behavior_sensor_rotate_common_trigger(struct zmk_behavior_binding *bindi
value.val1, value.val2, data->remainder[sensor_position].val1,
data->remainder[sensor_position].val2, triggers, binding->param1, binding->param2);
data->triggers[sensor_position] = triggers;
return 0;
}
int zmk_behavior_sensor_rotate_common_process(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event,
enum behavior_sensor_binding_process_mode mode) {
const struct device *dev = device_get_binding(binding->behavior_dev);
const struct behavior_sensor_rotate_config *cfg = dev->config;
struct behavior_sensor_rotate_data *data = dev->data;
const int sensor_position = ZMK_SENSOR_POSITION_FROM_VIRTUAL_KEY_POSITION(event.position);
if (mode != BEHAVIOR_SENSOR_BINDING_PROCESS_MODE_TRIGGER) {
data->triggers[sensor_position] = 0;
return 0;
}
int triggers = data->triggers[sensor_position];
struct zmk_behavior_binding triggered_binding;
if (triggers > 0) {
triggered_binding = cfg->cw_binding;

13
app/src/behaviors/behavior_sensor_rotate_common.h
View File

@@ -4,6 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <drivers/behavior.h>
#include <zmk/behavior.h>
#include <zmk/sensors.h>
@@ -16,10 +17,14 @@ struct behavior_sensor_rotate_config {
struct behavior_sensor_rotate_data {
struct sensor_value remainder[ZMK_KEYMAP_SENSORS_LEN];
int triggers[ZMK_KEYMAP_SENSORS_LEN];
};
int zmk_behavior_sensor_rotate_common_trigger(struct zmk_behavior_binding *binding,
int zmk_behavior_sensor_rotate_common_data(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event,
const struct zmk_sensor_config *sensor_config,
size_t channel_data_size,
const struct zmk_sensor_channel_data *channel_data);
int zmk_behavior_sensor_rotate_common_process(struct zmk_behavior_binding *binding,
struct zmk_behavior_binding_event event,
const struct zmk_sensor_config *sensor_config,
size_t channel_data_size,
const struct zmk_sensor_channel_data *channel_data);
enum behavior_sensor_binding_process_mode mode);

3
app/src/behaviors/behavior_sensor_rotate_var.c
View File

@@ -13,7 +13,8 @@
#include "behavior_sensor_rotate_common.h"
static const struct behavior_driver_api behavior_sensor_rotate_var_driver_api = {
.sensor_binding_triggered = zmk_behavior_sensor_rotate_common_trigger};
.sensor_binding_data = zmk_behavior_sensor_rotate_common_data,
.sensor_binding_process = zmk_behavior_sensor_rotate_common_process};
static int behavior_sensor_rotate_var_init(const struct device *dev) { return 0; };