From e925319e4ce14b8aaf3515d3f2bea8b9eb287e89 Mon Sep 17 00:00:00 2001
From: innovaker <66737976+innovaker@users.noreply.github.com>
Date: Tue, 3 Nov 2020 16:54:16 +0000
Subject: refactor(hid): Replace deprecated HID usage page references

Deprecate `USAGE_KEYPAD` and replace with `HID_USAGE_KEY`.

Deprecate `USAGE_CONSUMER` and replace with `HID_USAGE_CONSUMER`.

Closes #217.
---
 app/src/behaviors/behavior_hold_tap.c | 3 ++-
 app/src/endpoints.c                   | 9 +++++----
 app/src/hid_listener.c                | 9 +++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'app/src')

diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c
index ac91e7d..d190148 100644
--- a/app/src/behaviors/behavior_hold_tap.c
+++ b/app/src/behaviors/behavior_hold_tap.c
@@ -9,6 +9,7 @@
 #include <device.h>
 #include <drivers/behavior.h>
 #include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/hid_usage_pages.h>
 #include <logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/matrix.h>
@@ -428,7 +429,7 @@ static int position_state_changed_listener(const struct zmk_event_header *eh) {
 }
 
 static inline bool only_mods(struct keycode_state_changed *ev) {
-    return ev->usage_page == USAGE_KEYPAD && ev->keycode >= LCTL && ev->keycode <= RGUI;
+    return ev->usage_page == HID_USAGE_KEY && ev->keycode >= LCTL && ev->keycode <= RGUI;
 }
 
 static int keycode_state_changed_listener(const struct zmk_event_header *eh) {
diff --git a/app/src/endpoints.c b/app/src/endpoints.c
index 0c79589..9a6967c 100644
--- a/app/src/endpoints.c
+++ b/app/src/endpoints.c
@@ -10,6 +10,7 @@
 #include <zmk/ble.h>
 #include <zmk/endpoints.h>
 #include <zmk/hid.h>
+#include <dt-bindings/zmk/hid_usage_pages.h>
 #include <zmk/usb.h>
 #include <zmk/hog.h>
 #include <zmk/event-manager.h>
@@ -116,9 +117,9 @@ int zmk_endpoints_send_report(u8_t usage_page) {
 
     LOG_DBG("usage page 0x%02X", usage_page);
     switch (usage_page) {
-    case USAGE_KEYPAD:
+    case HID_USAGE_KEY:
         return send_keypad_report();
-    case USAGE_CONSUMER:
+    case HID_USAGE_CONSUMER:
         return send_consumer_report();
     default:
         LOG_ERR("Unsupported usage page %d", usage_page);
@@ -209,8 +210,8 @@ static void disconnect_current_endpoint() {
     zmk_hid_keypad_clear();
     zmk_hid_consumer_clear();
 
-    zmk_endpoints_send_report(USAGE_KEYPAD);
-    zmk_endpoints_send_report(USAGE_CONSUMER);
+    zmk_endpoints_send_report(HID_USAGE_KEY);
+    zmk_endpoints_send_report(HID_USAGE_CONSUMER);
 }
 
 static void update_current_endpoint() {
diff --git a/app/src/hid_listener.c b/app/src/hid_listener.c
index 32e9d97..5efb798 100644
--- a/app/src/hid_listener.c
+++ b/app/src/hid_listener.c
@@ -13,6 +13,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 #include <zmk/events/keycode-state-changed.h>
 #include <zmk/events/modifiers-state-changed.h>
 #include <zmk/hid.h>
+#include <dt-bindings/zmk/hid_usage_pages.h>
 #include <zmk/endpoints.h>
 
 static int hid_listener_keycode_pressed(u8_t usage_page, u32_t keycode,
@@ -21,14 +22,14 @@ static int hid_listener_keycode_pressed(u8_t usage_page, u32_t keycode,
     LOG_DBG("usage_page 0x%02X keycode 0x%02X mods 0x%02X", usage_page, keycode,
             implicit_modifiers);
     switch (usage_page) {
-    case USAGE_KEYPAD:
+    case HID_USAGE_KEY:
         err = zmk_hid_keypad_press(keycode);
         if (err) {
             LOG_ERR("Unable to press keycode");
             return err;
         }
         break;
-    case USAGE_CONSUMER:
+    case HID_USAGE_CONSUMER:
         err = zmk_hid_consumer_press(keycode);
         if (err) {
             LOG_ERR("Unable to press keycode");
@@ -46,14 +47,14 @@ static int hid_listener_keycode_released(u8_t usage_page, u32_t keycode,
     LOG_DBG("usage_page 0x%02X keycode 0x%02X mods 0x%02X", usage_page, keycode,
             implicit_modifiers);
     switch (usage_page) {
-    case USAGE_KEYPAD:
+    case HID_USAGE_KEY:
         err = zmk_hid_keypad_release(keycode);
         if (err) {
             LOG_ERR("Unable to release keycode");
             return err;
         }
         break;
-    case USAGE_CONSUMER:
+    case HID_USAGE_CONSUMER:
         err = zmk_hid_consumer_release(keycode);
         if (err) {
             LOG_ERR("Unable to release keycode");
-- 
cgit v1.2.3