1
0
Fork 0

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-10-06 00:50:53 +00:00
commit 9f0e74802a

View file

@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "backlight.h" # include "backlight.h"
#endif #endif
#if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) #if defined(MOUSEKEY_ENABLE)
# include "mousekey.h" # include "mousekey.h"
#endif #endif
@ -53,7 +53,7 @@ static void print_version(void);
static void print_status(void); static void print_status(void);
static bool command_console(uint8_t code); static bool command_console(uint8_t code);
static void command_console_help(void); static void command_console_help(void);
#if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) #if defined(MOUSEKEY_ENABLE)
static bool mousekey_console(uint8_t code); static bool mousekey_console(uint8_t code);
#endif #endif
@ -73,7 +73,7 @@ bool command_proc(uint8_t code) {
else else
return (command_console_extra(code) || command_console(code)); return (command_console_extra(code) || command_console(code));
break; break;
#if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED) #if defined(MOUSEKEY_ENABLE)
case MOUSEKEY: case MOUSEKEY:
mousekey_console(code); mousekey_console(code);
break; break;