diff options
Diffstat (limited to 'tmk_core/common/command.c')
| -rw-r--r-- | tmk_core/common/command.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index 77a205eac4..3cfcba3058 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -39,14 +39,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # include "backlight.h" #endif -#ifdef MOUSEKEY_ENABLE +#if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) # include "mousekey.h" #endif -#ifdef PROTOCOL_VUSB -# include "usbdrv.h" -#endif - #ifdef AUDIO_ENABLE # include "audio.h" #endif /* AUDIO_ENABLE */ @@ -57,7 +53,7 @@ static void print_version(void); static void print_status(void); static bool command_console(uint8_t code); static void command_console_help(void); -#ifdef MOUSEKEY_ENABLE +#if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) static bool mousekey_console(uint8_t code); static void mousekey_console_help(void); #endif @@ -78,7 +74,7 @@ bool command_proc(uint8_t code) { else return (command_console_extra(code) || command_console(code)); break; -#ifdef MOUSEKEY_ENABLE +#if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) case MOUSEKEY: mousekey_console(code); break; @@ -359,15 +355,8 @@ static bool command_common(uint8_t code) { // jump to bootloader case MAGIC_KC(MAGIC_KEY_BOOTLOADER): case MAGIC_KC(MAGIC_KEY_BOOTLOADER_ALT): - clear_keyboard(); // clear to prevent stuck keys print("\n\nJumping to bootloader... "); -#ifdef AUDIO_ENABLE - stop_all_notes(); - shutdown_user(); -#else - wait_ms(1000); -#endif - bootloader_jump(); // not return + reset_keyboard(); break; // debug toggle @@ -538,7 +527,7 @@ static bool command_console(uint8_t code) { case KC_ESC: command_state = ONESHOT; return false; -#ifdef MOUSEKEY_ENABLE +#if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) case KC_M: mousekey_console_help(); print("M> "); @@ -553,7 +542,7 @@ static bool command_console(uint8_t code) { return true; } -#ifdef MOUSEKEY_ENABLE +#if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) /*********************************************************** * Mousekey console ***********************************************************/ |