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

refactor(hid): replace kp_report with keyboard_report

Browse source 
Aligns with other existing conventions.
This commit is contained in:
innovaker 2020-11-21 20:58:53 +00:00
parent 3ac1a11a37
commit 1e1d05f1e9
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/hid.c
View file

@ -10,7 +10,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/hid.h> #include <zmk/hid.h>
#include <dt-bindings/zmk/modifiers.h> #include <dt-bindings/zmk/modifiers.h>
static struct zmk_hid_keyboard_report kp_report = { static struct zmk_hid_keyboard_report keyboard_report = {
.report_id = 1, .body = {.modifiers = 0, ._reserved = 0, .keys = {0}}}; .report_id = 1, .body = {.modifiers = 0, ._reserved = 0, .keys = {0}}};
static struct zmk_hid_consumer_report consumer_report = {.report_id = 2, .body = {.keys = {0}}}; static struct zmk_hid_consumer_report consumer_report = {.report_id = 2, .body = {.keys = {0}}};
@ -22,8 +22,8 @@ static zmk_mod_flags explicit_modifiers = 0;
#define SET_MODIFIERS(mods) \ #define SET_MODIFIERS(mods) \
{ \ { \
kp_report.body.modifiers = mods; \ keyboard_report.body.modifiers = mods; \
LOG_DBG("Modifiers set to 0x%02X", kp_report.body.modifiers); \ LOG_DBG("Modifiers set to 0x%02X", keyboard_report.body.modifiers); \
} }
int zmk_hid_register_mod(zmk_mod modifier) { int zmk_hid_register_mod(zmk_mod modifier) {
@ -51,10 +51,10 @@ int zmk_hid_unregister_mod(zmk_mod modifier) {
#define TOGGLE_KEYBOARD(match, val) \ #define TOGGLE_KEYBOARD(match, val) \
for (int idx = 0; idx < ZMK_HID_KEYBOARD_NKRO_SIZE; idx++) { \ for (int idx = 0; idx < ZMK_HID_KEYBOARD_NKRO_SIZE; idx++) { \
if (kp_report.body.keys[idx] != match) { \ if (keyboard_report.body.keys[idx] != match) { \
continue; \ continue; \
} \ } \
kp_report.body.keys[idx] = val; \ keyboard_report.body.keys[idx] = val; \
break; \ break; \
} }
@ -93,7 +93,7 @@ int zmk_hid_keyboard_release(zmk_key code) {
return 0; return 0;
}; };
void zmk_hid_keyboard_clear() { memset(&kp_report.body, 0, sizeof(kp_report.body)); } void zmk_hid_keyboard_clear() { memset(&keyboard_report.body, 0, sizeof(keyboard_report.body)); }
int zmk_hid_consumer_press(zmk_key code) { int zmk_hid_consumer_press(zmk_key code) {
TOGGLE_CONSUMER(0U, code); TOGGLE_CONSUMER(0U, code);
@ -108,7 +108,7 @@ int zmk_hid_consumer_release(zmk_key code) {
void zmk_hid_consumer_clear() { memset(&consumer_report.body, 0, sizeof(consumer_report.body)); } void zmk_hid_consumer_clear() { memset(&consumer_report.body, 0, sizeof(consumer_report.body)); }
struct zmk_hid_keyboard_report *zmk_hid_get_keyboard_report() { struct zmk_hid_keyboard_report *zmk_hid_get_keyboard_report() {
return &kp_report; return &keyboard_report;
} }
struct zmk_hid_consumer_report *zmk_hid_get_consumer_report() { struct zmk_hid_consumer_report *zmk_hid_get_consumer_report() {