Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-03-06 08:50:30 +00:00
commit cde4165097

View File

@ -842,15 +842,11 @@ enum quantum_keycodes {
#define KC_HYPR HYPR(KC_NO) #define KC_HYPR HYPR(KC_NO)
#define KC_MEH MEH(KC_NO) #define KC_MEH MEH(KC_NO)
#ifdef UNICODE_ENABLE // UNICODE_ENABLE - Allows Unicode input up to 0x7FFF
// Allows Unicode input up to 0x7FFF
#define UC(c) (QK_UNICODE | (c)) #define UC(c) (QK_UNICODE | (c))
#endif // UNICODEMAP_ENABLE - Allows Unicode input up to 0x10FFFF, requires unicode_map
#ifdef UNICODEMAP_ENABLE
// Allows Unicode input up to 0x10FFFF, requires unicode_map
#define X(i) (QK_UNICODEMAP | (i)) #define X(i) (QK_UNICODEMAP | (i))
#define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j #define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
#endif
#define UC_MOD UNICODE_MODE_FORWARD #define UC_MOD UNICODE_MODE_FORWARD
#define UC_RMOD UNICODE_MODE_REVERSE #define UC_RMOD UNICODE_MODE_REVERSE