summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinnovaker <66737976+innovaker@users.noreply.github.com>2020-12-19 17:32:40 +0000
committerPete Johanson <peter@peterjohanson.com>2020-12-28 10:20:12 -0500
commit05b0d185a8c8c4eb19f63968e54f859a0f3e6484 (patch)
treec95bd966336cc3476170054dcc4ffa56a448864a
parent87179698b42a627f4ab7653749377001cb090fed (diff)
refactor(app): replace zmk_mod with zmk_mod_t
Aligns with typedef _t convention. PR: #531
-rw-r--r--app/include/zmk/hid.h4
-rw-r--r--app/include/zmk/keys.h2
-rw-r--r--app/src/hid.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/app/include/zmk/hid.h b/app/include/zmk/hid.h
index c664082..a2a4bf5 100644
--- a/app/include/zmk/hid.h
+++ b/app/include/zmk/hid.h
@@ -166,8 +166,8 @@ struct zmk_hid_consumer_report {
struct zmk_hid_consumer_report_body body;
} __packed;
-int zmk_hid_register_mod(zmk_mod modifier);
-int zmk_hid_unregister_mod(zmk_mod modifier);
+int zmk_hid_register_mod(zmk_mod_t 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_release();
int zmk_hid_keyboard_press(zmk_key_t key);
diff --git a/app/include/zmk/keys.h b/app/include/zmk/keys.h
index 330f0ad..8e372ff 100644
--- a/app/include/zmk/keys.h
+++ b/app/include/zmk/keys.h
@@ -10,7 +10,7 @@
#include <dt-bindings/zmk/keys.h>
typedef uint32_t zmk_key_t;
-typedef uint8_t zmk_mod;
+typedef uint8_t zmk_mod_t;
typedef uint8_t zmk_mod_flags;
struct zmk_key_event {
diff --git a/app/src/hid.c b/app/src/hid.c
index 50166c4..de853d8 100644
--- a/app/src/hid.c
+++ b/app/src/hid.c
@@ -26,7 +26,7 @@ static zmk_mod_flags explicit_modifiers = 0;
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]++;
LOG_DBG("Modifier %d count %d", modifier, explicit_modifier_counts[modifier]);
WRITE_BIT(explicit_modifiers, modifier, true);
@@ -34,7 +34,7 @@ int zmk_hid_register_mod(zmk_mod modifier) {
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) {
LOG_ERR("Tried to unregister modifier %d too often", modifier);
return -EINVAL;