aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-12-28 13:07:16 -0500
committerGitHub <noreply@github.com>2016-12-28 13:07:16 -0500
commit223cffd92f44311612aacbfb3358ec7a33a68d74 (patch)
tree410fd93d33810cb79486d5f623130c040a6b3e44
parentd3ec88cd071b14f6ed29b5418474471e7538f1f6 (diff)
parent01038ab54ca6c2858ea9e856c717a1129ffe4156 (diff)
downloadqmk_firmware-223cffd92f44311612aacbfb3358ec7a33a68d74.tar.gz
qmk_firmware-223cffd92f44311612aacbfb3358ec7a33a68d74.zip
Merge pull request #968 from ofples/bugfix/right-modifiers
Fixed bug in do_code16
-rw-r--r--quantum/keymap.h1
-rw-r--r--quantum/quantum.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h
index ae56d16c7..745c55279 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -53,6 +53,7 @@ enum quantum_keycodes {
53 QK_LSFT = 0x0200, 53 QK_LSFT = 0x0200,
54 QK_LALT = 0x0400, 54 QK_LALT = 0x0400,
55 QK_LGUI = 0x0800, 55 QK_LGUI = 0x0800,
56 QK_RMODS_MIN = 0x1000,
56 QK_RCTL = 0x1100, 57 QK_RCTL = 0x1100,
57 QK_RSFT = 0x1200, 58 QK_RSFT = 0x1200,
58 QK_RALT = 0x1400, 59 QK_RALT = 0x1400,
diff --git a/quantum/quantum.c b/quantum/quantum.c
index f653564a6..63ffe2074 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -21,6 +21,8 @@ static void do_code16 (uint16_t code, void (*f) (uint8_t)) {
21 if (code & QK_LGUI) 21 if (code & QK_LGUI)
22 f(KC_LGUI); 22 f(KC_LGUI);
23 23
24 if (code < QK_RMODS_MIN) return;
25
24 if (code & QK_RCTL) 26 if (code & QK_RCTL)
25 f(KC_RCTL); 27 f(KC_RCTL);
26 if (code & QK_RSFT) 28 if (code & QK_RSFT)