summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/action_macro.c
diff options
context:
space:
mode:
authorNoah Andrews <NoahAndrews@users.noreply.github.com>2016-03-29 20:03:22 -0400
committerNoah Andrews <NoahAndrews@users.noreply.github.com>2016-03-29 20:03:22 -0400
commite28334017c94c6928dd7e82436cec171f0243747 (patch)
treed2b2ecb96aff656094b2113f83632e3131000a75 /tmk_core/common/action_macro.c
parentccf848917b7e931327f6c4a469877e9d8ef238ea (diff)
parent26513b497b8bae5160389c0beac2d45cbb29c50f (diff)
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
Diffstat (limited to 'tmk_core/common/action_macro.c')
-rw-r--r--tmk_core/common/action_macro.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/action_macro.c b/tmk_core/common/action_macro.c
index ffaf125c06..7726b11907 100644
--- a/tmk_core/common/action_macro.c
+++ b/tmk_core/common/action_macro.c
@@ -41,7 +41,7 @@ void action_macro_play(const macro_t *macro_p)
MACRO_READ();
dprintf("KEY_DOWN(%02X)\n", macro);
if (IS_MOD(macro)) {
- add_weak_mods(MOD_BIT(macro));
+ add_macro_mods(MOD_BIT(macro));
send_keyboard_report();
} else {
register_code(macro);
@@ -51,7 +51,7 @@ void action_macro_play(const macro_t *macro_p)
MACRO_READ();
dprintf("KEY_UP(%02X)\n", macro);
if (IS_MOD(macro)) {
- del_weak_mods(MOD_BIT(macro));
+ del_macro_mods(MOD_BIT(macro));
send_keyboard_report();
} else {
unregister_code(macro);
[cgit] Unable to lock slot /tmp/cgit/69200000.lock: Permission denied (13)