refactor(keys): Unify usage page.

* Remove need for separate `&cp` behavior, but
  keep it for now for backward compat.
* Refactor sensor inc/dec as well.

1 files changed, 16 insertions, 6 deletions

diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode-state-changed.h
index 26d07ec..fe47a0f 100644
--- a/app/include/zmk/events/keycode-state-changed.h
+++ b/app/include/zmk/events/keycode-state-changed.h
@@ -8,7 +8,9 @@
 
 #include <zephyr.h>
 #include <dt-bindings/zmk/modifiers.h>
+#include <dt-bindings/zmk/hid_usage_pages.h>
 #include <zmk/event-manager.h>
+#include <zmk/keys.h>
 
 struct keycode_state_changed {
     struct zmk_event_header header;
@@ -20,12 +22,20 @@ struct keycode_state_changed {
 
 ZMK_EVENT_DECLARE(keycode_state_changed);
 
-static inline struct keycode_state_changed *
-create_keycode_state_changed(u8_t usage_page, u32_t keycode, bool state) {
+static inline struct keycode_state_changed *keycode_state_changed_from_encoded(u32_t encoded,
+                                                                               bool pressed) {
+    u16_t page = HID_EXT_USAGE_PAGE(encoded) & 0xFF;
+    u16_t id = HID_EXT_USAGE_ID(encoded);
+    zmk_mod_flags implicit_mods = SELECT_MODS(encoded);
+
+    if (!page) {
+        page = HID_USAGE_KEY;
+    }
+
     struct keycode_state_changed *ev = new_keycode_state_changed();
-    ev->usage_page = usage_page;
-    ev->keycode = STRIP_MODS(keycode);
-    ev->implicit_modifiers = SELECT_MODS(keycode);
-    ev->state = state;
+    ev->usage_page = page;
+    ev->keycode = id;
+    ev->implicit_modifiers = implicit_mods;
+    ev->state = pressed;
     return ev;
 }