X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=common%2Fcommand.c;h=82f647c8f3e5d4de827a6d724f009da5ea0f3d86;hb=d9f287586635a401b8d6a80614bee6dbebe2f18c;hp=a06e6a00d15128606c3adb5978127bd2eb4f64ad;hpb=9389585d3d16319d5d739eef84f4ff11076235c1;p=max%2Ftmk_keyboard.git
diff --git a/common/command.c b/common/command.c
index a06e6a00..82f647c8 100644
--- a/common/command.c
+++ b/common/command.c
@@ -19,13 +19,16 @@ along with this program. If not, see .
#include
#include "keycode.h"
#include "host.h"
+#include "keymap.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "timer.h"
#include "keyboard.h"
#include "bootloader.h"
+#include "layer_switch.h"
#include "command.h"
+
#ifdef MOUSEKEY_ENABLE
#include "mousekey.h"
#endif
@@ -52,8 +55,7 @@ static void mousekey_console_help(void);
#endif
static uint8_t numkey2num(uint8_t code);
-static void switch_layer(uint8_t layer);
-static void clear_keyboard(void);
+static void switch_default_layer(uint8_t layer);
typedef enum { ONESHOT, CONSOLE, MOUSEKEY } cmdstate_t;
@@ -234,6 +236,7 @@ static bool command_common(uint8_t code)
break;
#ifdef NKRO_ENABLE
case KC_N:
+ clear_keyboard(); //Prevents stuck keys.
keyboard_nkro = !keyboard_nkro;
if (keyboard_nkro)
print("NKRO: enabled\n");
@@ -260,25 +263,16 @@ static bool command_common(uint8_t code)
#endif
break;
#endif
+ case KC_ESC:
+ case KC_GRV:
case KC_0:
- case KC_F10:
- switch_layer(0);
- break;
- case KC_1:
- case KC_F1:
- switch_layer(1);
+ switch_default_layer(0);
break;
- case KC_2:
- case KC_F2:
- switch_layer(2);
- break;
- case KC_3:
- case KC_F3:
- switch_layer(3);
+ case KC_1 ... KC_9:
+ switch_default_layer((code - KC_1) + 1);
break;
- case KC_4:
- case KC_F4:
- switch_layer(4);
+ case KC_F1 ... KC_F12:
+ switch_default_layer((code - KC_F1) + 1);
break;
default:
print("?");
@@ -547,26 +541,14 @@ static uint8_t numkey2num(uint8_t code)
return 0;
}
-static void switch_layer(uint8_t layer)
+static void switch_default_layer(uint8_t layer)
{
print_val_hex8(current_layer);
print_val_hex8(default_layer);
- current_layer = layer;
- default_layer = layer;
print("switch to "); print_val_hex8(layer);
-}
-
-static void clear_keyboard(void)
-{
- host_clear_keys();
- host_clear_mods();
- host_send_keyboard_report();
- host_system_send(0);
- host_consumer_send(0);
-
-#ifdef MOUSEKEY_ENABLE
- mousekey_clear();
- mousekey_send();
-#endif
+ default_layer = layer;
+ current_layer = 0; /* 0 means default_layer */
+ layer_switch_clear();
+ clear_keyboard();
}