From aadf4cd89e7da0f004b77e47b0951237ba51068c Mon Sep 17 00:00:00 2001 From: zvecr Date: Sat, 5 Nov 2022 07:22:22 +0000 Subject: [PATCH] Sort magic keycodes --- .../keycodes/keycodes_0.0.1_magic.hjson | 132 ++++----- quantum/keycodes.h | 94 +++--- quantum/process_keycode/process_magic.c | 270 +++++++++--------- 3 files changed, 245 insertions(+), 251 deletions(-) diff --git a/data/constants/keycodes/keycodes_0.0.1_magic.hjson b/data/constants/keycodes/keycodes_0.0.1_magic.hjson index 99c7f7989967..7ee1f2bce9ec 100644 --- a/data/constants/keycodes/keycodes_0.0.1_magic.hjson +++ b/data/constants/keycodes/keycodes_0.0.1_magic.hjson @@ -9,100 +9,100 @@ }, "0x7001": { "group": "magic", - "key": "MAGIC_CAPSLOCK_TO_CONTROL", + "key": "MAGIC_UNSWAP_CONTROL_CAPSLOCK", "aliases": [ - "CL_CTRL" + "CL_NORM" ] }, "0x7002": { "group": "magic", - "key": "MAGIC_SWAP_LALT_LGUI", + "key": "MAGIC_TOGGLE_CONTROL_CAPSLOCK", "aliases": [ - "LAG_SWP" + "CL_TOGG" ] }, "0x7003": { "group": "magic", - "key": "MAGIC_SWAP_RALT_RGUI", + "key": "MAGIC_UNCAPSLOCK_TO_CONTROL", "aliases": [ - "RAG_SWP" + "CL_CAPS" ] }, "0x7004": { "group": "magic", - "key": "MAGIC_NO_GUI", + "key": "MAGIC_CAPSLOCK_TO_CONTROL", "aliases": [ - "GUI_OFF" + "CL_CTRL" ] }, "0x7005": { "group": "magic", - "key": "MAGIC_SWAP_GRAVE_ESC", + "key": "MAGIC_SWAP_LALT_LGUI", "aliases": [ - "GE_SWAP" + "LAG_SWP" ] }, "0x7006": { "group": "magic", - "key": "MAGIC_SWAP_BACKSLASH_BACKSPACE", + "key": "MAGIC_UNSWAP_LALT_LGUI", "aliases": [ - "BS_SWAP" + "LAG_NRM" ] }, "0x7007": { "group": "magic", - "key": "MAGIC_HOST_NKRO", + "key": "MAGIC_SWAP_RALT_RGUI", "aliases": [ - "NK_ON" + "RAG_SWP" ] }, "0x7008": { "group": "magic", - "key": "MAGIC_SWAP_ALT_GUI", + "key": "MAGIC_UNSWAP_RALT_RGUI", "aliases": [ - "AG_SWAP" + "RAG_NRM" ] }, "0x7009": { "group": "magic", - "key": "MAGIC_UNSWAP_CONTROL_CAPSLOCK", + "key": "MAGIC_UNNO_GUI", "aliases": [ - "CL_NORM" + "GUI_ON" ] }, "0x700A": { "group": "magic", - "key": "MAGIC_UNCAPSLOCK_TO_CONTROL", + "key": "MAGIC_NO_GUI", "aliases": [ - "CL_CAPS" + "GUI_OFF" ] }, "0x700B": { "group": "magic", - "key": "MAGIC_UNSWAP_LALT_LGUI", + "key": "MAGIC_TOGGLE_GUI", "aliases": [ - "LAG_NRM" + "GUI_TOG" ] }, "0x700C": { "group": "magic", - "key": "MAGIC_UNSWAP_RALT_RGUI", + "key": "MAGIC_SWAP_GRAVE_ESC", "aliases": [ - "RAG_NRM" + "GE_SWAP" ] }, "0x700D": { "group": "magic", - "key": "MAGIC_UNNO_GUI", + "key": "MAGIC_UNSWAP_GRAVE_ESC", "aliases": [ - "GUI_ON" + "GE_NORM" ] }, "0x700E": { "group": "magic", - "key": "MAGIC_UNSWAP_GRAVE_ESC", + "key": "MAGIC_SWAP_BACKSLASH_BACKSPACE", "aliases": [ - "GE_NORM" + "BS_SWAP" ] }, "0x700F": { @@ -114,135 +114,135 @@ }, "0x7010": { "group": "magic", - "key": "MAGIC_UNHOST_NKRO", + "key": "MAGIC_TOGGLE_BACKSLASH_BACKSPACE", "aliases": [ - "NK_OFF" + "BS_TOGG" ] }, "0x7011": { "group": "magic", - "key": "MAGIC_UNSWAP_ALT_GUI", + "key": "MAGIC_HOST_NKRO", "aliases": [ - "AG_NORM" + "NK_ON" ] }, "0x7012": { "group": "magic", - "key": "MAGIC_TOGGLE_NKRO", + "key": "MAGIC_UNHOST_NKRO", "aliases": [ - "NK_TOGG" + "NK_OFF" ] }, "0x7013": { "group": "magic", - "key": "MAGIC_TOGGLE_ALT_GUI", + "key": "MAGIC_TOGGLE_NKRO", "aliases": [ - "AG_TOGG" + "NK_TOGG" ] }, "0x7014": { "group": "magic", - "key": "MAGIC_SWAP_LCTL_LGUI", + "key": "MAGIC_SWAP_ALT_GUI", "aliases": [ - "LCG_SWP" + "AG_SWAP" ] }, "0x7015": { "group": "magic", - "key": "MAGIC_SWAP_RCTL_RGUI", + "key": "MAGIC_UNSWAP_ALT_GUI", "aliases": [ - "RCG_SWP" + "AG_NORM" ] }, "0x7016": { "group": "magic", - "key": "MAGIC_UNSWAP_LCTL_LGUI", + "key": "MAGIC_TOGGLE_ALT_GUI", "aliases": [ - "LCG_NRM" + "AG_TOGG" ] }, "0x7017": { "group": "magic", - "key": "MAGIC_UNSWAP_RCTL_RGUI", + "key": "MAGIC_SWAP_LCTL_LGUI", "aliases": [ - "RCG_NRM" + "LCG_SWP" ] }, "0x7018": { "group": "magic", - "key": "MAGIC_SWAP_CTL_GUI", + "key": "MAGIC_UNSWAP_LCTL_LGUI", "aliases": [ - "CG_SWAP" + "LCG_NRM" ] }, "0x7019": { "group": "magic", - "key": "MAGIC_UNSWAP_CTL_GUI", + "key": "MAGIC_SWAP_RCTL_RGUI", "aliases": [ - "CG_NORM" + "RCG_SWP" ] }, "0x701A": { "group": "magic", - "key": "MAGIC_TOGGLE_CTL_GUI", + "key": "MAGIC_UNSWAP_RCTL_RGUI", "aliases": [ - "CG_TOGG" + "RCG_NRM" ] }, "0x701B": { "group": "magic", - "key": "MAGIC_EE_HANDS_LEFT", + "key": "MAGIC_SWAP_CTL_GUI", "aliases": [ - "EH_LEFT" + "CG_SWAP" ] }, "0x701C": { "group": "magic", - "key": "MAGIC_EE_HANDS_RIGHT", + "key": "MAGIC_UNSWAP_CTL_GUI", "aliases": [ - "EH_RGHT" + "CG_NORM" ] }, "0x701D": { "group": "magic", - "key": "MAGIC_TOGGLE_GUI", + "key": "MAGIC_TOGGLE_CTL_GUI", "aliases": [ - "GUI_TOG" + "CG_TOGG" ] }, "0x701E": { "group": "magic", - "key": "MAGIC_TOGGLE_CONTROL_CAPSLOCK", + "key": "MAGIC_EE_HANDS_LEFT", "aliases": [ - "CL_TOGG" + "EH_LEFT" ] }, "0x701F": { "group": "magic", - "key": "MAGIC_SWAP_ESCAPE_CAPSLOCK", + "key": "MAGIC_EE_HANDS_RIGHT", "aliases": [ - "EC_SWAP" + "EH_RGHT" ] }, "0x7020": { "group": "magic", - "key": "MAGIC_UNSWAP_ESCAPE_CAPSLOCK", + "key": "MAGIC_SWAP_ESCAPE_CAPSLOCK", "aliases": [ - "EC_NORM" + "EC_SWAP" ] }, "0x7021": { "group": "magic", - "key": "MAGIC_TOGGLE_ESCAPE_CAPSLOCK", + "key": "MAGIC_UNSWAP_ESCAPE_CAPSLOCK", "aliases": [ - "EC_TOGG" + "EC_NORM" ] }, "0x7022": { "group": "magic", - "key": "MAGIC_TOGGLE_BACKSLASH_BACKSPACE", + "key": "MAGIC_TOGGLE_ESCAPE_CAPSLOCK", "aliases": [ - "BS_TOGG" + "EC_TOGG" ] } } diff --git a/quantum/keycodes.h b/quantum/keycodes.h index 8a36d2c53609..6772bb6a4a31 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -312,40 +312,40 @@ enum qk_keycode_defines { SH_ON = 0x56F5, SH_OS = 0x56F6, MAGIC_SWAP_CONTROL_CAPSLOCK = 0x7000, - MAGIC_CAPSLOCK_TO_CONTROL = 0x7001, - MAGIC_SWAP_LALT_LGUI = 0x7002, - MAGIC_SWAP_RALT_RGUI = 0x7003, - MAGIC_NO_GUI = 0x7004, - MAGIC_SWAP_GRAVE_ESC = 0x7005, - MAGIC_SWAP_BACKSLASH_BACKSPACE = 0x7006, - MAGIC_HOST_NKRO = 0x7007, - MAGIC_SWAP_ALT_GUI = 0x7008, - MAGIC_UNSWAP_CONTROL_CAPSLOCK = 0x7009, - MAGIC_UNCAPSLOCK_TO_CONTROL = 0x700A, - MAGIC_UNSWAP_LALT_LGUI = 0x700B, - MAGIC_UNSWAP_RALT_RGUI = 0x700C, - MAGIC_UNNO_GUI = 0x700D, - MAGIC_UNSWAP_GRAVE_ESC = 0x700E, + MAGIC_UNSWAP_CONTROL_CAPSLOCK = 0x7001, + MAGIC_TOGGLE_CONTROL_CAPSLOCK = 0x7002, + MAGIC_UNCAPSLOCK_TO_CONTROL = 0x7003, + MAGIC_CAPSLOCK_TO_CONTROL = 0x7004, + MAGIC_SWAP_LALT_LGUI = 0x7005, + MAGIC_UNSWAP_LALT_LGUI = 0x7006, + MAGIC_SWAP_RALT_RGUI = 0x7007, + MAGIC_UNSWAP_RALT_RGUI = 0x7008, + MAGIC_UNNO_GUI = 0x7009, + MAGIC_NO_GUI = 0x700A, + MAGIC_TOGGLE_GUI = 0x700B, + MAGIC_SWAP_GRAVE_ESC = 0x700C, + MAGIC_UNSWAP_GRAVE_ESC = 0x700D, + MAGIC_SWAP_BACKSLASH_BACKSPACE = 0x700E, MAGIC_UNSWAP_BACKSLASH_BACKSPACE = 0x700F, - MAGIC_UNHOST_NKRO = 0x7010, - MAGIC_UNSWAP_ALT_GUI = 0x7011, - MAGIC_TOGGLE_NKRO = 0x7012, - MAGIC_TOGGLE_ALT_GUI = 0x7013, - MAGIC_SWAP_LCTL_LGUI = 0x7014, - MAGIC_SWAP_RCTL_RGUI = 0x7015, - MAGIC_UNSWAP_LCTL_LGUI = 0x7016, - MAGIC_UNSWAP_RCTL_RGUI = 0x7017, - MAGIC_SWAP_CTL_GUI = 0x7018, - MAGIC_UNSWAP_CTL_GUI = 0x7019, - MAGIC_TOGGLE_CTL_GUI = 0x701A, - MAGIC_EE_HANDS_LEFT = 0x701B, - MAGIC_EE_HANDS_RIGHT = 0x701C, - MAGIC_TOGGLE_GUI = 0x701D, - MAGIC_TOGGLE_CONTROL_CAPSLOCK = 0x701E, - MAGIC_SWAP_ESCAPE_CAPSLOCK = 0x701F, - MAGIC_UNSWAP_ESCAPE_CAPSLOCK = 0x7020, - MAGIC_TOGGLE_ESCAPE_CAPSLOCK = 0x7021, - MAGIC_TOGGLE_BACKSLASH_BACKSPACE = 0x7022, + MAGIC_TOGGLE_BACKSLASH_BACKSPACE = 0x7010, + MAGIC_HOST_NKRO = 0x7011, + MAGIC_UNHOST_NKRO = 0x7012, + MAGIC_TOGGLE_NKRO = 0x7013, + MAGIC_SWAP_ALT_GUI = 0x7014, + MAGIC_UNSWAP_ALT_GUI = 0x7015, + MAGIC_TOGGLE_ALT_GUI = 0x7016, + MAGIC_SWAP_LCTL_LGUI = 0x7017, + MAGIC_UNSWAP_LCTL_LGUI = 0x7018, + MAGIC_SWAP_RCTL_RGUI = 0x7019, + MAGIC_UNSWAP_RCTL_RGUI = 0x701A, + MAGIC_SWAP_CTL_GUI = 0x701B, + MAGIC_UNSWAP_CTL_GUI = 0x701C, + MAGIC_TOGGLE_CTL_GUI = 0x701D, + MAGIC_EE_HANDS_LEFT = 0x701E, + MAGIC_EE_HANDS_RIGHT = 0x701F, + MAGIC_SWAP_ESCAPE_CAPSLOCK = 0x7020, + MAGIC_UNSWAP_ESCAPE_CAPSLOCK = 0x7021, + MAGIC_TOGGLE_ESCAPE_CAPSLOCK = 0x7022, MI_ON = 0x7100, MI_OFF = 0x7101, MI_TOG = 0x7102, @@ -866,40 +866,40 @@ enum qk_keycode_defines { KC_RCMD = KC_RIGHT_GUI, KC_RWIN = KC_RIGHT_GUI, CL_SWAP = MAGIC_SWAP_CONTROL_CAPSLOCK, - CL_CTRL = MAGIC_CAPSLOCK_TO_CONTROL, - LAG_SWP = MAGIC_SWAP_LALT_LGUI, - RAG_SWP = MAGIC_SWAP_RALT_RGUI, - GUI_OFF = MAGIC_NO_GUI, - GE_SWAP = MAGIC_SWAP_GRAVE_ESC, - BS_SWAP = MAGIC_SWAP_BACKSLASH_BACKSPACE, - NK_ON = MAGIC_HOST_NKRO, - AG_SWAP = MAGIC_SWAP_ALT_GUI, CL_NORM = MAGIC_UNSWAP_CONTROL_CAPSLOCK, + CL_TOGG = MAGIC_TOGGLE_CONTROL_CAPSLOCK, CL_CAPS = MAGIC_UNCAPSLOCK_TO_CONTROL, + CL_CTRL = MAGIC_CAPSLOCK_TO_CONTROL, + LAG_SWP = MAGIC_SWAP_LALT_LGUI, LAG_NRM = MAGIC_UNSWAP_LALT_LGUI, + RAG_SWP = MAGIC_SWAP_RALT_RGUI, RAG_NRM = MAGIC_UNSWAP_RALT_RGUI, GUI_ON = MAGIC_UNNO_GUI, + GUI_OFF = MAGIC_NO_GUI, + GUI_TOG = MAGIC_TOGGLE_GUI, + GE_SWAP = MAGIC_SWAP_GRAVE_ESC, GE_NORM = MAGIC_UNSWAP_GRAVE_ESC, + BS_SWAP = MAGIC_SWAP_BACKSLASH_BACKSPACE, BS_NORM = MAGIC_UNSWAP_BACKSLASH_BACKSPACE, + BS_TOGG = MAGIC_TOGGLE_BACKSLASH_BACKSPACE, + NK_ON = MAGIC_HOST_NKRO, NK_OFF = MAGIC_UNHOST_NKRO, - AG_NORM = MAGIC_UNSWAP_ALT_GUI, NK_TOGG = MAGIC_TOGGLE_NKRO, + AG_SWAP = MAGIC_SWAP_ALT_GUI, + AG_NORM = MAGIC_UNSWAP_ALT_GUI, AG_TOGG = MAGIC_TOGGLE_ALT_GUI, LCG_SWP = MAGIC_SWAP_LCTL_LGUI, - RCG_SWP = MAGIC_SWAP_RCTL_RGUI, LCG_NRM = MAGIC_UNSWAP_LCTL_LGUI, + RCG_SWP = MAGIC_SWAP_RCTL_RGUI, RCG_NRM = MAGIC_UNSWAP_RCTL_RGUI, CG_SWAP = MAGIC_SWAP_CTL_GUI, CG_NORM = MAGIC_UNSWAP_CTL_GUI, CG_TOGG = MAGIC_TOGGLE_CTL_GUI, EH_LEFT = MAGIC_EE_HANDS_LEFT, EH_RGHT = MAGIC_EE_HANDS_RIGHT, - GUI_TOG = MAGIC_TOGGLE_GUI, - CL_TOGG = MAGIC_TOGGLE_CONTROL_CAPSLOCK, EC_SWAP = MAGIC_SWAP_ESCAPE_CAPSLOCK, EC_NORM = MAGIC_UNSWAP_ESCAPE_CAPSLOCK, EC_TOGG = MAGIC_TOGGLE_ESCAPE_CAPSLOCK, - BS_TOGG = MAGIC_TOGGLE_BACKSLASH_BACKSPACE, MI_Db = MI_Cs, MI_Eb = MI_Ds, MI_Gb = MI_Fs, @@ -1101,7 +1101,7 @@ enum qk_keycode_defines { #define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2) #define IS_MODIFIERS_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI) #define IS_SWAP_HANDS_KEYCODE(code) ((code) >= SH_TG && (code) <= SH_OS) -#define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_BACKSLASH_BACKSPACE) +#define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK) #define IS_MIDI_KEYCODE(code) ((code) >= MI_ON && (code) <= MI_BENDU) #define IS_SEQUENCER_KEYCODE(code) ((code) >= SQ_ON && (code) <= SQ_SCLR) #define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31) diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c index 50816c52610c..72332b20d7f5 100644 --- a/quantum/process_keycode/process_magic.c +++ b/quantum/process_keycode/process_magic.c @@ -40,158 +40,152 @@ float cg_swap_song[][2] = CG_SWAP_SONG; bool process_magic(uint16_t keycode, keyrecord_t *record) { // skip anything that isn't a keyup if (record->event.pressed) { - switch (keycode) { - case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_ALT_GUI: - case MAGIC_SWAP_LCTL_LGUI ... MAGIC_EE_HANDS_RIGHT: - case MAGIC_TOGGLE_GUI: - case MAGIC_TOGGLE_CONTROL_CAPSLOCK: - case MAGIC_TOGGLE_BACKSLASH_BACKSPACE: - case MAGIC_SWAP_ESCAPE_CAPSLOCK ... MAGIC_TOGGLE_ESCAPE_CAPSLOCK: - /* keymap config */ - keymap_config.raw = eeconfig_read_keymap(); - switch (keycode) { - case MAGIC_SWAP_CONTROL_CAPSLOCK: - keymap_config.swap_control_capslock = true; - break; - case MAGIC_SWAP_ESCAPE_CAPSLOCK: - keymap_config.swap_escape_capslock = true; - break; - case MAGIC_CAPSLOCK_TO_CONTROL: - keymap_config.capslock_to_control = true; - break; - case MAGIC_SWAP_LALT_LGUI: - keymap_config.swap_lalt_lgui = true; - break; - case MAGIC_SWAP_RALT_RGUI: - keymap_config.swap_ralt_rgui = true; - break; - case MAGIC_SWAP_LCTL_LGUI: - keymap_config.swap_lctl_lgui = true; - break; - case MAGIC_SWAP_RCTL_RGUI: - keymap_config.swap_rctl_rgui = true; - break; - case MAGIC_NO_GUI: - keymap_config.no_gui = true; - break; - case MAGIC_SWAP_GRAVE_ESC: - keymap_config.swap_grave_esc = true; - break; - case MAGIC_SWAP_BACKSLASH_BACKSPACE: - keymap_config.swap_backslash_backspace = true; - break; - case MAGIC_HOST_NKRO: - clear_keyboard(); // clear first buffer to prevent stuck keys - keymap_config.nkro = true; - break; - case MAGIC_SWAP_ALT_GUI: - keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true; + if (IS_MAGIC_KEYCODE(keycode)) { + /* keymap config */ + keymap_config.raw = eeconfig_read_keymap(); + switch (keycode) { + case MAGIC_SWAP_CONTROL_CAPSLOCK: + keymap_config.swap_control_capslock = true; + break; + case MAGIC_SWAP_ESCAPE_CAPSLOCK: + keymap_config.swap_escape_capslock = true; + break; + case MAGIC_CAPSLOCK_TO_CONTROL: + keymap_config.capslock_to_control = true; + break; + case MAGIC_SWAP_LALT_LGUI: + keymap_config.swap_lalt_lgui = true; + break; + case MAGIC_SWAP_RALT_RGUI: + keymap_config.swap_ralt_rgui = true; + break; + case MAGIC_SWAP_LCTL_LGUI: + keymap_config.swap_lctl_lgui = true; + break; + case MAGIC_SWAP_RCTL_RGUI: + keymap_config.swap_rctl_rgui = true; + break; + case MAGIC_NO_GUI: + keymap_config.no_gui = true; + break; + case MAGIC_SWAP_GRAVE_ESC: + keymap_config.swap_grave_esc = true; + break; + case MAGIC_SWAP_BACKSLASH_BACKSPACE: + keymap_config.swap_backslash_backspace = true; + break; + case MAGIC_HOST_NKRO: + clear_keyboard(); // clear first buffer to prevent stuck keys + keymap_config.nkro = true; + break; + case MAGIC_SWAP_ALT_GUI: + keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true; #ifdef AUDIO_ENABLE - PLAY_SONG(ag_swap_song); + PLAY_SONG(ag_swap_song); #endif - break; - case MAGIC_SWAP_CTL_GUI: - keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true; + break; + case MAGIC_SWAP_CTL_GUI: + keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = true; #ifdef AUDIO_ENABLE - PLAY_SONG(cg_swap_song); + PLAY_SONG(cg_swap_song); #endif - break; - case MAGIC_UNSWAP_CONTROL_CAPSLOCK: - keymap_config.swap_control_capslock = false; - break; - case MAGIC_UNSWAP_ESCAPE_CAPSLOCK: - keymap_config.swap_escape_capslock = false; - break; - case MAGIC_UNCAPSLOCK_TO_CONTROL: - keymap_config.capslock_to_control = false; - break; - case MAGIC_UNSWAP_LALT_LGUI: - keymap_config.swap_lalt_lgui = false; - break; - case MAGIC_UNSWAP_RALT_RGUI: - keymap_config.swap_ralt_rgui = false; - break; - case MAGIC_UNSWAP_LCTL_LGUI: - keymap_config.swap_lctl_lgui = false; - break; - case MAGIC_UNSWAP_RCTL_RGUI: - keymap_config.swap_rctl_rgui = false; - break; - case MAGIC_UNNO_GUI: - keymap_config.no_gui = false; - break; - case MAGIC_UNSWAP_GRAVE_ESC: - keymap_config.swap_grave_esc = false; - break; - case MAGIC_UNSWAP_BACKSLASH_BACKSPACE: - keymap_config.swap_backslash_backspace = false; - break; - case MAGIC_UNHOST_NKRO: - clear_keyboard(); // clear first buffer to prevent stuck keys - keymap_config.nkro = false; - break; - case MAGIC_UNSWAP_ALT_GUI: - keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false; + break; + case MAGIC_UNSWAP_CONTROL_CAPSLOCK: + keymap_config.swap_control_capslock = false; + break; + case MAGIC_UNSWAP_ESCAPE_CAPSLOCK: + keymap_config.swap_escape_capslock = false; + break; + case MAGIC_UNCAPSLOCK_TO_CONTROL: + keymap_config.capslock_to_control = false; + break; + case MAGIC_UNSWAP_LALT_LGUI: + keymap_config.swap_lalt_lgui = false; + break; + case MAGIC_UNSWAP_RALT_RGUI: + keymap_config.swap_ralt_rgui = false; + break; + case MAGIC_UNSWAP_LCTL_LGUI: + keymap_config.swap_lctl_lgui = false; + break; + case MAGIC_UNSWAP_RCTL_RGUI: + keymap_config.swap_rctl_rgui = false; + break; + case MAGIC_UNNO_GUI: + keymap_config.no_gui = false; + break; + case MAGIC_UNSWAP_GRAVE_ESC: + keymap_config.swap_grave_esc = false; + break; + case MAGIC_UNSWAP_BACKSLASH_BACKSPACE: + keymap_config.swap_backslash_backspace = false; + break; + case MAGIC_UNHOST_NKRO: + clear_keyboard(); // clear first buffer to prevent stuck keys + keymap_config.nkro = false; + break; + case MAGIC_UNSWAP_ALT_GUI: + keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false; #ifdef AUDIO_ENABLE - PLAY_SONG(ag_norm_song); + PLAY_SONG(ag_norm_song); #endif - break; - case MAGIC_UNSWAP_CTL_GUI: - keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false; + break; + case MAGIC_UNSWAP_CTL_GUI: + keymap_config.swap_lctl_lgui = keymap_config.swap_rctl_rgui = false; #ifdef AUDIO_ENABLE - PLAY_SONG(cg_norm_song); + PLAY_SONG(cg_norm_song); #endif - break; - case MAGIC_TOGGLE_ALT_GUI: - keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui; - keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui; + break; + case MAGIC_TOGGLE_ALT_GUI: + keymap_config.swap_lalt_lgui = !keymap_config.swap_lalt_lgui; + keymap_config.swap_ralt_rgui = keymap_config.swap_lalt_lgui; #ifdef AUDIO_ENABLE - if (keymap_config.swap_ralt_rgui) { - PLAY_SONG(ag_swap_song); - } else { - PLAY_SONG(ag_norm_song); - } + if (keymap_config.swap_ralt_rgui) { + PLAY_SONG(ag_swap_song); + } else { + PLAY_SONG(ag_norm_song); + } #endif - break; - case MAGIC_TOGGLE_CTL_GUI: - keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui; - keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui; + break; + case MAGIC_TOGGLE_CTL_GUI: + keymap_config.swap_lctl_lgui = !keymap_config.swap_lctl_lgui; + keymap_config.swap_rctl_rgui = keymap_config.swap_lctl_lgui; #ifdef AUDIO_ENABLE - if (keymap_config.swap_rctl_rgui) { - PLAY_SONG(cg_swap_song); - } else { - PLAY_SONG(cg_norm_song); - } + if (keymap_config.swap_rctl_rgui) { + PLAY_SONG(cg_swap_song); + } else { + PLAY_SONG(cg_norm_song); + } #endif - break; - case MAGIC_TOGGLE_BACKSLASH_BACKSPACE: - keymap_config.swap_backslash_backspace = !keymap_config.swap_backslash_backspace; - break; - case MAGIC_TOGGLE_NKRO: - clear_keyboard(); // clear first buffer to prevent stuck keys - keymap_config.nkro = !keymap_config.nkro; - break; - case MAGIC_EE_HANDS_LEFT: - eeconfig_update_handedness(true); - break; - case MAGIC_EE_HANDS_RIGHT: - eeconfig_update_handedness(false); - break; - case MAGIC_TOGGLE_GUI: - keymap_config.no_gui = !keymap_config.no_gui; - break; - case MAGIC_TOGGLE_CONTROL_CAPSLOCK: - keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock; - break; - case MAGIC_TOGGLE_ESCAPE_CAPSLOCK: - keymap_config.swap_escape_capslock = !keymap_config.swap_escape_capslock; - break; - } + break; + case MAGIC_TOGGLE_BACKSLASH_BACKSPACE: + keymap_config.swap_backslash_backspace = !keymap_config.swap_backslash_backspace; + break; + case MAGIC_TOGGLE_NKRO: + clear_keyboard(); // clear first buffer to prevent stuck keys + keymap_config.nkro = !keymap_config.nkro; + break; + case MAGIC_EE_HANDS_LEFT: + eeconfig_update_handedness(true); + break; + case MAGIC_EE_HANDS_RIGHT: + eeconfig_update_handedness(false); + break; + case MAGIC_TOGGLE_GUI: + keymap_config.no_gui = !keymap_config.no_gui; + break; + case MAGIC_TOGGLE_CONTROL_CAPSLOCK: + keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock; + break; + case MAGIC_TOGGLE_ESCAPE_CAPSLOCK: + keymap_config.swap_escape_capslock = !keymap_config.swap_escape_capslock; + break; + } - eeconfig_update_keymap(keymap_config.raw); - clear_keyboard(); // clear to prevent stuck keys + eeconfig_update_keymap(keymap_config.raw); + clear_keyboard(); // clear to prevent stuck keys - return false; + return false; } }