diff options
| author | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-30 02:03:22 +0200 |
|---|---|---|
| committer | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-30 02:03:22 +0200 |
| commit | e28334017c94c6928dd7e82436cec171f0243747 (patch) | |
| tree | d2b2ecb96aff656094b2113f83632e3131000a75 /tmk_core/common/action_util.c | |
| parent | ccf848917b7e931327f6c4a469877e9d8ef238ea (diff) | |
| parent | 26513b497b8bae5160389c0beac2d45cbb29c50f (diff) | |
| download | qmk_firmware-e28334017c94c6928dd7e82436cec171f0243747.tar.gz qmk_firmware-e28334017c94c6928dd7e82436cec171f0243747.tar.xz | |
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
Diffstat (limited to 'tmk_core/common/action_util.c')
| -rw-r--r-- | tmk_core/common/action_util.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c index f81877dd9..a2d6577b2 100644 --- a/tmk_core/common/action_util.c +++ b/tmk_core/common/action_util.c @@ -29,6 +29,7 @@ static inline void del_key_bit(uint8_t code); static uint8_t real_mods = 0; static uint8_t weak_mods = 0; +static uint8_t macro_mods = 0; #ifdef USB_6KRO_ENABLE #define RO_ADD(a, b) ((a + b) % KEYBOARD_REPORT_KEYS) @@ -55,6 +56,7 @@ static int16_t oneshot_time = 0; void send_keyboard_report(void) { keyboard_report->mods = real_mods; keyboard_report->mods |= weak_mods; + keyboard_report->mods |= macro_mods; #ifndef NO_ACTION_ONESHOT if (oneshot_mods) { #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0)) @@ -118,6 +120,13 @@ void del_weak_mods(uint8_t mods) { weak_mods &= ~mods; } void set_weak_mods(uint8_t mods) { weak_mods = mods; } void clear_weak_mods(void) { weak_mods = 0; } +/* macro modifier */ +uint8_t get_macro_mods(void) { return macro_mods; } +void add_macro_mods(uint8_t mods) { macro_mods |= mods; } +void del_macro_mods(uint8_t mods) { macro_mods &= ~mods; } +void set_macro_mods(uint8_t mods) { macro_mods = mods; } +void clear_macro_mods(void) { macro_mods = 0; } + /* Oneshot modifier */ #ifndef NO_ACTION_ONESHOT void set_oneshot_mods(uint8_t mods) |