2 files changed, 27 insertions, 4 deletions
diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode-state-changed.h
index 1e2c24e..26d07ec 100644
--- a/app/include/zmk/events/keycode-state-changed.h
+++ b/app/include/zmk/events/keycode-state-changed.h
@@ -7,22 +7,25 @@
 #pragma once
 
 #include <zephyr.h>
+#include <dt-bindings/zmk/modifiers.h>
 #include <zmk/event-manager.h>
 
 struct keycode_state_changed {
     struct zmk_event_header header;
     u8_t usage_page;
     u32_t keycode;
+    u8_t implicit_modifiers;
     bool state;
 };
 
 ZMK_EVENT_DECLARE(keycode_state_changed);
 
-inline struct keycode_state_changed *create_keycode_state_changed(u8_t usage_page, u32_t keycode,
-                                                                  bool state) {
+static inline struct keycode_state_changed *
+create_keycode_state_changed(u8_t usage_page, u32_t keycode, bool state) {
     struct keycode_state_changed *ev = new_keycode_state_changed();
     ev->usage_page = usage_page;
-    ev->keycode = keycode;
+    ev->keycode = STRIP_MODS(keycode);
+    ev->implicit_modifiers = SELECT_MODS(keycode);
     ev->state = state;
     return ev;
-}
-\ No newline at end of file
+}
diff --git a/app/include/zmk/events/usb-conn-state-changed.h b/app/include/zmk/events/usb-conn-state-changed.h
new file mode 100644
index 0000000..d6cc698
--- /dev/null
+++ b/app/include/zmk/events/usb-conn-state-changed.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#pragma once
+
+#include <zephyr.h>
+#include <usb/usb_device.h>
+
+#include <zmk/event-manager.h>
+#include <zmk/usb.h>
+
+struct usb_conn_state_changed {
+    struct zmk_event_header header;
+    enum zmk_usb_conn_state conn_state;
+};
+
+ZMK_EVENT_DECLARE(usb_conn_state_changed);
+\ No newline at end of file