Merge pull request #61 from petejohanson/sensors/sensor-keymap-bindings

Add sensor handling to keymaps.

1 files changed, 101 insertions, 3 deletions

diff --git a/app/src/keymap.c b/app/src/keymap.c
index dcfd0f1..24e249d 100644
--- a/app/src/keymap.c
+++ b/app/src/keymap.c
@@ -4,6 +4,7 @@
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/matrix.h>
+#include <zmk/sensors.h>
 #include <zmk/keymap.h>
 #include <dt-bindings/zmk/matrix-transform.h>
 #include <drivers/behavior.h>
@@ -11,6 +12,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/event-manager.h>
 #include <zmk/events/position-state-changed.h>
+#include <zmk/events/sensor-event.h>
 
 static u32_t zmk_keymap_layer_state = 0;
 static u8_t zmk_keymap_layer_default = 0;
@@ -62,6 +64,53 @@ 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))), \
+	  .param2 = COND_CODE_0(DT_PHA_HAS_CELL_AT_IDX(LAYER_NODE(layer), sensor_bindings, idx, param2), (0), (DT_PHA_BY_IDX(LAYER_NODE(layer), sensor_bindings, idx, param2))), \
+	},
+
+#define SENSOR_LAYER(idx) \
+	COND_CODE_1(DT_NODE_HAS_PROP(DT_PHANDLE_BY_IDX(ZMK_KEYMAP_NODE, layers, idx), sensor_bindings), \
+		({ UTIL_LISTIFY(DT_PROP_LEN(DT_PHANDLE_BY_IDX(ZMK_KEYMAP_NODE, layers, idx), sensor_bindings), _TRANSFORM_SENSOR_ENTRY, idx) }), \
+		(NULL))
+
+static struct zmk_behavior_binding zmk_sensor_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_KEYMAP_SENSORS_LEN] = {
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 0)
+	SENSOR_LAYER(0),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 1)
+	SENSOR_LAYER(1),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 2)
+	SENSOR_LAYER(2),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 3)
+	SENSOR_LAYER(3),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 4)
+	SENSOR_LAYER(4),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 5)
+	SENSOR_LAYER(5),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 6)
+	SENSOR_LAYER(6),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 7)
+	SENSOR_LAYER(7),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 8)
+	SENSOR_LAYER(8),
+#endif
+#if DT_PROP_HAS_IDX(ZMK_KEYMAP_NODE, layers, 9)
+	SENSOR_LAYER(9),
+#endif
+};
+
+#endif /* ZMK_KEYMAP_HAS_SENSORS */
+
 #define SET_LAYER_STATE(layer, state)                \
 	if (layer >= 32)                                 \
 	{                                                \
@@ -90,7 +139,7 @@ int zmk_keymap_position_state_changed(u32_t position, bool pressed)
 			struct device *behavior;
 			int ret;
 
-			LOG_DBG("layer: %d position: %d, binding name: %s", layer, position, binding->behavior_dev);
+			LOG_DBG("layer: %d position: %d, binding name: %s", layer, position, log_strdup(binding->behavior_dev));
 
 			behavior = device_get_binding(binding->behavior_dev);
 
@@ -120,15 +169,64 @@ 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--)
+	{
+		if (((zmk_keymap_layer_state & BIT(layer)) == BIT(layer) || layer == zmk_keymap_layer_default) && zmk_sensor_keymap[layer] != NULL)
+		{
+			struct zmk_behavior_binding *binding = &zmk_sensor_keymap[layer][sensor_number];
+			struct device *behavior;
+			int ret;
+
+			LOG_DBG("layer: %d sensor_number: %d, binding name: %s", layer, sensor_number, log_strdup(binding->behavior_dev));
+
+			behavior = device_get_binding(binding->behavior_dev);
+
+			if (!behavior) {
+				LOG_DBG("No behavior assigned to %d on layer %d", sensor_number, layer);
+				continue;
+			}
+			
+			ret = behavior_sensor_keymap_binding_triggered(behavior, sensor, binding->param1, binding->param2);
+
+			if (ret > 0) {
+				LOG_DBG("behavior processing to continue to next layer");
+				continue;
+			} else if (ret < 0) {
+				LOG_DBG("Behavior returned error: %d", ret);
+				return ret; 
+			} else {
+				return ret;
+			}
+		}
+	}
+
+	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);
-		zmk_keymap_position_state_changed(ev->position, ev->state);
+		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 0;
+
+	return -ENOTSUP;
 }
 
 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 */
+