1 files changed, 25 insertions, 30 deletions

diff --git a/app/src/behaviors/behavior_mod_tap.c b/app/src/behaviors/behavior_mod_tap.c
index 2e6e339..62604eb 100644
--- a/app/src/behaviors/behavior_mod_tap.c
+++ b/app/src/behaviors/behavior_mod_tap.c
@@ -10,7 +10,9 @@
 #include <drivers/behavior.h>
 #include <logging/log.h>
 
-#include <zmk/events.h>
+#include <zmk/event-manager.h>
+#include <zmk/events/keycode-state-changed.h>
+#include <zmk/events/modifiers-state-changed.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
@@ -19,6 +21,22 @@ struct behavior_mod_tap_data {
   u16_t pending_press_positions;
 };
 
+int behavior_mod_tap_listener(const struct zmk_event_header *eh)
+{
+  if (is_keycode_state_changed(eh)) {
+    struct device *dev = device_get_binding(DT_INST_LABEL(0));
+    const struct keycode_state_changed *ev = cast_keycode_state_changed(eh);
+    if (ev->state) {
+      struct behavior_mod_tap_data *data = dev->driver_data;
+      data->pending_press_positions = 0;
+    }
+  }
+  return 0;
+}
+
+ZMK_LISTENER(behavior_mod_tap, behavior_mod_tap_listener);
+ZMK_SUBSCRIPTION(behavior_mod_tap, keycode_state_changed);
+
 static int behavior_mod_tap_init(struct device *dev)
 {
 	return 0;
@@ -30,58 +48,35 @@ static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t m
   struct behavior_mod_tap_data *data = dev->driver_data;
   LOG_DBG("mods: %d, keycode: %d", mods, keycode);
   WRITE_BIT(data->pending_press_positions, position, true);
-  return zmk_events_modifiers_pressed(mods);
+  return ZMK_EVENT_RAISE(create_modifiers_state_changed(mods, true));
 }
 
-
-// They keycode is passed by the "keymap" based on the parameter created as part of the assignment.
 static int on_keymap_binding_released(struct device *dev, u32_t position, u32_t mods, u32_t keycode)
 {
   struct behavior_mod_tap_data *data = dev->driver_data;
   LOG_DBG("mods: %d, keycode: %d", mods, keycode);
   
-zmk_events_modifiers_released(mods);
+  ZMK_EVENT_RAISE(create_modifiers_state_changed(mods, false));
+  k_msleep(10); // TODO: Better approach than k_msleep to avoid USB send failures? Retries in the USB endpoint layer?
   if (data->pending_press_positions & BIT(position)) {
-    zmk_events_keycode_pressed(USAGE_KEYPAD, keycode);
+    ZMK_EVENT_RAISE(create_keycode_state_changed(USAGE_KEYPAD, keycode, true));
     k_msleep(10);
-    zmk_events_keycode_released(USAGE_KEYPAD, keycode);
+    ZMK_EVENT_RAISE(create_keycode_state_changed(USAGE_KEYPAD, keycode, false));
   }
 
   return 0;
 }
 
-static int on_keycode_pressed(struct device *dev, u8_t usage_page, u32_t keycode)
-{
-  struct behavior_mod_tap_data *data = dev->driver_data;
-  data->pending_press_positions = 0;
-  LOG_DBG("pressing: %d", keycode);
-  return 0;
-}
-
-static int on_keycode_released(struct device *dev, u8_t usage_page, u32_t keycode)
-{
-  LOG_DBG("releasing: %d", keycode);
-  return 0;
-}
-
 static const struct behavior_driver_api behavior_mod_tap_driver_api = {
-  // These callbacks are all optional, and define which kinds of events the behavior can handle.
-  // They can reference local functions defined here, or shared event handlers.
   .binding_pressed = on_keymap_binding_pressed,
   .binding_released = on_keymap_binding_released,
-  .keycode_pressed = on_keycode_pressed,
-  .keycode_released = on_keycode_released
-  // Other optional callbacks a behavior can implement
-  // .on_mouse_moved
-  // .on_sensor_data - Any behaviour that wants to be linked to a censor can implement this behavior
 };
 
-
 static const struct behavior_mod_tap_config behavior_mod_tap_config = {};
 
 static struct behavior_mod_tap_data behavior_mod_tap_data;
 
-DEVICE_AND_API_INIT(behavior_key_press, DT_INST_LABEL(0), behavior_mod_tap_init,
+DEVICE_AND_API_INIT(behavior_mod_tap, DT_INST_LABEL(0), behavior_mod_tap_init,
                     &behavior_mod_tap_data,
                     &behavior_mod_tap_config,
                     APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,