diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-04 01:02:37 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-04 01:02:37 +0000 |
| commit | d3092ced99b5a529c6bde32d8f352cc40abd317d (patch) | |
| tree | 707d06ae437f088fe77e62b630a5bc9cdcf89d9b /quantum/quantum_keycodes.h | |
| parent | 6c3af2670e41448432052a44b446c1c7ff3da9a5 (diff) | |
| parent | 7aa74c227b03e882915b184d07a5e31c9d720710 (diff) | |
| download | qmk_firmware-d3092ced99b5a529c6bde32d8f352cc40abd317d.tar.gz qmk_firmware-d3092ced99b5a529c6bde32d8f352cc40abd317d.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/quantum_keycodes.h')
| -rw-r--r-- | quantum/quantum_keycodes.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 5eba218c9..89a7cf7f8 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h | |||
| @@ -79,12 +79,10 @@ enum quantum_keycodes { | |||
| 79 | QK_STENO_GEMINI = 0x5A31, | 79 | QK_STENO_GEMINI = 0x5A31, |
| 80 | QK_STENO_MAX = 0x5A3F, | 80 | QK_STENO_MAX = 0x5A3F, |
| 81 | #endif | 81 | #endif |
| 82 | #ifdef SWAP_HANDS_ENABLE | ||
| 83 | QK_SWAP_HANDS = 0x5B00, | 82 | QK_SWAP_HANDS = 0x5B00, |
| 84 | QK_SWAP_HANDS_MAX = 0x5BFF, | 83 | QK_SWAP_HANDS_MAX = 0x5BFF, |
| 85 | #endif | 84 | QK_MOD_TAP = 0x6000, |
| 86 | QK_MOD_TAP = 0x6000, | 85 | QK_MOD_TAP_MAX = 0x7FFF, |
| 87 | QK_MOD_TAP_MAX = 0x7FFF, | ||
| 88 | #ifdef UNICODE_ENABLE | 86 | #ifdef UNICODE_ENABLE |
| 89 | QK_UNICODE = 0x8000, | 87 | QK_UNICODE = 0x8000, |
| 90 | QK_UNICODE_MAX = 0xFFFF, | 88 | QK_UNICODE_MAX = 0xFFFF, |
| @@ -872,16 +870,14 @@ enum quantum_keycodes { | |||
| 872 | #define UC_M_BS UNICODE_MODE_BSD | 870 | #define UC_M_BS UNICODE_MODE_BSD |
| 873 | #define UC_M_WC UNICODE_MODE_WINC | 871 | #define UC_M_WC UNICODE_MODE_WINC |
| 874 | 872 | ||
| 875 | #ifdef SWAP_HANDS_ENABLE | 873 | #define SH_T(kc) (QK_SWAP_HANDS | (kc)) |
| 876 | # define SH_T(kc) (QK_SWAP_HANDS | (kc)) | 874 | #define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE) |
| 877 | # define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE) | 875 | #define SH_TT (QK_SWAP_HANDS | OP_SH_TAP_TOGGLE) |
| 878 | # define SH_TT (QK_SWAP_HANDS | OP_SH_TAP_TOGGLE) | 876 | #define SH_OS (QK_SWAP_HANDS | OP_SH_ONESHOT) |
| 879 | # define SH_OS (QK_SWAP_HANDS | OP_SH_ONESHOT) | 877 | #define SH_MON (QK_SWAP_HANDS | OP_SH_ON_OFF) |
| 880 | # define SH_MON (QK_SWAP_HANDS | OP_SH_ON_OFF) | 878 | #define SH_MOFF (QK_SWAP_HANDS | OP_SH_OFF_ON) |
| 881 | # define SH_MOFF (QK_SWAP_HANDS | OP_SH_OFF_ON) | 879 | #define SH_ON (QK_SWAP_HANDS | OP_SH_ON) |
| 882 | # define SH_ON (QK_SWAP_HANDS | OP_SH_ON) | 880 | #define SH_OFF (QK_SWAP_HANDS | OP_SH_OFF) |
| 883 | # define SH_OFF (QK_SWAP_HANDS | OP_SH_OFF) | ||
| 884 | #endif | ||
| 885 | 881 | ||
| 886 | // Dynamic Macros aliases | 882 | // Dynamic Macros aliases |
| 887 | #define DM_REC1 DYN_REC_START1 | 883 | #define DM_REC1 DYN_REC_START1 |