Add bootmagic.c and fix bootloader_jump

[tmk_firmware.git] / common / command.c

diff --git a/common/command.c b/common/command.c
index c5b9f0431c9a0a6f4defb25b533f97d9ea0020cd..b82d1884cec5648a5d81c275080b661716fb04d1 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -26,8 +26,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "timer.h"
 #include "keyboard.h"
 #include "bootloader.h"
+#include "layer_switch.h"
+#include "eeconfig.h"
 #include "command.h"
-#include "layer_stack.h"
 
 #ifdef MOUSEKEY_ENABLE
 #include "mousekey.h"
@@ -108,6 +109,7 @@ static void command_common_help(void)
     print("v:  print device version & info\n");
     print("t:  print timer count\n");
     print("s:  print status\n");
+    print("e:  print eeprom boot config\n");
 #ifdef NKRO_ENABLE
     print("n:  toggle NKRO\n");
 #endif
@@ -121,10 +123,28 @@ static void command_common_help(void)
     print("Paus:       jump to bootloader\n");
 }
 
+static void print_eeprom_config(void)
+{
+    uint8_t eebyte;
+    
+    eebyte = eeconfig_read_debug();
+    print("debug: "); print_hex8(eebyte); print("\n");
+
+    eebyte = eeconfig_read_defalt_layer();
+    print("defalt_layer: "); print_hex8(eebyte); print("\n");
+
+    eebyte = eeconfig_read_modifier();
+    print("modifiers: "); print_hex8(eebyte); print("\n");
+}
+
 static bool command_common(uint8_t code)
 {
     static host_driver_t *host_driver = 0;
     switch (code) {
+        case KC_E:
+            print("eeprom config\n");
+            print_eeprom_config();
+            break;
         case KC_CAPSLOCK:
             if (host_get_driver()) {
                 host_driver = host_get_driver();
@@ -543,12 +563,8 @@ static uint8_t numkey2num(uint8_t code)
 
 static void switch_default_layer(uint8_t layer)
 {
-    print_val_hex8(current_layer);
-    print_val_hex8(default_layer);
-    print("switch to "); print_val_hex8(layer);
-
-    default_layer = layer;
-    current_layer = 0;  /* 0 means default_layer */
-    layer_stack_clear();
+    print("switch_default_layer: "); print_dec(default_layer); print(" to "); print_dec(layer); print("\n");
+    default_layer_set(layer);
+    overlay_clear();
     clear_keyboard();
 }