summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2020-05-19 04:29:20 -0700
committerFlorian Didron <fdidron@users.noreply.github.com>2020-06-12 17:00:27 +0900
commit9d171fcb8973a3cb707afa2905f865a14d6f3c34 (patch)
tree5ebb1869151724cd27c6e3531c933a411b111fb6 /tmk_core
parent0a34257a95c29c0d7595c8eba58764ac3fd58a58 (diff)
Disable Mousekey Command interface when Constant speed is enabled (#7017)
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/command.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index 77a205eac4..af7c837027 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -39,7 +39,7 @@ 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
@@ -57,7 +57,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 +78,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;
@@ -538,7 +538,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 +553,7 @@ static bool command_console(uint8_t code) {
return true;
}
-#ifdef MOUSEKEY_ENABLE
+#if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED)
/***********************************************************
* Mousekey console
***********************************************************/