Merge branch 'layer_stack'

[tmk_firmware.git] / common / command.c

diff --git a/common/command.c b/common/command.c
index 6d4e4c642dbc34df5f70c4a3032c7784b0633867..c5b9f0431c9a0a6f4defb25b533f97d9ea0020cd 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -27,6 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keyboard.h"
 #include "bootloader.h"
 #include "command.h"
+#include "layer_stack.h"
+
 #ifdef MOUSEKEY_ENABLE
 #include "mousekey.h"
 #endif
@@ -53,7 +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 switch_default_layer(uint8_t layer);
 
 
 typedef enum { ONESHOT, CONSOLE, MOUSEKEY } cmdstate_t;
@@ -261,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);
+        case KC_1 ... KC_9:
+            switch_default_layer((code - KC_1) + 1);
             break;
-        case KC_3:
-        case KC_F3:
-            switch_layer(3);
-            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("?");
@@ -548,11 +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);
+
+    default_layer = layer;
+    current_layer = 0;  /* 0 means default_layer */
+    layer_stack_clear();
+    clear_keyboard();
 }