diff options
author | QMK Bot <hello@qmk.fm> | 2021-10-06 00:50:53 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-10-06 00:50:53 +0000 |
commit | 9f0e74802a9fef5bad5052ef0f54fa2ab533f578 (patch) | |
tree | 1773d86c64925513f8f10f791e3b1bda3413711a | |
parent | 97197f2ca268e3d80b0e1368c55ef678c5180508 (diff) | |
parent | 3b8c4979dc17a52cd87f30b4986ca46d0b365860 (diff) | |
download | qmk_firmware-9f0e74802a9fef5bad5052ef0f54fa2ab533f578.tar.gz qmk_firmware-9f0e74802a9fef5bad5052ef0f54fa2ab533f578.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | quantum/command.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/command.c b/quantum/command.c index 2ff640a7b..6d56a25ea 100644 --- a/quantum/command.c +++ b/quantum/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 | #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) | 42 | #if defined(MOUSEKEY_ENABLE) |
43 | # include "mousekey.h" | 43 | # include "mousekey.h" |
44 | #endif | 44 | #endif |
45 | 45 | ||
@@ -53,7 +53,7 @@ static void print_version(void); | |||
53 | static void print_status(void); | 53 | static void print_status(void); |
54 | static bool command_console(uint8_t code); | 54 | static bool command_console(uint8_t code); |
55 | static void command_console_help(void); | 55 | static void command_console_help(void); |
56 | #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) | 56 | #if defined(MOUSEKEY_ENABLE) |
57 | static bool mousekey_console(uint8_t code); | 57 | static bool mousekey_console(uint8_t code); |
58 | #endif | 58 | #endif |
59 | 59 | ||
@@ -73,7 +73,7 @@ bool command_proc(uint8_t code) { | |||
73 | else | 73 | else |
74 | return (command_console_extra(code) || command_console(code)); | 74 | return (command_console_extra(code) || command_console(code)); |
75 | break; | 75 | break; |
76 | #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) | 76 | #if defined(MOUSEKEY_ENABLE) |
77 | case MOUSEKEY: | 77 | case MOUSEKEY: |
78 | mousekey_console(code); | 78 | mousekey_console(code); |
79 | break; | 79 | break; |