diff options
| author | innovaker <66737976+innovaker@users.noreply.github.com> | 2020-12-19 17:33:15 +0000 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-12-28 10:20:12 -0500 |
| commit | 87e7c04b00b2cb83540b757a8c909200cdb28255 (patch) | |
| tree | c934a4ea1ae0b8cd47803c07a4effc80b3b04a5e /app/include | |
| parent | 05b0d185a8c8c4eb19f63968e54f859a0f3e6484 (diff) | |
refactor(app): replace zmk_mod_flags with zmk_mod_flags_t
Aligns with typedef _t convention.
PR: #531
Diffstat (limited to 'app/include')
| -rw-r--r-- | app/include/zmk/events/keycode_state_changed.h | 2 | ||||
| -rw-r--r-- | app/include/zmk/events/modifiers_state_changed.h | 4 | ||||
| -rw-r--r-- | app/include/zmk/hid.h | 4 | ||||
| -rw-r--r-- | app/include/zmk/keys.h | 2 |
4 files changed, 6 insertions, 6 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; |