3 files changed, 38 insertions, 27 deletions

diff --git a/app/src/behaviors/behavior_hid.c b/app/src/behaviors/behavior_hid.c
index b901450..9e1fb6b 100644
--- a/app/src/behaviors/behavior_hid.c
+++ b/app/src/behaviors/behavior_hid.c
@@ -15,6 +15,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/event-manager.h>
 #include <zmk/events/keycode-state-changed.h>
+#include <zmk/events/modifiers-state-changed.h>
 #include <zmk/hid.h>
 #include <zmk/endpoints.h>
 
@@ -56,14 +57,14 @@ static int behaviour_hid_keycode_released(u8_t usage_page, u32_t keycode)
   case USAGE_KEYPAD:
     err = zmk_hid_keypad_release(keycode);
     if (err) {
-      LOG_ERR("Unable to press keycode");
+      LOG_ERR("Unable to release keycode");
       return err;
     }
     break;
   case USAGE_CONSUMER:
     err = zmk_hid_consumer_release(keycode);
     if (err) {
-      LOG_ERR("Unable to press keycode");
+      LOG_ERR("Unable to release keycode");
       return err;
     }
     break;
@@ -71,6 +72,21 @@ static int behaviour_hid_keycode_released(u8_t usage_page, u32_t keycode)
   return zmk_endpoints_send_report(usage_page);
 }
 
+static int behavior_hid_modifiers_pressed(zmk_mod_flags modifiers)
+{
+  LOG_DBG("modifiers %d", modifiers);
+  
+  zmk_hid_register_mods(modifiers);
+  return zmk_endpoints_send_report(USAGE_KEYPAD);
+}
+
+static int behavior_hid_modifiers_released(zmk_mod_flags modifiers)
+{
+  LOG_DBG("modifiers %d", modifiers);
+  
+  zmk_hid_unregister_mods(modifiers);
+  return zmk_endpoints_send_report(USAGE_KEYPAD);
+}
 
 int behavior_hid_listener(const struct zmk_event_header *eh)
 {
@@ -81,37 +97,27 @@ int behavior_hid_listener(const struct zmk_event_header *eh)
     } else {
       behaviour_hid_keycode_released(ev->usage_page, ev->keycode);
     }
+  } else if (is_modifiers_state_changed(eh)) {
+    const struct modifiers_state_changed *ev = cast_modifiers_state_changed(eh);
+    if (ev->state) {
+      behavior_hid_modifiers_pressed(ev->modifiers);
+    } else {
+      behavior_hid_modifiers_released(ev->modifiers);
+    }
   }
   return 0;
 }
 
 ZMK_LISTENER(behavior_hid, behavior_hid_listener);
 ZMK_SUBSCRIPTION(behavior_hid, keycode_state_changed);
+ZMK_SUBSCRIPTION(behavior_hid, modifiers_state_changed);
 
 static int behavior_hid_init(struct device *dev)
 {
 	return 0;
 };
 
-static int on_modifiers_pressed(struct device *dev, zmk_mod_flags modifiers)
-{
-  LOG_DBG("modifiers %d", modifiers);
-  
-  zmk_hid_register_mods(modifiers);
-  return zmk_endpoints_send_report(USAGE_KEYPAD);
-}
-
-static int on_modifiers_released(struct device *dev, zmk_mod_flags modifiers)
-{
-  LOG_DBG("modifiers %d", modifiers);
-  
-  zmk_hid_unregister_mods(modifiers);
-  return zmk_endpoints_send_report(USAGE_KEYPAD);
-}
-
 static const struct behavior_driver_api behavior_hid_driver_api = {
-  .modifiers_pressed = on_modifiers_pressed,
-  .modifiers_released = on_modifiers_released
 };
 
 static const struct behavior_hid_config behavior_hid_config = {};
diff --git a/app/src/behaviors/behavior_mod_tap.c b/app/src/behaviors/behavior_mod_tap.c
index c9baff4..3746183 100644
--- a/app/src/behaviors/behavior_mod_tap.c
+++ b/app/src/behaviors/behavior_mod_tap.c
@@ -12,6 +12,7 @@
 
 #include <zmk/event-manager.h>
 #include <zmk/events/keycode-state-changed.h>
+#include <zmk/events/modifiers-state-changed.h>
 #include <zmk/events.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
@@ -48,21 +49,20 @@ 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;
@@ -73,7 +73,6 @@ static const struct behavior_driver_api behavior_mod_tap_driver_api = {
   .binding_released = on_keymap_binding_released,
 };
 
-
 static const struct behavior_mod_tap_config behavior_mod_tap_config = {};
 
 static struct behavior_mod_tap_data behavior_mod_tap_data;
diff --git a/app/src/events/modifiers_state_changed.c b/app/src/events/modifiers_state_changed.c
new file mode 100644
index 0000000..b7ae02d
--- /dev/null
+++ b/app/src/events/modifiers_state_changed.c
@@ -0,0 +1,6 @@
+
+
+#include <kernel.h>
+#include <zmk/events/modifiers-state-changed.h>
+
+ZMK_EVENT_IMPL(modifiers_state_changed);
\ No newline at end of file