Jacob/zmk
1
0
Fork 0
forked from kofal.net/zmk
Code Pull Requests Activity

refactor: change keypad to keyboard

Browse Source 
The application usage used by report 1 is `HID_USAGE_GD_KEYBOARD`.  Moreover, the `keys` usage page (0x07) that primarily feeds into this report is predominantly keyboard codes.  The rest of the system should align with this naming convention.
This commit is contained in:
innovaker
2020-11-21 20:09:21 +00:00
committed by Pete Johanson
parent 3ebd192411
commit 3ac1a11a37
6 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/include/zmk/hid.h
View File

@@ -15,7 +15,7 @@
#define COLLECTION_REPORT 0x03
#define ZMK_HID_KEYPAD_NKRO_SIZE 6
#define ZMK_HID_KEYBOARD_NKRO_SIZE 6
#define ZMK_HID_CONSUMER_NKRO_SIZE 6
@@ -89,9 +89,9 @@ static const u8_t zmk_hid_report_desc[] = {
/* REPORT_SIZE (1) */
HID_GI_REPORT_SIZE,
0x08,
/* REPORT_COUNT (ZMK_HID_KEYPAD_NKRO_SIZE) */
/* REPORT_COUNT (ZMK_HID_KEYBOARD_NKRO_SIZE) */
HID_GI_REPORT_COUNT,
ZMK_HID_KEYPAD_NKRO_SIZE,
ZMK_HID_KEYBOARD_NKRO_SIZE,
/* INPUT (Data,Ary,Abs) */
HID_MI_INPUT,
0x00,
@@ -146,15 +146,15 @@ static const u8_t zmk_hid_report_desc[] = {
// u8_t keys[6];
// } __packed;
struct zmk_hid_keypad_report_body {
struct zmk_hid_keyboard_report_body {
zmk_mod_flags modifiers;
u8_t _reserved;
u8_t keys[ZMK_HID_KEYPAD_NKRO_SIZE];
u8_t keys[ZMK_HID_KEYBOARD_NKRO_SIZE];
} __packed;
struct zmk_hid_keypad_report {
struct zmk_hid_keyboard_report {
u8_t report_id;
struct zmk_hid_keypad_report_body body;
struct zmk_hid_keyboard_report_body body;
} __packed;
struct zmk_hid_consumer_report_body {
@@ -170,13 +170,13 @@ int zmk_hid_register_mod(zmk_mod modifier);
int zmk_hid_unregister_mod(zmk_mod modifier);
int zmk_hid_implicit_modifiers_press(zmk_mod_flags implicit_modifiers);
int zmk_hid_implicit_modifiers_release();
int zmk_hid_keypad_press(zmk_key key);
int zmk_hid_keypad_release(zmk_key key);
void zmk_hid_keypad_clear();
int zmk_hid_keyboard_press(zmk_key key);
int zmk_hid_keyboard_release(zmk_key key);
void zmk_hid_keyboard_clear();
int zmk_hid_consumer_press(zmk_key key);
int zmk_hid_consumer_release(zmk_key key);
void zmk_hid_consumer_clear();
struct zmk_hid_keypad_report *zmk_hid_get_keypad_report();
struct zmk_hid_keyboard_report *zmk_hid_get_keyboard_report();
struct zmk_hid_consumer_report *zmk_hid_get_consumer_report();

2
app/include/zmk/hog.h
View File

@@ -11,5 +11,5 @@
int zmk_hog_init();
int zmk_hog_send_keypad_report(struct zmk_hid_keypad_report_body *body);
int zmk_hog_send_keyboard_report(struct zmk_hid_keyboard_report_body *body);
int zmk_hog_send_consumer_report(struct zmk_hid_consumer_report_body *body);