diff options
| author | Joel Challis <git@zvecr.com> | 2019-12-11 19:39:30 +0000 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-12-11 11:39:30 -0800 |
| commit | efb21c00ce8090303456dc9c22665a69c3fc298a (patch) | |
| tree | d32a47f1209dcae87b9d4571b46e3ff80397b9eb /quantum/process_keycode | |
| parent | 071eb2478f039e21effb981a8a98e6181238b53b (diff) | |
| download | qmk_firmware-efb21c00ce8090303456dc9c22665a69c3fc298a.tar.gz qmk_firmware-efb21c00ce8090303456dc9c22665a69c3fc298a.zip | |
Fix FORCE_NKRO handling (#7601)
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_magic.c | 242 |
1 files changed, 122 insertions, 120 deletions
diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c index 9668a50f7..44dd5f057 100644 --- a/quantum/process_keycode/process_magic.c +++ b/quantum/process_keycode/process_magic.c | |||
| @@ -39,138 +39,140 @@ float cg_swap_song[][2] = CG_SWAP_SONG; | |||
| 39 | */ | 39 | */ |
| 40 | bool process_magic(uint16_t keycode, keyrecord_t *record) { | 40 | bool process_magic(uint16_t keycode, keyrecord_t *record) { |
| 41 | // skip anything that isn't a keyup | 41 | // skip anything that isn't a keyup |
| 42 | if (!record->event.pressed) { | 42 | if (record->event.pressed) { |
| 43 | return true; | 43 | switch (keycode) { |
| 44 | } | 44 | case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_ALT_GUI: |
| 45 | 45 | case MAGIC_SWAP_LCTL_LGUI ... MAGIC_EE_HANDS_RIGHT: | |
| 46 | /* keymap config */ | 46 | /* keymap config */ |
| 47 | keymap_config.raw = eeconfig_read_keymap(); | 47 | keymap_config.raw = eeconfig_read_keymap(); |
| 48 | switch (keycode) { | 48 | switch (keycode) { |
| 49 | case MAGIC_SWAP_CONTROL_CAPSLOCK: | 49 | case MAGIC_SWAP_CONTROL_CAPSLOCK: |
| 50 | keymap_config.swap_control_capslock = true; | 50 | keymap_config.swap_control_capslock = true; |
| 51 | break; | 51 | break; |
| 52 | case MAGIC_CAPSLOCK_TO_CONTROL: | 52 | case MAGIC_CAPSLOCK_TO_CONTROL: |
| 53 | keymap_config.capslock_to_control = true; | 53 | keymap_config.capslock_to_control = true; |
| 54 | break; | 54 | break; |
| 55 | case MAGIC_SWAP_LALT_LGUI: | 55 | case MAGIC_SWAP_LALT_LGUI: |
| 56 | keymap_config.swap_lalt_lgui = true; | 56 | keymap_config.swap_lalt_lgui = true; |
| 57 | break; | 57 | break; |
| 58 | case MAGIC_SWAP_RALT_RGUI: | 58 | case MAGIC_SWAP_RALT_RGUI: |
| 59 | keymap_config.swap_ralt_rgui = true; | 59 | keymap_config.swap_ralt_rgui = true; |
| 60 | break; | 60 | break; |
| 61 | case MAGIC_SWAP_LCTL_LGUI: | 61 | case MAGIC_SWAP_LCTL_LGUI: |
| 62 | keymap_config.swap_lctl_lgui = true; | 62 | keymap_config.swap_lctl_lgui = true; |
| 63 | break; | 63 | break; |
| 64 | case MAGIC_SWAP_RCTL_RGUI: | 64 | case MAGIC_SWAP_RCTL_RGUI: |
| 65 | keymap_config.swap_rctl_rgui = true; | 65 | keymap_config.swap_rctl_rgui = true; |
| 66 | break; | 66 | break; |
| 67 | case MAGIC_NO_GUI: | 67 | case MAGIC_NO_GUI: |
| 68 | keymap_config.no_gui = true; | 68 | keymap_config.no_gui = true; |
| 69 | break; | 69 | break; |
| 70 | case MAGIC_SWAP_GRAVE_ESC: | 70 | case MAGIC_SWAP_GRAVE_ESC: |
| 71 | keymap_config.swap_grave_esc = true; | 71 | keymap_config.swap_grave_esc = true; |
| 72 | break; | 72 | break; |
| 73 | case MAGIC_SWAP_BACKSLASH_BACKSPACE: | 73 | case MAGIC_SWAP_BACKSLASH_BACKSPACE: |
| 74 | keymap_config.swap_backslash_backspace = true; | 74 | keymap_config.swap_backslash_backspace = true; |
| 75 | break; | 75 | break; |
| 76 | case MAGIC_HOST_NKRO: | 76 | case MAGIC_HOST_NKRO: |
| 77 | clear_keyboard(); // clear first buffer to prevent stuck keys | 77 | clear_keyboard(); // clear first buffer to prevent stuck keys |
| 78 | keymap_config.nkro = true; | 78 | keymap_config.nkro = true; |
| 79 | break; | 79 | break; |
| 80 | case MAGIC_SWAP_ALT_GUI: | 80 | case MAGIC_SWAP_ALT_GUI: |
| 81 | keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true; | 81 | keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true; |
| 82 | #ifdef AUDIO_ENABLE | 82 | #ifdef AUDIO_ENABLE |
| 83 | PLAY_SONG(ag_swap_song); | 83 | PLAY_SONG(ag_swap_song); |
| 84 | #endif | 84 | #endif |
| 85 | break; | 85 | break; |
| 86 | case MAGIC_SWAP_CTL_GUI: | 86 | case MAGIC_SWAP_CTL_GUI: |
| 87 | keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true; | 87 | keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true; |
| 88 | #ifdef AUDIO_ENABLE | 88 | #ifdef AUDIO_ENABLE |
| 89 | PLAY_SONG(cg_swap_song); | 89 | PLAY_SONG(cg_swap_song); |
| 90 | #endif | 90 | #endif |
| 91 | break; | 91 | break; |
| 92 | case MAGIC_UNSWAP_CONTROL_CAPSLOCK: | 92 | case MAGIC_UNSWAP_CONTROL_CAPSLOCK: |
| 93 | keymap_config.swap_control_capslock = false; | 93 | keymap_config.swap_control_capslock = false; |
| 94 | break; | 94 | break; |
| 95 | case MAGIC_UNCAPSLOCK_TO_CONTROL: | 95 | case MAGIC_UNCAPSLOCK_TO_CONTROL: |
| 96 | keymap_config.capslock_to_control = false; | 96 | keymap_config.capslock_to_control = false; |
| 97 | break; | 97 | break; |
| 98 | case MAGIC_UNSWAP_LALT_LGUI: | 98 | case MAGIC_UNSWAP_LALT_LGUI: |
| 99 | keymap_config.swap_lalt_lgui = false; | 99 | keymap_config.swap_lalt_lgui = false; |
| 100 | break; | 100 | break; |
| 101 | case MAGIC_UNSWAP_RALT_RGUI: | 101 | case MAGIC_UNSWAP_RALT_RGUI: |
| 102 | keymap_config.swap_ralt_rgui = false; | 102 | keymap_config.swap_ralt_rgui = false; |
| 103 | break; | 103 | break; |
| 104 | case MAGIC_UNSWAP_LCTL_LGUI: | 104 | case MAGIC_UNSWAP_LCTL_LGUI: |
| 105 | keymap_config.swap_lctl_lgui = false; | 105 | keymap_config.swap_lctl_lgui = false; |
| 106 | break; | 106 | break; |
| 107 | case MAGIC_UNSWAP_RCTL_RGUI: | 107 | case MAGIC_UNSWAP_RCTL_RGUI: |
| 108 | keymap_config.swap_rctl_rgui = false; | 108 | keymap_config.swap_rctl_rgui = false; |
| 109 | break; | 109 | break; |
| 110 | case MAGIC_UNNO_GUI: | 110 | case MAGIC_UNNO_GUI: |
| 111 | keymap_config.no_gui = false; | 111 | keymap_config.no_gui = false; |
| 112 | break; | 112 | break; |
| 113 | case MAGIC_UNSWAP_GRAVE_ESC: | 113 | case MAGIC_UNSWAP_GRAVE_ESC: |
| 114 | keymap_config.swap_grave_esc = false; | 114 | keymap_config.swap_grave_esc = false; |
| 115 | break; | 115 | break; |
| 116 | case MAGIC_UNSWAP_BACKSLASH_BACKSPACE: | 116 | case MAGIC_UNSWAP_BACKSLASH_BACKSPACE: |
| 117 | keymap_config.swap_backslash_backspace = false; | 117 | keymap_config.swap_backslash_backspace = false; |
| 118 | break; | 118 | break; |
| 119 | case MAGIC_UNHOST_NKRO: | 119 | case MAGIC_UNHOST_NKRO: |
| 120 | clear_keyboard(); // clear first buffer to prevent stuck keys | 120 | clear_keyboard(); // clear first buffer to prevent stuck keys |
| 121 | keymap_config.nkro = false; | 121 | keymap_config.nkro = false; |
| 122 | break; | 122 | break; |
| 123 | case MAGIC_UNSWAP_ALT_GUI: | 123 | case MAGIC_UNSWAP_ALT_GUI: |
| 124 | keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false; | 124 | keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false; |
| 125 | #ifdef AUDIO_ENABLE | 125 | #ifdef AUDIO_ENABLE |
| 126 | PLAY_SONG(ag_norm_song); | 126 | PLAY_SONG(ag_norm_song); |
| 127 | #endif | 127 | #endif |
| 128 | break; | 128 | break; |
| 129 | case MAGIC_UNSWAP_CTL_GUI: | 129 | case MAGIC_UNSWAP_CTL_GUI: |
| 130 | keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false; | 130 | keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false; |
| 131 | #ifdef AUDIO_ENABLE | 131 | #ifdef AUDIO_ENABLE |
| 132 | PLAY_SONG(cg_norm_song); | 132 | PLAY_SONG(cg_norm_song); |
| 133 | #endif | 133 | #endif |
| 134 | break; | 134 | break; |
| 135 | case MAGIC_TOGGLE_ALT_GUI: | 135 | case MAGIC_TOGGLE_ALT_GUI: |
| 136 | keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui; | 136 | keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui; |
| 137 | keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui; | 137 | keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui; |
| 138 | #ifdef AUDIO_ENABLE | 138 | #ifdef AUDIO_ENABLE |
| 139 | if (keymap_config.swap_ralt_rgui) { | 139 | if (keymap_config.swap_ralt_rgui) { |
| 140 | PLAY_SONG(ag_swap_song); | 140 | PLAY_SONG(ag_swap_song); |
| 141 | } else { | 141 | } else { |
| 142 | PLAY_SONG(ag_norm_song); | 142 | PLAY_SONG(ag_norm_song); |
| 143 | } | 143 | } |
| 144 | #endif | 144 | #endif |
| 145 | break; | 145 | break; |
| 146 | case MAGIC_TOGGLE_CTL_GUI: | 146 | case MAGIC_TOGGLE_CTL_GUI: |
| 147 | keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui; | 147 | keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui; |
| 148 | keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui; | 148 | keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui; |
| 149 | #ifdef AUDIO_ENABLE | 149 | #ifdef AUDIO_ENABLE |
| 150 | if (keymap_config.swap_rctl_rgui) { | 150 | if (keymap_config.swap_rctl_rgui) { |
| 151 | PLAY_SONG(cg_swap_song); | 151 | PLAY_SONG(cg_swap_song); |
| 152 | } else { | 152 | } else { |
| 153 | PLAY_SONG(cg_norm_song); | 153 | PLAY_SONG(cg_norm_song); |
| 154 | } | 154 | } |
| 155 | #endif | 155 | #endif |
| 156 | break; | 156 | break; |
| 157 | case MAGIC_TOGGLE_NKRO: | 157 | case MAGIC_TOGGLE_NKRO: |
| 158 | clear_keyboard(); // clear first buffer to prevent stuck keys | 158 | clear_keyboard(); // clear first buffer to prevent stuck keys |
| 159 | keymap_config.nkro = !keymap_config.nkro; | 159 | keymap_config.nkro = !keymap_config.nkro; |
| 160 | break; | 160 | break; |
| 161 | case MAGIC_EE_HANDS_LEFT: | 161 | case MAGIC_EE_HANDS_LEFT: |
| 162 | eeconfig_update_handedness(true); | 162 | eeconfig_update_handedness(true); |
| 163 | break; | 163 | break; |
| 164 | case MAGIC_EE_HANDS_RIGHT: | 164 | case MAGIC_EE_HANDS_RIGHT: |
| 165 | eeconfig_update_handedness(false); | 165 | eeconfig_update_handedness(false); |
| 166 | break; | 166 | break; |
| 167 | default: | 167 | } |
| 168 | // Not a magic keycode so continue processing | ||
| 169 | return true; | ||
| 170 | } | ||
| 171 | 168 | ||
| 172 | eeconfig_update_keymap(keymap_config.raw); | 169 | eeconfig_update_keymap(keymap_config.raw); |
| 173 | clear_keyboard(); // clear to prevent stuck keys | 170 | clear_keyboard(); // clear to prevent stuck keys |
| 171 | |||
| 172 | return false; | ||
| 173 | } | ||
| 174 | } | ||
| 174 | 175 | ||
| 175 | return false; | 176 | // Not a magic keycode so continue processing |
| 177 | return true; | ||
| 176 | } | 178 | } |
