summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-12-28 19:07:16 +0100
committerGitHub <noreply@github.com>2016-12-28 19:07:16 +0100
commit223cffd92f44311612aacbfb3358ec7a33a68d74 (patch)
tree410fd93d33810cb79486d5f623130c040a6b3e44
parentd3ec88cd071b14f6ed29b5418474471e7538f1f6 (diff)
parent01038ab54ca6c2858ea9e856c717a1129ffe4156 (diff)
downloadqmk_firmware-223cffd92f44311612aacbfb3358ec7a33a68d74.tar.gz
qmk_firmware-223cffd92f44311612aacbfb3358ec7a33a68d74.tar.xz
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 {
QK_LSFT = 0x0200,
QK_LALT = 0x0400,
QK_LGUI = 0x0800,
+ QK_RMODS_MIN = 0x1000,
QK_RCTL = 0x1100,
QK_RSFT = 0x1200,
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)) {
if (code & QK_LGUI)
f(KC_LGUI);
+ if (code < QK_RMODS_MIN) return;
+
if (code & QK_RCTL)
f(KC_RCTL);
if (code & QK_RSFT)