refactor(app): consolidate hid_usage_pages.h into hid_usage.h

Groundwork for HID usage 32-bit refactor. PR: #382
2020-11-09 13:28:23 +00:00 · 2020-11-09 13:28:23 +00:00 · e2d51e8b27
commit e2d51e8b27
parent e89aa1cde8
8 changed files with 44 additions and 57 deletions
--- a/app/include/dt-bindings/zmk/hid_usage.h
+++ b/app/include/dt-bindings/zmk/hid_usage.h
@ -10,6 +10,46 @@

 #pragma once

+#define HID_USAGE(page, id) ((page << 16) | id)
+#define HID_USAGE_ID(usage) (usage & 0xFFFF)
+#define HID_USAGE_PAGE(usage) (usage >> 16)
+
+/* WARNING: DEPRECATED from dt-bindings/zmk/keys.h */
+#define USAGE_KEYPAD (0x07)   // WARNING: DEPRECATED (DO NOT USE)
+#define USAGE_CONSUMER (0x0C) // WARNING: DEPRECATED (DO NOT USE)
+
+#define HID_USAGE_GD (0x01)             // Generic Desktop
+#define HID_USAGE_SIM (0x02)            // Simulation Controls
+#define HID_USAGE_VR (0x03)             // VR Controls
+#define HID_USAGE_SPORT (0x04)          // Sport Controls
+#define HID_USAGE_GAME (0x05)           // Game Controls
+#define HID_USAGE_GDV (0x06)            // Generic Device Controls
+#define HID_USAGE_KEY (0x07)            // Keyboard/Keypad
+#define HID_USAGE_LED (0x08)            // LED
+#define HID_USAGE_TELEPHONY (0x0B)      // Telephony Device
+#define HID_USAGE_CONSUMER (0x0C)       // Consumer
+#define HID_USAGE_DIGITIZERS (0x0D)     // Digitizers
+#define HID_USAGE_HAPTICS (0x0E)        // Haptics
+#define HID_USAGE_PID (0x0F)            // PID
+#define HID_USAGE_EHT (0x12)            // Eye and Head Trackers
+#define HID_USAGE_AUXDISP (0x14)        // Auxiliary Display
+#define HID_USAGE_SENSORS (0x20)        // Sensors
+#define HID_USAGE_MEDICAL (0x40)        // Medical Instrument
+#define HID_USAGE_BRAILLE (0x41)        // Braille Display
+#define HID_USAGE_LIGHT (0x59)          // Lighting And Illumination
+#define HID_USAGE_MONITOR (0x80)        // USB Monitor
+#define HID_USAGE_MONITOR_VALUES (0x81) // Monitor Enumerated Values
+#define HID_USAGE_MONITOR_VESA (0x82)   // VESA Virtual Control
+#define HID_USAGE_POWER (0x84)          // Power
+#define HID_USAGE_POS_BARCODE (0x8C)    // Bar Code Scanner
+#define HID_USAGE_POS_SCALE (0x8D)      // Scale
+#define HID_USAGE_POS_MSR (0x8E)        // Magnetic Stripe Reading (MSR) Devices
+#define HID_USAGE_POS_RESV (0x8F)       // Reserved Point of Sale
+#define HID_USAGE_CAMERA (0x90)         // Camera Control
+#define HID_USAGE_ARCADE (0x91)         // Arcade
+#define HID_USAGE_GAMING (0x92)         // Gaming Device
+#define HID_USAGE_FIDO (0xF1D0)         // FIDO Alliance
+
 /* Page 0x01: Generic Desktop */
 #define HID_USAGE_GD_UNDEFINED (0x00)
 #define HID_USAGE_GD_POINTER (0x01)                                    // CP
--- a/app/include/dt-bindings/zmk/hid_usage_pages.h
+++ b/app/include/dt-bindings/zmk/hid_usage_pages.h
@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2020 The ZMK Contributors
- *
- * SPDX-License-Identifier: MIT
- *
- * Based on HID Usage Tables 1.21,
- * Copyright © 1996-2020, USB Implementers Forum,
- * https://www.usb.org/sites/default/files/hut1_21.pdf
- */
-
-#pragma once
-
-#define HID_USAGE(page, id) ((page << 16) | id)
-#define HID_USAGE_ID(usage) (usage & 0xFFFF)
-#define HID_USAGE_PAGE(usage) (usage >> 16)
-
-/* WARNING: DEPRECATED from dt-bindings/zmk/keys.h */
-#define USAGE_KEYPAD (0x07)   // WARNING: DEPRECATED (DO NOT USE)
-#define USAGE_CONSUMER (0x0C) // WARNING: DEPRECATED (DO NOT USE)
-
-#define HID_USAGE_GD (0x01)             // Generic Desktop
-#define HID_USAGE_SIM (0x02)            // Simulation Controls
-#define HID_USAGE_VR (0x03)             // VR Controls
-#define HID_USAGE_SPORT (0x04)          // Sport Controls
-#define HID_USAGE_GAME (0x05)           // Game Controls
-#define HID_USAGE_GDV (0x06)            // Generic Device Controls
-#define HID_USAGE_KEY (0x07)            // Keyboard/Keypad
-#define HID_USAGE_LED (0x08)            // LED
-#define HID_USAGE_TELEPHONY (0x0B)      // Telephony Device
-#define HID_USAGE_CONSUMER (0x0C)       // Consumer
-#define HID_USAGE_DIGITIZERS (0x0D)     // Digitizers
-#define HID_USAGE_HAPTICS (0x0E)        // Haptics
-#define HID_USAGE_PID (0x0F)            // PID
-#define HID_USAGE_EHT (0x12)            // Eye and Head Trackers
-#define HID_USAGE_AUXDISP (0x14)        // Auxiliary Display
-#define HID_USAGE_SENSORS (0x20)        // Sensors
-#define HID_USAGE_MEDICAL (0x40)        // Medical Instrument
-#define HID_USAGE_BRAILLE (0x41)        // Braille Display
-#define HID_USAGE_LIGHT (0x59)          // Lighting And Illumination
-#define HID_USAGE_MONITOR (0x80)        // USB Monitor
-#define HID_USAGE_MONITOR_VALUES (0x81) // Monitor Enumerated Values
-#define HID_USAGE_MONITOR_VESA (0x82)   // VESA Virtual Control
-#define HID_USAGE_POWER (0x84)          // Power
-#define HID_USAGE_POS_BARCODE (0x8C)    // Bar Code Scanner
-#define HID_USAGE_POS_SCALE (0x8D)      // Scale
-#define HID_USAGE_POS_MSR (0x8E)        // Magnetic Stripe Reading (MSR) Devices
-#define HID_USAGE_POS_RESV (0x8F)       // Reserved Point of Sale
-#define HID_USAGE_CAMERA (0x90)         // Camera Control
-#define HID_USAGE_ARCADE (0x91)         // Arcade
-#define HID_USAGE_GAMING (0x92)         // Gaming Device
-#define HID_USAGE_FIDO (0xF1D0)         // FIDO Alliance
--- a/app/include/dt-bindings/zmk/keys.h
+++ b/app/include/dt-bindings/zmk/keys.h
@ -6,7 +6,6 @@
 #pragma once

 #include <dt-bindings/zmk/hid_usage.h>
-#include <dt-bindings/zmk/hid_usage_pages.h>
 #include <dt-bindings/zmk/modifiers.h>

 /* System Power Down */
--- a/app/include/zmk/events/keycode-state-changed.h
+++ b/app/include/zmk/events/keycode-state-changed.h
@ -8,7 +8,7 @@

 #include <zephyr.h>
 #include <dt-bindings/zmk/modifiers.h>
-#include <dt-bindings/zmk/hid_usage_pages.h>
+#include <dt-bindings/zmk/hid_usage.h>
 #include <zmk/event-manager.h>
 #include <zmk/keys.h>

--- a/app/include/zmk/hid.h
+++ b/app/include/zmk/hid.h
@ -11,7 +11,6 @@

 #include <zmk/keys.h>
 #include <dt-bindings/zmk/hid_usage.h>
-#include <dt-bindings/zmk/hid_usage_pages.h>

 #define COLLECTION_REPORT 0x03

--- a/app/src/behaviors/behavior_hold_tap.c
+++ b/app/src/behaviors/behavior_hold_tap.c
@ -9,7 +9,7 @@
 #include <device.h>
 #include <drivers/behavior.h>
 #include <dt-bindings/zmk/keys.h>
-#include <dt-bindings/zmk/hid_usage_pages.h>
+#include <dt-bindings/zmk/hid_usage.h>
 #include <logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/matrix.h>
--- a/app/src/endpoints.c
+++ b/app/src/endpoints.c
@ -10,7 +10,7 @@
 #include <zmk/ble.h>
 #include <zmk/endpoints.h>
 #include <zmk/hid.h>
-#include <dt-bindings/zmk/hid_usage_pages.h>
+#include <dt-bindings/zmk/hid_usage.h>
 #include <zmk/usb.h>
 #include <zmk/hog.h>
 #include <zmk/event-manager.h>
--- a/app/src/hid_listener.c
+++ b/app/src/hid_listener.c
@ -13,7 +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 <dt-bindings/zmk/hid_usage.h>
 #include <zmk/endpoints.h>

 static int hid_listener_keycode_pressed(uint8_t usage_page, uint32_t keycode,