summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-06 08:50:30 +0000
committerQMK Bot <hello@qmk.fm>2021-03-06 08:50:30 +0000
commitcde41650978b4663be503c6cc517fed53a1e2c03 (patch)
tree91903d6d8577e277470f80f3e60620f8fff3777b
parentc375a8d75be08ea0699c1e13b29a49d6889e8e3a (diff)
parent9c94de070a651c477ed8d65228af4255a35ea6aa (diff)
downloadqmk_firmware-cde41650978b4663be503c6cc517fed53a1e2c03.tar.gz
qmk_firmware-cde41650978b4663be503c6cc517fed53a1e2c03.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--quantum/quantum_keycodes.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index a21d0959bb..e697b71ba5 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -842,15 +842,11 @@ enum quantum_keycodes {
#define KC_HYPR HYPR(KC_NO)
#define KC_MEH MEH(KC_NO)
-#ifdef UNICODE_ENABLE
-// Allows Unicode input up to 0x7FFF
-# define UC(c) (QK_UNICODE | (c))
-#endif
-#ifdef UNICODEMAP_ENABLE
-// Allows Unicode input up to 0x10FFFF, requires unicode_map
-# define X(i) (QK_UNICODEMAP | (i))
-# define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
-#endif
+// UNICODE_ENABLE - Allows Unicode input up to 0x7FFF
+#define UC(c) (QK_UNICODE | (c))
+// UNICODEMAP_ENABLE - Allows Unicode input up to 0x10FFFF, requires unicode_map
+#define X(i) (QK_UNICODEMAP | (i))
+#define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
#define UC_MOD UNICODE_MODE_FORWARD
#define UC_RMOD UNICODE_MODE_REVERSE