hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix FORCE_NKRO handling (#7601)

Browse Source
refactor_process_record_kb_user
Joel Challis 6 years ago committed by Drashna Jaelre
parent 071eb2478f
commit efb21c00ce
2 changed files with 123 additions and 120 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 242
      quantum/process_keycode/process_magic.c
  2. 1
      tmk_core/common/keyboard.c

242
quantum/process_keycode/process_magic.c
Unescape View File

@ -39,138 +39,140 @@ float cg_swap_song[][2] = CG_SWAP_SONG;
*/ */
bool process_magic(uint16_t keycode, keyrecord_t *record) { bool process_magic(uint16_t keycode, keyrecord_t *record) {
// skip anything that isn't a keyup // skip anything that isn't a keyup
if (!record->event.pressed) { if (record->event.pressed) {
return true; switch (keycode) {
} case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_ALT_GUI:
case MAGIC_SWAP_LCTL_LGUI ... MAGIC_EE_HANDS_RIGHT:
/* keymap config */ /* keymap config */
keymap_config.raw = eeconfig_read_keymap(); keymap_config.raw = eeconfig_read_keymap();
switch (keycode) { switch (keycode) {
case MAGIC_SWAP_CONTROL_CAPSLOCK: case MAGIC_SWAP_CONTROL_CAPSLOCK:
keymap_config.swap_control_capslock = true; keymap_config.swap_control_capslock = true;
break; break;
case MAGIC_CAPSLOCK_TO_CONTROL: case MAGIC_CAPSLOCK_TO_CONTROL:
keymap_config.capslock_to_control = true; keymap_config.capslock_to_control = true;
break; break;
case MAGIC_SWAP_LALT_LGUI: case MAGIC_SWAP_LALT_LGUI:
keymap_config.swap_lalt_lgui = true; keymap_config.swap_lalt_lgui = true;
break; break;
case MAGIC_SWAP_RALT_RGUI: case MAGIC_SWAP_RALT_RGUI:
keymap_config.swap_ralt_rgui = true; keymap_config.swap_ralt_rgui = true;
break; break;
case MAGIC_SWAP_LCTL_LGUI: case MAGIC_SWAP_LCTL_LGUI:
keymap_config.swap_lctl_lgui = true; keymap_config.swap_lctl_lgui = true;
break; break;
case MAGIC_SWAP_RCTL_RGUI: case MAGIC_SWAP_RCTL_RGUI:
keymap_config.swap_rctl_rgui = true; keymap_config.swap_rctl_rgui = true;
break; break;
case MAGIC_NO_GUI: case MAGIC_NO_GUI:
keymap_config.no_gui = true; keymap_config.no_gui = true;
break; break;
case MAGIC_SWAP_GRAVE_ESC: case MAGIC_SWAP_GRAVE_ESC:
keymap_config.swap_grave_esc = true; keymap_config.swap_grave_esc = true;
break; break;
case MAGIC_SWAP_BACKSLASH_BACKSPACE: case MAGIC_SWAP_BACKSLASH_BACKSPACE:
keymap_config.swap_backslash_backspace = true; keymap_config.swap_backslash_backspace = true;
break; break;
case MAGIC_HOST_NKRO: case MAGIC_HOST_NKRO:
clear_keyboard(); // clear first buffer to prevent stuck keys clear_keyboard(); // clear first buffer to prevent stuck keys
keymap_config.nkro = true; keymap_config.nkro = true;
break; break;
case MAGIC_SWAP_ALT_GUI: case MAGIC_SWAP_ALT_GUI:
keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true; keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_SONG(ag_swap_song); PLAY_SONG(ag_swap_song);
#endif #endif
break; break;
case MAGIC_SWAP_CTL_GUI: case MAGIC_SWAP_CTL_GUI:
keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true; keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_SONG(cg_swap_song); PLAY_SONG(cg_swap_song);
#endif #endif
break; break;
case MAGIC_UNSWAP_CONTROL_CAPSLOCK: case MAGIC_UNSWAP_CONTROL_CAPSLOCK:
keymap_config.swap_control_capslock = false; keymap_config.swap_control_capslock = false;
break; break;
case MAGIC_UNCAPSLOCK_TO_CONTROL: case MAGIC_UNCAPSLOCK_TO_CONTROL:
keymap_config.capslock_to_control = false; keymap_config.capslock_to_control = false;
break; break;
case MAGIC_UNSWAP_LALT_LGUI: case MAGIC_UNSWAP_LALT_LGUI:
keymap_config.swap_lalt_lgui = false; keymap_config.swap_lalt_lgui = false;
break; break;
case MAGIC_UNSWAP_RALT_RGUI: case MAGIC_UNSWAP_RALT_RGUI:
keymap_config.swap_ralt_rgui = false; keymap_config.swap_ralt_rgui = false;
break; break;
case MAGIC_UNSWAP_LCTL_LGUI: case MAGIC_UNSWAP_LCTL_LGUI:
keymap_config.swap_lctl_lgui = false; keymap_config.swap_lctl_lgui = false;
break; break;
case MAGIC_UNSWAP_RCTL_RGUI: case MAGIC_UNSWAP_RCTL_RGUI:
keymap_config.swap_rctl_rgui = false; keymap_config.swap_rctl_rgui = false;
break; break;
case MAGIC_UNNO_GUI: case MAGIC_UNNO_GUI:
keymap_config.no_gui = false; keymap_config.no_gui = false;
break; break;
case MAGIC_UNSWAP_GRAVE_ESC: case MAGIC_UNSWAP_GRAVE_ESC:
keymap_config.swap_grave_esc = false; keymap_config.swap_grave_esc = false;
break; break;
case MAGIC_UNSWAP_BACKSLASH_BACKSPACE: case MAGIC_UNSWAP_BACKSLASH_BACKSPACE:
keymap_config.swap_backslash_backspace = false; keymap_config.swap_backslash_backspace = false;
break; break;
case MAGIC_UNHOST_NKRO: case MAGIC_UNHOST_NKRO:
clear_keyboard(); // clear first buffer to prevent stuck keys clear_keyboard(); // clear first buffer to prevent stuck keys
keymap_config.nkro = false; keymap_config.nkro = false;
break; break;
case MAGIC_UNSWAP_ALT_GUI: case MAGIC_UNSWAP_ALT_GUI:
keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false; keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_SONG(ag_norm_song); PLAY_SONG(ag_norm_song);
#endif #endif
break; break;
case MAGIC_UNSWAP_CTL_GUI: case MAGIC_UNSWAP_CTL_GUI:
keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false; keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_SONG(cg_norm_song); PLAY_SONG(cg_norm_song);
#endif #endif
break; break;
case MAGIC_TOGGLE_ALT_GUI: case MAGIC_TOGGLE_ALT_GUI:
keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui; keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui;
keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui; keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
if (keymap_config.swap_ralt_rgui) { if (keymap_config.swap_ralt_rgui) {
PLAY_SONG(ag_swap_song); PLAY_SONG(ag_swap_song);
} else { } else {
PLAY_SONG(ag_norm_song); PLAY_SONG(ag_norm_song);
} }
#endif #endif
break; break;
case MAGIC_TOGGLE_CTL_GUI: case MAGIC_TOGGLE_CTL_GUI:
keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui; keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui;
keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui; keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
if (keymap_config.swap_rctl_rgui) { if (keymap_config.swap_rctl_rgui) {
PLAY_SONG(cg_swap_song); PLAY_SONG(cg_swap_song);
} else { } else {
PLAY_SONG(cg_norm_song); PLAY_SONG(cg_norm_song);
} }
#endif #endif
break; break;
case MAGIC_TOGGLE_NKRO: case MAGIC_TOGGLE_NKRO:
clear_keyboard(); // clear first buffer to prevent stuck keys clear_keyboard(); // clear first buffer to prevent stuck keys
keymap_config.nkro = !keymap_config.nkro; keymap_config.nkro = !keymap_config.nkro;
break; break;
case MAGIC_EE_HANDS_LEFT: case MAGIC_EE_HANDS_LEFT:
eeconfig_update_handedness(true); eeconfig_update_handedness(true);
break; break;
case MAGIC_EE_HANDS_RIGHT: case MAGIC_EE_HANDS_RIGHT:
eeconfig_update_handedness(false); eeconfig_update_handedness(false);
break; break;
default: }
// Not a magic keycode so continue processing
return true;
}
eeconfig_update_keymap(keymap_config.raw); eeconfig_update_keymap(keymap_config.raw);
clear_keyboard(); // clear to prevent stuck keys clear_keyboard(); // clear to prevent stuck keys
return false;
}
}
return false; // Not a magic keycode so continue processing
return true;
} }

1
tmk_core/common/keyboard.c
Unescape View File

@ -254,6 +254,7 @@ void keyboard_init(void) {
#endif #endif
#if defined(NKRO_ENABLE) && defined(FORCE_NKRO) #if defined(NKRO_ENABLE) && defined(FORCE_NKRO)
keymap_config.nkro = 1; keymap_config.nkro = 1;
eeconfig_update_keymap(keymap_config.raw);
#endif #endif
keyboard_post_init_kb(); /* Always keep this last */ keyboard_post_init_kb(); /* Always keep this last */
} }

Write Preview
Loading…
Cancel
Save