kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Report refactor (added macros)

Browse source
This commit is contained in:
krikun98 2021-05-03 12:32:36 +03:00 • committed by Alexander Krikun
parent 8e6fbdcc25
commit 2d3f0e1d92
2 changed files with 168 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/include/dt-bindings/zmk/hid_usage_pages.h
View file

@ -26,6 +26,7 @@
#define HID_USAGE_GDV (0x06) // Generic Device Controls #define HID_USAGE_GDV (0x06) // Generic Device Controls
#define HID_USAGE_KEY (0x07) // Keyboard/Keypad #define HID_USAGE_KEY (0x07) // Keyboard/Keypad
#define HID_USAGE_LED (0x08) // LED #define HID_USAGE_LED (0x08) // LED
#define HID_USAGE_BUTTON (0x09) // Button
#define HID_USAGE_TELEPHONY (0x0B) // Telephony Device #define HID_USAGE_TELEPHONY (0x0B) // Telephony Device
#define HID_USAGE_CONSUMER (0x0C) // Consumer #define HID_USAGE_CONSUMER (0x0C) // Consumer
#define HID_USAGE_DIGITIZERS (0x0D) // Digitizers #define HID_USAGE_DIGITIZERS (0x0D) // Digitizers

232
app/include/zmk/hid.h
View file

@ -14,45 +14,59 @@
#include <dt-bindings/zmk/hid_usage.h> #include <dt-bindings/zmk/hid_usage.h>
#include <dt-bindings/zmk/hid_usage_pages.h> #include <dt-bindings/zmk/hid_usage_pages.h>
#define ZMK_HID_KEYBOARD_NKRO_MAX_USAGE HID_USAGE_KEY_KEYPAD_EQUAL
#define COLLECTION_REPORT 0x03 #define COLLECTION_REPORT 0x03
static const uint8_t zmk_hid_report_desc[] = { static const uint8_t zmk_hid_report_desc[] = {
/* USAGE_PAGE (Generic Desktop) */ /* USAGE_PAGE (Generic Desktop) */
HID_GI_USAGE_PAGE, HID_USAGE_GD, HID_GI_USAGE_PAGE,
HID_USAGE_GD,
/* USAGE (Keyboard) */ /* USAGE (Keyboard) */
HID_LI_USAGE, HID_USAGE_GD_KEYBOARD, HID_LI_USAGE,
HID_USAGE_GD_KEYBOARD,
/* COLLECTION (Application) */ /* COLLECTION (Application) */
HID_MI_COLLECTION, COLLECTION_APPLICATION, HID_MI_COLLECTION,
COLLECTION_APPLICATION,
/* REPORT ID (1) */ /* REPORT ID (1) */
HID_GI_REPORT_ID, 0x01, HID_GI_REPORT_ID,
0x01,
/* USAGE_PAGE (Keyboard/Keypad) */ /* USAGE_PAGE (Keyboard/Keypad) */
HID_GI_USAGE_PAGE, HID_USAGE_KEY, HID_GI_USAGE_PAGE,
HID_USAGE_KEY,
/* USAGE_MINIMUM (Keyboard LeftControl) */ /* USAGE_MINIMUM (Keyboard LeftControl) */
HID_LI_USAGE_MIN(1), HID_USAGE_KEY_KEYBOARD_LEFTCONTROL, HID_LI_USAGE_MIN(1),
HID_USAGE_KEY_KEYBOARD_LEFTCONTROL,
/* USAGE_MAXIMUM (Keyboard Right GUI) */ /* USAGE_MAXIMUM (Keyboard Right GUI) */
HID_LI_USAGE_MAX(1), HID_USAGE_KEY_KEYBOARD_RIGHT_GUI, HID_LI_USAGE_MAX(1),
HID_USAGE_KEY_KEYBOARD_RIGHT_GUI,
/* LOGICAL_MINIMUM (0) */ /* LOGICAL_MINIMUM (0) */
HID_GI_LOGICAL_MIN(1), 0x00, HID_GI_LOGICAL_MIN(1),
0x00,
/* LOGICAL_MAXIMUM (1) */ /* LOGICAL_MAXIMUM (1) */
HID_GI_LOGICAL_MAX(1), 0x01, HID_GI_LOGICAL_MAX(1),
0x01,
/* REPORT_SIZE (1) */ /* REPORT_SIZE (1) */
HID_GI_REPORT_SIZE, 0x01, HID_GI_REPORT_SIZE,
0x01,
/* REPORT_COUNT (8) */ /* REPORT_COUNT (8) */
HID_GI_REPORT_COUNT, 0x08, HID_GI_REPORT_COUNT,
0x08,
/* INPUT (Data,Var,Abs) */ /* INPUT (Data,Var,Abs) */
HID_MI_INPUT, 0x02, HID_MI_INPUT,
0x02,
/* USAGE_PAGE (Keyboard/Keypad) */ /* USAGE_PAGE (Keyboard/Keypad) */
HID_GI_USAGE_PAGE, HID_USAGE_KEY, HID_GI_USAGE_PAGE,
HID_USAGE_KEY,
/* REPORT_SIZE (8) */ /* REPORT_SIZE (8) */
HID_GI_REPORT_SIZE, 0x08, HID_GI_REPORT_SIZE,
0x08,
/* REPORT_COUNT (1) */ /* REPORT_COUNT (1) */
HID_GI_REPORT_COUNT, 0x01, HID_GI_REPORT_COUNT,
0x01,
/* INPUT (Cnst,Var,Abs) */ /* INPUT (Cnst,Var,Abs) */
HID_MI_INPUT, 0x03, HID_MI_INPUT,
0x03,
/* USAGE_PAGE (Keyboard/Keypad) */ /* USAGE_PAGE (Keyboard/Keypad) */
HID_GI_USAGE_PAGE, HID_GI_USAGE_PAGE,
@ -82,13 +96,17 @@ static const uint8_t zmk_hid_report_desc[] = {
0x02, 0x02,
#elif IS_ENABLED(CONFIG_ZMK_HID_REPORT_TYPE_HKRO) #elif IS_ENABLED(CONFIG_ZMK_HID_REPORT_TYPE_HKRO)
/* LOGICAL_MINIMUM (0) */ /* LOGICAL_MINIMUM (0) */
HID_GI_LOGICAL_MIN(1), 0x00, HID_GI_LOGICAL_MIN(1),
0x00,
/* LOGICAL_MAXIMUM (0xFF) */ /* LOGICAL_MAXIMUM (0xFF) */
HID_GI_LOGICAL_MAX(1), 0xFF, HID_GI_LOGICAL_MAX(1),
0xFF,
/* USAGE_MINIMUM (Reserved) */ /* USAGE_MINIMUM (Reserved) */
HID_LI_USAGE_MIN(1), 0x00, HID_LI_USAGE_MIN(1),
0x00,
/* USAGE_MAXIMUM (Keyboard Application) */ /* USAGE_MAXIMUM (Keyboard Application) */
HID_LI_USAGE_MAX(1), 0xFF, HID_LI_USAGE_MAX(1),
0xFF,
/* REPORT_SIZE (1) */ /* REPORT_SIZE (1) */
HID_GI_REPORT_SIZE, HID_GI_REPORT_SIZE,
0x08, 0x08,
@ -105,13 +123,17 @@ static const uint8_t zmk_hid_report_desc[] = {
/* END_COLLECTION */ /* END_COLLECTION */
HID_MI_COLLECTION_END, HID_MI_COLLECTION_END,
/* USAGE_PAGE (Consumer) */ /* USAGE_PAGE (Consumer) */
HID_GI_USAGE_PAGE, HID_USAGE_CONSUMER, HID_GI_USAGE_PAGE,
HID_USAGE_CONSUMER,
/* USAGE (Consumer Control) */ /* USAGE (Consumer Control) */
HID_LI_USAGE, HID_USAGE_CONSUMER_CONSUMER_CONTROL, HID_LI_USAGE,
HID_USAGE_CONSUMER_CONSUMER_CONTROL,
/* Consumer Page */ /* Consumer Page */
HID_MI_COLLECTION, COLLECTION_APPLICATION, HID_MI_COLLECTION,
COLLECTION_APPLICATION,
/* REPORT ID (1) */ /* REPORT ID (1) */
HID_GI_REPORT_ID, 0x02, HID_GI_REPORT_ID,
0x02,
/* USAGE_PAGE (Consumer) */ /* USAGE_PAGE (Consumer) */
HID_GI_USAGE_PAGE, HID_GI_USAGE_PAGE,
HID_USAGE_CONSUMER, HID_USAGE_CONSUMER,
@ -134,11 +156,18 @@ static const uint8_t zmk_hid_report_desc[] = {
0x08, 0x08,
#elif IS_ENABLED(CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_FULL) #elif IS_ENABLED(CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_FULL)
/* LOGICAL_MINIMUM (0) */ /* LOGICAL_MINIMUM (0) */
HID_GI_LOGICAL_MIN(1), 0x00, HID_GI_LOGICAL_MIN(1),
0x00,
/* LOGICAL_MAXIMUM (0xFFFF) */ /* LOGICAL_MAXIMUM (0xFFFF) */
HID_GI_LOGICAL_MAX(2), 0xFF, 0xFF, HID_LI_USAGE_MIN(1), 0x00, HID_GI_LOGICAL_MAX(2),
0xFF,
0xFF,
HID_LI_USAGE_MIN(1),
0x00,
/* USAGE_MAXIMUM (0xFFFF) */ /* USAGE_MAXIMUM (0xFFFF) */
HID_LI_USAGE_MAX(2), 0xFF, 0xFF, HID_LI_USAGE_MAX(2),
0xFF,
0xFF,
/* INPUT (Data,Ary,Abs) */ /* INPUT (Data,Ary,Abs) */
/* REPORT_SIZE (16) */ /* REPORT_SIZE (16) */
HID_GI_REPORT_SIZE, HID_GI_REPORT_SIZE,
@ -154,42 +183,115 @@ static const uint8_t zmk_hid_report_desc[] = {
/* END COLLECTION */ /* END COLLECTION */
HID_MI_COLLECTION_END, HID_MI_COLLECTION_END,
0x05, 0x01, /* Usage Page (Generic Desktop Ctrls) */ /* USAGE_PAGE (Generic Desktop) */
0x09, 0x02, /* Usage (Mouse) */ HID_GI_USAGE_PAGE,
0xA1, 0x01, /* Collection (Application) */ HID_USAGE_GD,
0x85, 0x04, /* Report ID (4) */ /* USAGE (Mouse) */
0x09, 0x01, /* Usage (Pointer) */ HID_LI_USAGE,
0xA1, 0x00, /* Collection (Physical) */ HID_USAGE_GD_MOUSE,
0x05, 0x09, /* Usage Page (Button) */ /* COLLECTION (Application) */
0x19, 0x01, /* Usage Minimum (0x01) */ HID_MI_COLLECTION,
0x29, 0x10, /* Usage Maximum (0x10) */ COLLECTION_APPLICATION,
0x15, 0x00, /* Logical Minimum (0) */ /* REPORT ID (4) */
0x25, 0x01, /* Logical Maximum (1) */ HID_GI_REPORT_ID,
0x95, 0x10, /* Report Count (16) */ 0x04,
0x75, 0x01, /* Report Size (1) */ /* USAGE (Pointer) */
0x81, 0x02, /* Input (Data,Var,Abs,No Wrap,Linear,...) */ HID_LI_USAGE,
0x05, 0x01, /* Usage Page (Generic Desktop Ctrls) */ HID_USAGE_GD_POINTER,
0x16, 0x01, 0x80, /* Logical Minimum (-32767) */ /* COLLECTION (Physical) */
0x26, 0xFF, 0x7F, /* Logical Maximum (32767) */ HID_MI_COLLECTION,
0x75, 0x10, /* Report Size (8) */ COLLECTION_PHYSICAL,
0x95, 0x02, /* Report Count (2) */ /* USAGE_PAGE (Button) */
0x09, 0x30, /* Usage (X) */ HID_GI_USAGE_PAGE,
0x09, 0x31, /* Usage (Y) */ HID_USAGE_BUTTON,
0x81, 0x06, /* Input (Data,Var,Rel,No Wrap,Linear,...) */ /* USAGE_MINIMUM (0x1) (button 1?) */
0x15, 0x81, /* Logical Minimum (-127) */ HID_LI_USAGE_MIN(1),
0x25, 0x7F, /* Logical Maximum (127) */ 0x1,
0x75, 0x08, /* Report Count (8) */ /* USAGE_MAXIMUM (0x10) (button 5? Buttons up to 8 still work) */
0x95, 0x01, /* Report Size (1) */ HID_LI_USAGE_MAX(1),
0x09, 0x38, /* Usage (Wheel) */ 0x10,
0x81, 0x06, /* Input (Data,Var,Rel,No Wrap,Linear,...) */ /* LOGICAL_MINIMUM (0) */
0x05, 0x0C, /* Usage Page (Consumer) */ // Horizontal wheel HID_GI_LOGICAL_MIN(1),
0x0A, 0x38, 0x02, /* Usage (AC Pan) */ 0x00,
0x15, 0x81, /* Logical Minimum (-127) */ /* LOGICAL_MAXIMUM (1) */
0x25, 0x7f, /* Logical Maximum (127) */ HID_GI_LOGICAL_MAX(1),
0x95, 0x01, /* Report Count (1) */ 0x01,
0x81, 0x06, /* Input (Data,Var,Rel,No Wrap,Linear,...) */ /* REPORT_SIZE (1) */
0xC0, /* End Collection */ HID_GI_REPORT_SIZE,
0xC0, /* End Collection */ 0x01,
/* REPORT_COUNT (16) */
HID_GI_REPORT_COUNT,
0x10,
/* INPUT (Data,Var,Abs) */
HID_MI_INPUT,
0x02,
/* USAGE_PAGE (Generic Desktop) */
HID_GI_USAGE_PAGE,
HID_USAGE_GD,
/* LOGICAL_MINIMUM (-32767) */
HID_GI_LOGICAL_MIN(2),
0x01,
0x80,
/* LOGICAL_MAXIMUM (32767) */
HID_GI_LOGICAL_MAX(2),
0xFF,
0x7F,
/* REPORT_SIZE (16) */
HID_GI_REPORT_SIZE,
0x10,
/* REPORT_COUNT (2) */
HID_GI_REPORT_COUNT,
0x02,
/* USAGE (X) */
HID_LI_USAGE,
HID_USAGE_GD_X,
/* USAGE (Y) */
HID_LI_USAGE,
HID_USAGE_GD_Y,
/* Input (Data,Var,Rel) */
HID_MI_INPUT,
0x06,
/* LOGICAL_MINIMUM (-127) */
HID_GI_LOGICAL_MIN(1),
0x81,
/* LOGICAL_MAXIMUM (127) */
HID_GI_LOGICAL_MAX(1),
0x7F,
/* REPORT_SIZE (8) */
HID_GI_REPORT_SIZE,
0x08,
/* REPORT_COUNT (1) */
HID_GI_REPORT_COUNT,
0x01,
/* USAGE (Wheel) */
HID_LI_USAGE,
HID_USAGE_GD_WHEEL,
/* Input (Data,Var,Rel) */
HID_MI_INPUT,
0x06,
/* USAGE_PAGE (Consumer) */ // Horizontal wheel
HID_GI_USAGE_PAGE,
HID_USAGE_CONSUMER,
/* USAGE (AC Pan) */
0x0A,
0x38,
0x02,
/* LOGICAL_MINIMUM (-127) */
HID_GI_LOGICAL_MIN(1),
0x81,
/* LOGICAL_MAXIMUM (127) */
HID_GI_LOGICAL_MAX(1),
0x7F,
/* REPORT_COUNT (1) */
HID_GI_REPORT_COUNT,
0x01,
/* Input (Data,Var,Rel) */
HID_MI_INPUT,
0x06,
/* END COLLECTION */
HID_MI_COLLECTION_END,
/* END COLLECTION */
HID_MI_COLLECTION_END,
}; };
// struct zmk_hid_boot_report // struct zmk_hid_boot_report