Lots more pieces toward HID working again.

7 files changed, 198 insertions, 9 deletions

diff --git a/app/src/behaviors/behavior_hid.c b/app/src/behaviors/behavior_hid.c
new file mode 100644
index 0000000..2779568
--- /dev/null
+++ b/app/src/behaviors/behavior_hid.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define DT_DRV_COMPAT zmk_behavior_hid
+
+#include <device.h>
+#include <power/reboot.h>
+#include <drivers/behavior.h>
+#include <logging/log.h>
+
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
+#include <zmk/hid.h>
+#include <zmk/endpoints.h>
+
+struct behavior_hid_config { };
+struct behavior_hid_data { };
+
+static int behavior_hid_init(struct device *dev)
+{
+	return 0;
+};
+
+static int on_keycode_pressed(struct device *dev, u32_t keycode)
+{
+  enum zmk_hid_report_changes changes;
+  LOG_DBG("keycode %d", keycode);
+  
+  changes = zmk_hid_press_key(keycode);
+  return zmk_endpoints_send_report(changes);
+}
+
+static int on_keycode_released(struct device *dev, u32_t keycode)
+{
+  enum zmk_hid_report_changes changes;
+  LOG_DBG("keycode %d", keycode);
+  
+  changes = zmk_hid_release_key(keycode);
+  return zmk_endpoints_send_report(changes);
+}
+
+static const struct behavior_driver_api behavior_hid_driver_api = {
+  .keycode_pressed = on_keycode_pressed,
+  .keycode_released = on_keycode_released
+};
+
+
+static const struct behavior_hid_config behavior_hid_config = {};
+
+static struct behavior_hid_data behavior_hid_data;
+
+DEVICE_AND_API_INIT(behavior_hid, DT_INST_LABEL(0), behavior_hid_init,
+                    &behavior_hid_data,
+                    &behavior_hid_config,
+                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+                    &behavior_hid_driver_api);
\ No newline at end of file
diff --git a/app/src/behaviors/behavior_key_press.c b/app/src/behaviors/behavior_key_press.c
index b9d0ff0..3c57c51 100644
--- a/app/src/behaviors/behavior_key_press.c
+++ b/app/src/behaviors/behavior_key_press.c
@@ -10,6 +10,8 @@
 #include <drivers/behavior.h>
 #include <logging/log.h>
 
+#include <zmk/events.h>
+
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 struct behavior_key_press_config { };
@@ -29,19 +31,16 @@ static int behavior_key_press_init(struct device *dev)
 //  * < 0 - Indicate error processing, report and halt further propagation.
 static int on_position_pressed(struct device *dev, u32_t keycode, u32_t _)
 {
-  // Invoking this triggers a *new* event, that can be linked to other behaviours.
-  //return zmk_key_state_press(u32_t keycode);
-  return 0;
+  LOG_DBG("pressing: %d", keycode);
+  return zmk_events_keycode_pressed(keycode);
 }
 
 
 // They keycode is passed by the "keymap" based on the parameter created as part of the assignment.
 static int on_position_released(struct device *dev, u32_t keycode, u32_t _)
 {
-  // Invoking this triggers a *new* event, that can will be handled by other behaviors
-  // This is the "command" piece. Which could be better/richer, but captures essence here.
-  // return zmk_key_state_release(u32_t keycode);
-  return 0;
+  LOG_DBG("releasing: %d", keycode);
+  return zmk_events_keycode_released(keycode);
 }
 
 static const struct behavior_driver_api behavior_key_press_driver_api = {
diff --git a/app/src/behaviors/behavior_keymap.c b/app/src/behaviors/behavior_keymap.c
new file mode 100644
index 0000000..48f8547
--- /dev/null
+++ b/app/src/behaviors/behavior_keymap.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define DT_DRV_COMPAT zmk_behavior_keymap
+
+#include <device.h>
+#include <power/reboot.h>
+#include <drivers/behavior.h>
+#include <logging/log.h>
+
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
+#include <zmk/keymap.h>
+
+struct behavior_keymap_config { };
+struct behavior_keymap_data { };
+
+static int behavior_keymap_init(struct device *dev)
+{
+	return 0;
+};
+
+static int on_position_pressed(struct device *dev, u32_t row, u32_t column)
+{
+  return zmk_keymap_position_state_changed(row, column, true);
+}
+
+static int on_position_released(struct device *dev, u32_t row, u32_t column)
+{
+  return zmk_keymap_position_state_changed(row, column, false);
+}
+
+static const struct behavior_driver_api behavior_keymap_driver_api = {
+  .position_pressed = on_position_pressed,
+  .position_released = on_position_released
+};
+
+
+static const struct behavior_keymap_config behavior_keymap_config = {};
+
+static struct behavior_keymap_data behavior_keymap_data;
+
+DEVICE_AND_API_INIT(behavior_keymap, DT_INST_LABEL(0), behavior_keymap_init,
+                    &behavior_keymap_data,
+                    &behavior_keymap_config,
+                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+                    &behavior_keymap_driver_api);
\ No newline at end of file
diff --git a/app/src/endpoints.c b/app/src/endpoints.c
index f46d42d..2f31e10 100644
--- a/app/src/endpoints.c
+++ b/app/src/endpoints.c
@@ -40,6 +40,7 @@ int zmk_endpoints_send_report(enum zmk_hid_report_changes report_type)
     int err;
     struct zmk_hid_keypad_report *keypad_report;
     struct zmk_hid_consumer_report *consumer_report;
+    LOG_DBG("");
     switch (report_type)
     {
     case Keypad:
diff --git a/app/src/events.c b/app/src/events.c
new file mode 100644
index 0000000..c3e8d84
--- /dev/null
+++ b/app/src/events.c
@@ -0,0 +1,72 @@
+
+#include <zephyr.h>
+#include <drivers/behavior.h>
+#include <zmk/behavior.h>
+#include <zmk/events.h>
+#include <sys/util.h>
+
+#define BINDINGS_NODE DT_CHOSEN(zmk_global_bindings)
+#define BINDING_COUNT DT_PROP_LEN(BINDINGS_NODE, bindings)
+
+#define BINDING_GEN(idx,_) \
+    { .behavior_dev = DT_LABEL(DT_PHANDLE_BY_IDX(BINDINGS_NODE, bindings, idx)), \
+	  .param1 = COND_CODE_0(DT_PHA_HAS_CELL_AT_IDX(BINDINGS_NODE, bindings, idx, param1), (0), (DT_PHA_BY_IDX(BINDINGS_NODE, bindings, idx, param1))), \
+	  .param2 = COND_CODE_0(DT_PHA_HAS_CELL_AT_IDX(BINDINGS_NODE, bindings, idx, param2), (0), (DT_PHA_BY_IDX(BINDINGS_NODE, bindings, idx, param2))), \
+	},
+
+static const struct zmk_behavior_binding bindings[] =
+    { UTIL_LISTIFY(BINDING_COUNT, BINDING_GEN, 0) };
+
+int zmk_events_position_pressed(u32_t row, u32_t column)
+{
+    for (int i = 0; i < BINDING_COUNT; i++) {
+        const struct zmk_behavior_binding *b = &bindings[i];
+        struct device *dev = device_get_binding(b->behavior_dev);
+        behavior_position_pressed(dev, row, column);
+    }
+    return 0;
+};
+
+int zmk_events_position_released(u32_t row, u32_t column)
+{
+    for (int i = 0; i < BINDING_COUNT; i++) {
+        const struct zmk_behavior_binding *b = &bindings[i];
+        struct device *dev = device_get_binding(b->behavior_dev);
+        behavior_position_released(dev, row, column);
+    }
+    return 0;
+}
+int zmk_events_keycode_pressed(u32_t keycode)
+{
+    for (int i = 0; i < BINDING_COUNT; i++) {
+        const struct zmk_behavior_binding *b = &bindings[i];
+        struct device *dev = device_get_binding(b->behavior_dev);
+        behavior_keycode_pressed(dev, keycode);
+    }
+    return 0;
+}
+int zmk_events_keycode_released(u32_t keycode)
+{
+    for (int i = 0; i < BINDING_COUNT; i++) {
+        const struct zmk_behavior_binding *b = &bindings[i];
+        struct device *dev = device_get_binding(b->behavior_dev);
+        behavior_keycode_released(dev, keycode);
+    }
+    return 0;
+};
+int zmk_events_mod_pressed(u32_t modifier)
+{
+    return 0;
+};
+int zmk_events_mod_released(u32_t modifier)
+{
+    return 0;
+};
+int zmk_events_consumer_key_pressed(u32_t usage)
+{
+    return 0;
+};
+int zmk_events_consumer_key_released(u32_t usage)
+{
+    return 0;
+};
\ No newline at end of file
diff --git a/app/src/kscan.c b/app/src/kscan.c
index d1ed621..781824d 100644
--- a/app/src/kscan.c
+++ b/app/src/kscan.c
@@ -11,7 +11,7 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#include <zmk/keymap.h>
+#include <zmk/events.h>
 #include <zmk/handlers.h>
 
 #define ZMK_KSCAN_EVENT_STATE_PRESSED 0
@@ -49,7 +49,14 @@ void zmk_kscan_process_msgq(struct k_work *item)
 	while (k_msgq_get(&zmk_kscan_msgq, &ev, K_NO_WAIT) == 0)
 	{
 		bool pressed = (ev.state == ZMK_KSCAN_EVENT_STATE_PRESSED);
-		zmk_keymap_position_state_changed(ev.row, ev.column, pressed);
+		if (pressed) {
+			LOG_DBG("PRESSING");
+			zmk_events_position_pressed(ev.row, ev.column);
+		} else {
+			LOG_DBG("RELEASSING");
+			zmk_events_position_released(ev.row, ev.column);
+		}
+		// zmk_keymap_position_state_changed(ev.row, ev.column, pressed);
 		// zmk_key key = zmk_keymap_keycode_from_position(ev.row, ev.column);
 		// struct zmk_key_event kev = (struct zmk_key_event){.row = ev.row, .column = ev.column, .key = key, .pressed = pressed};
 
diff --git a/app/src/kscan_mock.c b/app/src/kscan_mock.c
index 7d2d24d..b0ba90b 100644
--- a/app/src/kscan_mock.c
+++ b/app/src/kscan_mock.c
@@ -9,6 +9,7 @@
 #include <device.h>
 #include <drivers/kscan.h>
 #include <logging/log.h>
+
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/kscan-mock.h>