pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(app): replace zmk_mod with zmk_mod_t

Browse source 
Aligns with typedef _t convention.

PR: #531
This commit is contained in:
innovaker 2020-12-19 17:32:40 +00:00 committed by Pete Johanson
parent 87179698b4
commit 05b0d185a8
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -166,8 +166,8 @@ struct zmk_hid_consumer_report {
struct zmk_hid_consumer_report_body body; struct zmk_hid_consumer_report_body body;
} __packed; } __packed;
int zmk_hid_register_mod(zmk_mod modifier); int zmk_hid_register_mod(zmk_mod_t modifier);
int zmk_hid_unregister_mod(zmk_mod modifier); int zmk_hid_unregister_mod(zmk_mod_t modifier);
int zmk_hid_implicit_modifiers_press(zmk_mod_flags implicit_modifiers); int zmk_hid_implicit_modifiers_press(zmk_mod_flags implicit_modifiers);
int zmk_hid_implicit_modifiers_release(); int zmk_hid_implicit_modifiers_release();
int zmk_hid_keyboard_press(zmk_key_t key); int zmk_hid_keyboard_press(zmk_key_t key);

2
app/include/zmk/keys.h
View file

@ -10,7 +10,7 @@
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
typedef uint32_t zmk_key_t; typedef uint32_t zmk_key_t;
typedef uint8_t zmk_mod; typedef uint8_t zmk_mod_t;
typedef uint8_t zmk_mod_flags; typedef uint8_t zmk_mod_flags;
struct zmk_key_event { struct zmk_key_event {

4
app/src/hid.c
View file

@ -26,7 +26,7 @@ static zmk_mod_flags explicit_modifiers = 0;
LOG_DBG("Modifiers set to 0x%02X", keyboard_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_t modifier) {
explicit_modifier_counts[modifier]++; explicit_modifier_counts[modifier]++;
LOG_DBG("Modifier %d count %d", modifier, explicit_modifier_counts[modifier]); LOG_DBG("Modifier %d count %d", modifier, explicit_modifier_counts[modifier]);
WRITE_BIT(explicit_modifiers, modifier, true); WRITE_BIT(explicit_modifiers, modifier, true);
@ -34,7 +34,7 @@ int zmk_hid_register_mod(zmk_mod modifier) {
return 0; return 0;
} }
int zmk_hid_unregister_mod(zmk_mod modifier) { int zmk_hid_unregister_mod(zmk_mod_t modifier) {
if (explicit_modifier_counts[modifier] <= 0) { if (explicit_modifier_counts[modifier] <= 0) {
LOG_ERR("Tried to unregister modifier %d too often", modifier); LOG_ERR("Tried to unregister modifier %d too often", modifier);
return -EINVAL; return -EINVAL;