xenua
/
zmk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #313 from innovaker/hid-nkro-boot 

refactor(hid): configurable NKRO integer arrays & boot friendly
xmkb
Pete Johanson 4 years ago committed by GitHub
parent
dfb69d8727 c402e953f6
commit
3c958e6207
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      app/include/zmk/hid.h
  2. 44
      app/src/hid.c

57
app/include/zmk/hid.h
Unescape View File

@ -9,13 +9,13 @@
#include <usb/usb_device.h> #include <usb/usb_device.h>
#include <usb/class/usb_hid.h> #include <usb/class/usb_hid.h>
#include <dt-bindings/zmk/keys.h>
#include <zmk/keys.h> #include <zmk/keys.h>
#define COLLECTION_REPORT 0x03 #define COLLECTION_REPORT 0x03
#define ZMK_HID_MAX_KEYCODE GUI #define ZMK_HID_KEYPAD_NKRO_SIZE 6
#define ZMK_HID_CONSUMER_NKRO_SIZE 6
static const u8_t zmk_hid_report_desc[] = { static const u8_t zmk_hid_report_desc[] = {
/* USAGE_PAGE (Generic Desktop) */ /* USAGE_PAGE (Generic Desktop) */
@ -56,42 +56,44 @@ static const u8_t zmk_hid_report_desc[] = {
HID_MI_INPUT, HID_MI_INPUT,
0x02, 0x02,
/* USAGE_PAGE (Keypad) */
HID_GI_USAGE_PAGE,
USAGE_GEN_DESKTOP_KEYPAD,
/* REPORT_SIZE (8) */
HID_GI_REPORT_SIZE,
0x08,
/* REPORT_COUNT (1) */
HID_GI_REPORT_COUNT,
0x01,
/* INPUT (Cnst,Var,Abs) */
HID_MI_INPUT,
0x03,
/* USAGE_PAGE (Keypad) */ /* USAGE_PAGE (Keypad) */
HID_GI_USAGE_PAGE, HID_GI_USAGE_PAGE,
USAGE_GEN_DESKTOP_KEYPAD, USAGE_GEN_DESKTOP_KEYPAD,
/* LOGICAL_MINIMUM (0) */ /* LOGICAL_MINIMUM (0) */
HID_GI_LOGICAL_MIN(1), HID_GI_LOGICAL_MIN(1),
0x00, 0x00,
/* LOGICAL_MAXIMUM (1) */ /* LOGICAL_MAXIMUM (0xFF) */
HID_GI_LOGICAL_MAX(1), HID_GI_LOGICAL_MAX(1),
0x01, 0xFF,
/* USAGE_MINIMUM (Reserved) */ /* USAGE_MINIMUM (Reserved) */
HID_LI_USAGE_MIN(1), HID_LI_USAGE_MIN(1),
0x00, 0x00,
/* USAGE_MAXIMUM (Keyboard Application) */ /* USAGE_MAXIMUM (Keyboard Application) */
HID_LI_USAGE_MAX(1), HID_LI_USAGE_MAX(1),
ZMK_HID_MAX_KEYCODE, 0xFF,
/* REPORT_SIZE (8) */ /* REPORT_SIZE (1) */
HID_GI_REPORT_SIZE, HID_GI_REPORT_SIZE,
0x01, 0x08,
/* REPORT_COUNT (6) */ /* REPORT_COUNT (ZMK_HID_KEYPAD_NKRO_SIZE) */
HID_GI_REPORT_COUNT, HID_GI_REPORT_COUNT,
ZMK_HID_MAX_KEYCODE + 1, ZMK_HID_KEYPAD_NKRO_SIZE,
/* INPUT (Data,Ary,Abs) */ /* INPUT (Data,Ary,Abs) */
HID_MI_INPUT, HID_MI_INPUT,
0x02, 0x00,
/* USAGE_PAGE (Keypad) */
HID_GI_USAGE_PAGE,
USAGE_GEN_DESKTOP_KEYPAD,
/* REPORT_SIZE (8) */
HID_GI_REPORT_SIZE,
0x02,
/* REPORT_COUNT (6) */
HID_GI_REPORT_COUNT,
0x01,
/* INPUT (Cnst,Var,Abs) */
HID_MI_INPUT,
0x03,
/* END_COLLECTION */ /* END_COLLECTION */
HID_MI_COLLECTION_END, HID_MI_COLLECTION_END,
/* USAGE_PAGE (Consumer) */ /* USAGE_PAGE (Consumer) */
@ -124,9 +126,9 @@ static const u8_t zmk_hid_report_desc[] = {
/* REPORT_SIZE (8) */ /* REPORT_SIZE (8) */
HID_GI_REPORT_SIZE, HID_GI_REPORT_SIZE,
0x08, 0x08,
/* REPORT_COUNT (8) */ /* REPORT_COUNT (ZMK_HID_CONSUMER_NKRO_SIZE) */
HID_GI_REPORT_COUNT, HID_GI_REPORT_COUNT,
0x06, ZMK_HID_CONSUMER_NKRO_SIZE,
HID_MI_INPUT, HID_MI_INPUT,
0x00, 0x00,
/* END COLLECTION */ /* END COLLECTION */
@ -142,7 +144,8 @@ static const u8_t zmk_hid_report_desc[] = {
struct zmk_hid_keypad_report_body { struct zmk_hid_keypad_report_body {
zmk_mod_flags modifiers; zmk_mod_flags modifiers;
u8_t keys[13]; u8_t _reserved;
u8_t keys[ZMK_HID_KEYPAD_NKRO_SIZE];
} __packed; } __packed;
struct zmk_hid_keypad_report { struct zmk_hid_keypad_report {
@ -151,7 +154,7 @@ struct zmk_hid_keypad_report {
} __packed; } __packed;
struct zmk_hid_consumer_report_body { struct zmk_hid_consumer_report_body {
u8_t keys[6]; u8_t keys[ZMK_HID_CONSUMER_NKRO_SIZE];
} __packed; } __packed;
struct zmk_hid_consumer_report { struct zmk_hid_consumer_report {

44
app/src/hid.c
Unescape View File

@ -10,10 +10,9 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/hid.h> #include <zmk/hid.h>
static struct zmk_hid_keypad_report kp_report = { static struct zmk_hid_keypad_report kp_report = {
.report_id = 1, .body = {.modifiers = 0, .keys = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}}; .report_id = 1, .body = {.modifiers = 0, ._reserved = 0, .keys = {0}}};
static struct zmk_hid_consumer_report consumer_report = {.report_id = 2, static struct zmk_hid_consumer_report consumer_report = {.report_id = 2, .body = {.keys = {0}}};
.body = {.keys = {0, 0, 0, 0, 0, 0}}};
#define _TOGGLE_MOD(mod, state) \ #define _TOGGLE_MOD(mod, state) \
if (modifier > MOD_RGUI) { \ if (modifier > MOD_RGUI) { \
@ -35,26 +34,17 @@ int zmk_hid_unregister_mods(zmk_mod_flags modifiers) {
return 0; return 0;
} }
#define KEY_OFFSET 0x02 #define TOGGLE_KEYPAD(match, val) \
#define MAX_KEYS 6 for (int idx = 0; idx < ZMK_HID_KEYPAD_NKRO_SIZE; idx++) { \
if (kp_report.body.keys[idx] != match) { \
/*
#define TOGGLE_BOOT_KEY(match, val) \
for (int idx = 0; idx < MAX_KEYS; idx++) \
{ \
if (kp_report.boot.keys[idx + KEY_OFFSET] != match) \
{ \
continue; \ continue; \
} \ } \
kp_report.boot.keys[idx + KEY_OFFSET] = val; \ kp_report.body.keys[idx] = val; \
break; \ break; \
} }
*/
#define TOGGLE_KEY(code, val) WRITE_BIT(kp_report.body.keys[code / 8], code % 8, val)
#define TOGGLE_CONSUMER(match, val) \ #define TOGGLE_CONSUMER(match, val) \
for (int idx = 0; idx < MAX_KEYS; idx++) { \ for (int idx = 0; idx < ZMK_HID_CONSUMER_NKRO_SIZE; idx++) { \
if (consumer_report.body.keys[idx] != match) { \ if (consumer_report.body.keys[idx] != match) { \
continue; \ continue; \
} \ } \
@ -66,15 +56,7 @@ int zmk_hid_keypad_press(zmk_key code) {
if (code >= LCTL && code <= RGUI) { if (code >= LCTL && code <= RGUI) {
return zmk_hid_register_mod(code - LCTL); return zmk_hid_register_mod(code - LCTL);
} }
TOGGLE_KEYPAD(0U, code);
if (code > ZMK_HID_MAX_KEYCODE) {
return -EINVAL;
}
// TOGGLE_BOOT_KEY(0U, code);
TOGGLE_KEY(code, true);
return 0; return 0;
}; };
@ -82,15 +64,7 @@ int zmk_hid_keypad_release(zmk_key code) {
if (code >= LCTL && code <= RGUI) { if (code >= LCTL && code <= RGUI) {
return zmk_hid_unregister_mod(code - LCTL); return zmk_hid_unregister_mod(code - LCTL);
} }
TOGGLE_KEYPAD(code, 0U);
if (code > ZMK_HID_MAX_KEYCODE) {
return -EINVAL;
}
// TOGGLE_BOOT_KEY(0U, code);
TOGGLE_KEY(code, false);
return 0; return 0;
}; };

Write Preview
Loading…
Cancel
Save