summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorPete Johanson <peter@peterjohanson.com>2020-07-22 11:08:52 -0400
committerPete Johanson <peter@peterjohanson.com>2020-07-22 14:54:18 -0400
commit34ff6190bd6177705bed075c5d52f54e87930591 (patch)
treeb6f96edd1296bdc18a3226729571097bf0bbaed2 /app/src
parent4d73938cb5fd5e9b8d94d4e775fd8fba7eb83e3c (diff)
Initial behavior for key presses on encoder rotate
Diffstat (limited to 'app/src')
-rw-r--r--app/src/behaviors/behavior_sensor_rotate_key_press.c91
-rw-r--r--app/src/keymap.c12
-rw-r--r--app/src/sensors.c6
3 files changed, 107 insertions, 2 deletions
diff --git a/app/src/behaviors/behavior_sensor_rotate_key_press.c b/app/src/behaviors/behavior_sensor_rotate_key_press.c
new file mode 100644
index 0000000..fb0fb85
--- /dev/null
+++ b/app/src/behaviors/behavior_sensor_rotate_key_press.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define DT_DRV_COMPAT zmk_behavior_sensor_rotate_key_press
+
+#include <device.h>
+#include <drivers/behavior.h>
+#include <logging/log.h>
+
+#include <drivers/sensor.h>
+#include <zmk/event-manager.h>
+#include <zmk/events/keycode-state-changed.h>
+
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
+struct behavior_sensor_rotate_key_press_config {
+ u8_t usage_page;
+};
+struct behavior_sensor_rotate_key_press_data { };
+
+static int behavior_sensor_rotate_key_press_init(struct device *dev)
+{
+ return 0;
+};
+
+
+static int on_sensor_binding_triggered(struct device *dev, struct device *sensor, u32_t increment_keycode, u32_t decrement_keycode)
+{
+ const struct behavior_sensor_rotate_key_press_config *cfg = dev->config_info;
+ struct sensor_value value;
+ int err;
+ u32_t keycode;
+ struct keycode_state_changed *ev;
+ LOG_DBG("usage_page 0x%02X inc keycode 0x%02X dec keycode 0x%02X", cfg->usage_page, increment_keycode, decrement_keycode);
+
+ err = sensor_channel_get(sensor, SENSOR_CHAN_ROTATION, &value);
+
+ if (err) {
+ LOG_WRN("Failed to ge sensor rotation value: %d", err);
+ return err;
+ }
+
+ switch (value.val1) {
+ case 1:
+ keycode = increment_keycode;
+ break;
+ case -1:
+ keycode = decrement_keycode;
+ break;
+ default:
+ return -ENOTSUP;
+ }
+
+ LOG_DBG("SEND %d", keycode);
+
+
+ ev = new_keycode_state_changed();
+ ev->usage_page = cfg->usage_page;
+ ev->keycode = keycode;
+ ev->state = true;
+ ZMK_EVENT_RAISE(ev);
+
+ // TODO: Better way to do this?
+ k_msleep(5);
+
+ ev = new_keycode_state_changed();
+ ev->usage_page = cfg->usage_page;
+ ev->keycode = keycode;
+ ev->state = false;
+ return ZMK_EVENT_RAISE(ev);
+}
+
+static const struct behavior_driver_api behavior_sensor_rotate_key_press_driver_api = {
+ .sensor_binding_triggered = on_sensor_binding_triggered
+};
+
+#define KP_INST(n) \
+ static const struct behavior_sensor_rotate_key_press_config behavior_sensor_rotate_key_press_config_##n = { \
+ .usage_page = DT_INST_PROP(n, usage_page) \
+ }; \
+ static struct behavior_sensor_rotate_key_press_data behavior_sensor_rotate_key_press_data_##n; \
+ DEVICE_AND_API_INIT(behavior_sensor_rotate_key_press_##n, DT_INST_LABEL(n), behavior_sensor_rotate_key_press_init, \
+ &behavior_sensor_rotate_key_press_data_##n, \
+ &behavior_sensor_rotate_key_press_config_##n, \
+ APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \
+ &behavior_sensor_rotate_key_press_driver_api);
+
+DT_INST_FOREACH_STATUS_OKAY(KP_INST) \ No newline at end of file
diff --git a/app/src/keymap.c b/app/src/keymap.c
index d07f488..24e249d 100644
--- a/app/src/keymap.c
+++ b/app/src/keymap.c
@@ -64,7 +64,7 @@ static struct zmk_behavior_binding zmk_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_KEYMAP_
#endif
};
-
+#if ZMK_KEYMAP_HAS_SENSORS
#define _TRANSFORM_SENSOR_ENTRY(idx, layer) \
{ .behavior_dev = DT_LABEL(DT_PHANDLE_BY_IDX(DT_PHANDLE_BY_IDX(ZMK_KEYMAP_NODE, layers, layer), sensor_bindings, idx)), \
.param1 = COND_CODE_0(DT_PHA_HAS_CELL_AT_IDX(LAYER_NODE(layer), sensor_bindings, idx, param1), (0), (DT_PHA_BY_IDX(LAYER_NODE(layer), sensor_bindings, idx, param1))), \
@@ -109,6 +109,8 @@ static struct zmk_behavior_binding zmk_sensor_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_
#endif
};
+#endif /* ZMK_KEYMAP_HAS_SENSORS */
+
#define SET_LAYER_STATE(layer, state) \
if (layer >= 32) \
{ \
@@ -167,6 +169,7 @@ int zmk_keymap_position_state_changed(u32_t position, bool pressed)
return -ENOTSUP;
}
+#if ZMK_KEYMAP_HAS_SENSORS
int zmk_keymap_sensor_triggered(u8_t sensor_number, struct device *sensor)
{
for (int layer = ZMK_KEYMAP_LAYERS_LEN - 1; layer >= zmk_keymap_layer_default; layer--)
@@ -203,14 +206,18 @@ int zmk_keymap_sensor_triggered(u8_t sensor_number, struct device *sensor)
return -ENOTSUP;
}
+#endif /* ZMK_KEYMAP_HAS_SENSORS */
+
int keymap_listener(const struct zmk_event_header *eh)
{
if (is_position_state_changed(eh)) {
const struct position_state_changed *ev = cast_position_state_changed(eh);
return zmk_keymap_position_state_changed(ev->position, ev->state);
+#if ZMK_KEYMAP_HAS_SENSORS
} else if (is_sensor_event(eh)) {
const struct sensor_event *ev = cast_sensor_event(eh);
return zmk_keymap_sensor_triggered(ev->sensor_number, ev->sensor);
+#endif /* ZMK_KEYMAP_HAS_SENSORS */
}
return -ENOTSUP;
@@ -218,5 +225,8 @@ int keymap_listener(const struct zmk_event_header *eh)
ZMK_LISTENER(keymap, keymap_listener);
ZMK_SUBSCRIPTION(keymap, position_state_changed);
+
+#if ZMK_KEYMAP_HAS_SENSORS
ZMK_SUBSCRIPTION(keymap, sensor_event);
+#endif /* ZMK_KEYMAP_HAS_SENSORS */
diff --git a/app/src/sensors.c b/app/src/sensors.c
index d1135c0..0a86109 100644
--- a/app/src/sensors.c
+++ b/app/src/sensors.c
@@ -16,6 +16,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/event-manager.h>
#include <zmk/events/sensor-event.h>
+#if ZMK_KEYMAP_HAS_SENSORS
+
struct sensors_data_item {
u8_t sensor_number;
struct device *dev;
@@ -78,4 +80,6 @@ static int zmk_sensors_init(struct device *_arg)
SYS_INIT(zmk_sensors_init,
APPLICATION,
- CONFIG_APPLICATION_INIT_PRIORITY); \ No newline at end of file
+ CONFIG_APPLICATION_INIT_PRIORITY);
+
+#endif /* ZMK_KEYMAP_HAS_SENSORS */ \ No newline at end of file