diff options
| author | Drashna Jaelre <drashna@live.com> | 2020-05-19 04:29:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 07:29:20 -0400 |
| commit | ef5fad137bc2516de0ac5082385377fefc010d4f (patch) | |
| tree | d796bdc447abbbd95f7162a9dcc134f39062e918 /tmk_core | |
| parent | 15dd05c40262327ac71d44cd15edaec9046bb6fe (diff) | |
| download | qmk_firmware-ef5fad137bc2516de0ac5082385377fefc010d4f.tar.gz qmk_firmware-ef5fad137bc2516de0ac5082385377fefc010d4f.zip | |
Disable Mousekey Command interface when Constant speed is enabled (#7017)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/command.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index 77a205eac..af7c83702 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/>. | |||
| 39 | # include "backlight.h" | 39 | # include "backlight.h" |
| 40 | #endif | 40 | #endif |
| 41 | 41 | ||
| 42 | #ifdef MOUSEKEY_ENABLE | 42 | #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) |
| 43 | # include "mousekey.h" | 43 | # include "mousekey.h" |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| @@ -57,7 +57,7 @@ static void print_version(void); | |||
| 57 | static void print_status(void); | 57 | static void print_status(void); |
| 58 | static bool command_console(uint8_t code); | 58 | static bool command_console(uint8_t code); |
| 59 | static void command_console_help(void); | 59 | static void command_console_help(void); |
| 60 | #ifdef MOUSEKEY_ENABLE | 60 | #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) |
| 61 | static bool mousekey_console(uint8_t code); | 61 | static bool mousekey_console(uint8_t code); |
| 62 | static void mousekey_console_help(void); | 62 | static void mousekey_console_help(void); |
| 63 | #endif | 63 | #endif |
| @@ -78,7 +78,7 @@ bool command_proc(uint8_t code) { | |||
| 78 | else | 78 | else |
| 79 | return (command_console_extra(code) || command_console(code)); | 79 | return (command_console_extra(code) || command_console(code)); |
| 80 | break; | 80 | break; |
| 81 | #ifdef MOUSEKEY_ENABLE | 81 | #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) |
| 82 | case MOUSEKEY: | 82 | case MOUSEKEY: |
| 83 | mousekey_console(code); | 83 | mousekey_console(code); |
| 84 | break; | 84 | break; |
| @@ -538,7 +538,7 @@ static bool command_console(uint8_t code) { | |||
| 538 | case KC_ESC: | 538 | case KC_ESC: |
| 539 | command_state = ONESHOT; | 539 | command_state = ONESHOT; |
| 540 | return false; | 540 | return false; |
| 541 | #ifdef MOUSEKEY_ENABLE | 541 | #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) |
| 542 | case KC_M: | 542 | case KC_M: |
| 543 | mousekey_console_help(); | 543 | mousekey_console_help(); |
| 544 | print("M> "); | 544 | print("M> "); |
| @@ -553,7 +553,7 @@ static bool command_console(uint8_t code) { | |||
| 553 | return true; | 553 | return true; |
| 554 | } | 554 | } |
| 555 | 555 | ||
| 556 | #ifdef MOUSEKEY_ENABLE | 556 | #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) |
| 557 | /*********************************************************** | 557 | /*********************************************************** |
| 558 | * Mousekey console | 558 | * Mousekey console |
| 559 | ***********************************************************/ | 559 | ***********************************************************/ |
