diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-06 08:50:30 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-06 08:50:30 +0000 |
| commit | cde41650978b4663be503c6cc517fed53a1e2c03 (patch) | |
| tree | 91903d6d8577e277470f80f3e60620f8fff3777b | |
| parent | c375a8d75be08ea0699c1e13b29a49d6889e8e3a (diff) | |
| parent | 9c94de070a651c477ed8d65228af4255a35ea6aa (diff) | |
| download | qmk_firmware-cde41650978b4663be503c6cc517fed53a1e2c03.tar.gz qmk_firmware-cde41650978b4663be503c6cc517fed53a1e2c03.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | quantum/quantum_keycodes.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index a21d0959b..e697b71ba 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h | |||
| @@ -842,15 +842,11 @@ enum quantum_keycodes { | |||
| 842 | #define KC_HYPR HYPR(KC_NO) | 842 | #define KC_HYPR HYPR(KC_NO) |
| 843 | #define KC_MEH MEH(KC_NO) | 843 | #define KC_MEH MEH(KC_NO) |
| 844 | 844 | ||
| 845 | #ifdef UNICODE_ENABLE | 845 | // UNICODE_ENABLE - Allows Unicode input up to 0x7FFF |
| 846 | // Allows Unicode input up to 0x7FFF | 846 | #define UC(c) (QK_UNICODE | (c)) |
| 847 | # define UC(c) (QK_UNICODE | (c)) | 847 | // UNICODEMAP_ENABLE - Allows Unicode input up to 0x10FFFF, requires unicode_map |
| 848 | #endif | 848 | #define X(i) (QK_UNICODEMAP | (i)) |
| 849 | #ifdef UNICODEMAP_ENABLE | 849 | #define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j |
| 850 | // Allows Unicode input up to 0x10FFFF, requires unicode_map | ||
| 851 | # define X(i) (QK_UNICODEMAP | (i)) | ||
| 852 | # define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j | ||
| 853 | #endif | ||
| 854 | 850 | ||
| 855 | #define UC_MOD UNICODE_MODE_FORWARD | 851 | #define UC_MOD UNICODE_MODE_FORWARD |
| 856 | #define UC_RMOD UNICODE_MODE_REVERSE | 852 | #define UC_RMOD UNICODE_MODE_REVERSE |