summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinnovaker <66737976+innovaker@users.noreply.github.com>2020-12-19 17:33:15 +0000
committerPete Johanson <peter@peterjohanson.com>2020-12-28 10:20:12 -0500
commit87e7c04b00b2cb83540b757a8c909200cdb28255 (patch)
treec934a4ea1ae0b8cd47803c07a4effc80b3b04a5e
parent05b0d185a8c8c4eb19f63968e54f859a0f3e6484 (diff)
refactor(app): replace zmk_mod_flags with zmk_mod_flags_t
Aligns with typedef _t convention. PR: #531
-rw-r--r--app/include/zmk/events/keycode_state_changed.h2
-rw-r--r--app/include/zmk/events/modifiers_state_changed.h4
-rw-r--r--app/include/zmk/hid.h4
-rw-r--r--app/include/zmk/keys.h2
-rw-r--r--app/src/hid.c4
-rw-r--r--app/src/hid_listener.c4
6 files changed, 10 insertions, 10 deletions
diff --git a/app/include/zmk/events/keycode_state_changed.h b/app/include/zmk/events/keycode_state_changed.h
index 28282b6..d175605 100644
--- a/app/include/zmk/events/keycode_state_changed.h
+++ b/app/include/zmk/events/keycode_state_changed.h
@@ -27,7 +27,7 @@ static inline struct keycode_state_changed *
keycode_state_changed_from_encoded(uint32_t encoded, bool pressed, int64_t timestamp) {
uint16_t page = HID_USAGE_PAGE(encoded) & 0xFF;
uint16_t id = HID_USAGE_ID(encoded);
- zmk_mod_flags implicit_mods = SELECT_MODS(encoded);
+ zmk_mod_flags_t implicit_mods = SELECT_MODS(encoded);
if (!page) {
page = HID_USAGE_KEY;
diff --git a/app/include/zmk/events/modifiers_state_changed.h b/app/include/zmk/events/modifiers_state_changed.h
index c4daede..4f40f4c 100644
--- a/app/include/zmk/events/modifiers_state_changed.h
+++ b/app/include/zmk/events/modifiers_state_changed.h
@@ -12,13 +12,13 @@
struct modifiers_state_changed {
struct zmk_event_header header;
- zmk_mod_flags modifiers;
+ zmk_mod_flags_t modifiers;
bool state;
};
ZMK_EVENT_DECLARE(modifiers_state_changed);
-inline struct modifiers_state_changed *create_modifiers_state_changed(zmk_mod_flags modifiers,
+inline struct modifiers_state_changed *create_modifiers_state_changed(zmk_mod_flags_t modifiers,
bool state) {
struct modifiers_state_changed *ev = new_modifiers_state_changed();
ev->modifiers = modifiers;
diff --git a/app/include/zmk/hid.h b/app/include/zmk/hid.h
index a2a4bf5..1ec5126 100644
--- a/app/include/zmk/hid.h
+++ b/app/include/zmk/hid.h
@@ -147,7 +147,7 @@ static const uint8_t zmk_hid_report_desc[] = {
// } __packed;
struct zmk_hid_keyboard_report_body {
- zmk_mod_flags modifiers;
+ zmk_mod_flags_t modifiers;
uint8_t _reserved;
uint8_t keys[ZMK_HID_KEYBOARD_NKRO_SIZE];
} __packed;
@@ -168,7 +168,7 @@ struct zmk_hid_consumer_report {
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_press(zmk_mod_flags_t implicit_modifiers);
int zmk_hid_implicit_modifiers_release();
int zmk_hid_keyboard_press(zmk_key_t key);
int zmk_hid_keyboard_release(zmk_key_t key);
diff --git a/app/include/zmk/keys.h b/app/include/zmk/keys.h
index 8e372ff..62e3cce 100644
--- a/app/include/zmk/keys.h
+++ b/app/include/zmk/keys.h
@@ -11,7 +11,7 @@
typedef uint32_t zmk_key_t;
typedef uint8_t zmk_mod_t;
-typedef uint8_t zmk_mod_flags;
+typedef uint8_t zmk_mod_flags_t;
struct zmk_key_event {
uint32_t column;
diff --git a/app/src/hid.c b/app/src/hid.c
index de853d8..37378b4 100644
--- a/app/src/hid.c
+++ b/app/src/hid.c
@@ -18,7 +18,7 @@ static struct zmk_hid_consumer_report consumer_report = {.report_id = 2, .body =
// Keep track of how often a modifier was pressed.
// Only release the modifier if the count is 0.
static int explicit_modifier_counts[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-static zmk_mod_flags explicit_modifiers = 0;
+static zmk_mod_flags_t explicit_modifiers = 0;
#define SET_MODIFIERS(mods) \
{ \
@@ -67,7 +67,7 @@ int zmk_hid_unregister_mod(zmk_mod_t modifier) {
break; \
}
-int zmk_hid_implicit_modifiers_press(zmk_mod_flags implicit_modifiers) {
+int zmk_hid_implicit_modifiers_press(zmk_mod_flags_t implicit_modifiers) {
SET_MODIFIERS(explicit_modifiers | implicit_modifiers);
return 0;
}
diff --git a/app/src/hid_listener.c b/app/src/hid_listener.c
index cf8835a..80e9054 100644
--- a/app/src/hid_listener.c
+++ b/app/src/hid_listener.c
@@ -17,7 +17,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/endpoints.h>
static int hid_listener_keycode_pressed(uint8_t usage_page, uint32_t keycode,
- zmk_mod_flags implicit_modifiers) {
+ zmk_mod_flags_t implicit_modifiers) {
int err;
LOG_DBG("usage_page 0x%02X keycode 0x%02X mods 0x%02X", usage_page, keycode,
implicit_modifiers);
@@ -42,7 +42,7 @@ static int hid_listener_keycode_pressed(uint8_t usage_page, uint32_t keycode,
}
static int hid_listener_keycode_released(uint8_t usage_page, uint32_t keycode,
- zmk_mod_flags implicit_modifiers) {
+ zmk_mod_flags_t implicit_modifiers) {
int err;
LOG_DBG("usage_page 0x%02X keycode 0x%02X mods 0x%02X", usage_page, keycode,
implicit_modifiers);