X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Fcommand.c;h=74b7c5ebcf50fad5e89fc0e5732396e8dc7cb3c1;hb=bf3a23b30645e98b9999b6c5cd6f29044a13821f;hp=d7ba3f232a31a60ed94d5a971b9601d09fe4bbce;hpb=e4fbaf30be00d73a3fab2aee24c7a522a0ecdd31;p=tmk_firmware.git

diff --git a/common/command.c b/common/command.c
index d7ba3f2..74b7c5e 100644
--- a/common/command.c
+++ b/common/command.c
@@ -26,8 +26,10 @@ 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 "action_layer.h"
 #include "eeconfig.h"
+#include "sleep_led.h"
+#include "led.h"
 #include "command.h"
 
 #ifdef MOUSEKEY_ENABLE
@@ -98,18 +100,19 @@ bool command_extra(uint8_t code)
  ***********************************************************/
 static void command_common_help(void)
 {
-    print_enable = true;
     print("\n\n----- Command Help -----\n");
     print("c:	enter console mode\n");
     print("d:	toggle debug enable\n");
     print("x:	toggle matrix debug\n");
     print("k:	toggle keyboard debug\n");
     print("m:	toggle mouse debug\n");
-    print("p:	toggle print enable\n");
+#ifdef SLEEP_LED_ENABLE
+    print("z:	toggle sleep LED test\n");
+#endif
     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");
+    print("e:	print eeprom config\n");
 #ifdef NKRO_ENABLE
     print("n:	toggle NKRO\n");
 #endif
@@ -123,37 +126,50 @@ static void command_common_help(void)
     print("Paus:	jump to bootloader\n");
 }
 
-static void print_eeprom_config(void)
+#ifdef BOOTMAGIC_ENABLE
+static void print_eeconfig(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_keyconf();
-    print("keyconf: "); print_hex8(eebyte); print("\n");
-
-    keyconf kc = (keyconf){ .raw = eebyte };
-    print("keyconf.swap_control_capslock: "); print_hex8(kc.swap_control_capslock); print("\n");
-    print("keyconf.capslock_to_control: "); print_hex8(kc.capslock_to_control); print("\n");
-    print("keyconf.swap_lalt_lgui: "); print_hex8(kc.swap_lalt_lgui); print("\n");
-    print("keyconf.swap_ralt_rgui: "); print_hex8(kc.swap_ralt_rgui); print("\n");
-    print("keyconf.no_gui: "); print_hex8(kc.no_gui); print("\n");
-    print("keyconf.swap_grave_esc: "); print_hex8(kc.swap_grave_esc); print("\n");
-    print("keyconf.swap_backslash_backspace: "); print_hex8(kc.swap_backslash_backspace); print("\n");
+    print("default_layer: "); print_dec(eeconfig_read_defalt_layer()); print("\n");
+
+    debug_config_t dc;
+    dc.raw = eeconfig_read_debug();
+    print("debug_config.raw: "); print_hex8(dc.raw); print("\n");
+    print(".enable: "); print_dec(dc.enable); print("\n");
+    print(".matrix: "); print_dec(dc.matrix); print("\n");
+    print(".keyboard: "); print_dec(dc.keyboard); print("\n");
+    print(".mouse: "); print_dec(dc.mouse); print("\n");
+
+    keymap_config_t kc;
+    kc.raw = eeconfig_read_keymap();
+    print("keymap_config.raw: "); print_hex8(kc.raw); print("\n");
+    print(".swap_control_capslock: "); print_dec(kc.swap_control_capslock); print("\n");
+    print(".capslock_to_control: "); print_dec(kc.capslock_to_control); print("\n");
+    print(".swap_lalt_lgui: "); print_dec(kc.swap_lalt_lgui); print("\n");
+    print(".swap_ralt_rgui: "); print_dec(kc.swap_ralt_rgui); print("\n");
+    print(".no_gui: "); print_dec(kc.no_gui); print("\n");
+    print(".swap_grave_esc: "); print_dec(kc.swap_grave_esc); print("\n");
+    print(".swap_backslash_backspace: "); print_dec(kc.swap_backslash_backspace); print("\n");
 }
+#endif
 
 static bool command_common(uint8_t code)
 {
     static host_driver_t *host_driver = 0;
     switch (code) {
+#ifdef SLEEP_LED_ENABLE
+        case KC_Z:
+            // test breathing sleep LED
+            print("Sleep LED test\n");
+            sleep_led_toggle();
+            led_set(host_keyboard_leds());
+            break;
+#endif
+#ifdef BOOTMAGIC_ENABLE
         case KC_E:
-            print("eeprom config\n");
-            print_eeprom_config();
+            print("eeconfig:\n");
+            print_eeconfig();
             break;
+#endif
         case KC_CAPSLOCK:
             if (host_get_driver()) {
                 host_driver = host_get_driver();
@@ -169,7 +185,6 @@ static bool command_common(uint8_t code)
             command_common_help();
             break;
         case KC_C:
-            print_enable = true;
             debug_matrix   = false;
             debug_keyboard = false;
             debug_mouse    = false;
@@ -235,15 +250,6 @@ static bool command_common(uint8_t code)
         case KC_T: // print timer
             print_val_hex32(timer_count);
             break;
-        case KC_P: // print toggle
-            if (print_enable) {
-                print("print disabled.\n");
-                print_enable = false;
-            } else {
-                print_enable = true;
-                print("print enabled.\n");
-            }
-            break;
         case KC_S:
             print("\n\n----- Status -----\n");
             print_val_hex8(host_keyboard_leds());
@@ -316,7 +322,6 @@ static bool command_common(uint8_t code)
  ***********************************************************/
 static void command_console_help(void)
 {
-    print_enable = true;
     print("\n\n----- Console Help -----\n");
     print("ESC/q:	quit\n");
 #ifdef MOUSEKEY_ENABLE
@@ -572,8 +577,8 @@ static uint8_t numkey2num(uint8_t code)
 
 static void switch_default_layer(uint8_t layer)
 {
-    print("switch_default_layer: "); print_dec(default_layer); print(" to "); print_dec(layer); print("\n");
+    print("switch_default_layer: "); print_dec(biton32(default_layer_state));
+    print(" to "); print_dec(layer); print("\n");
     default_layer_set(layer);
-    overlay_clear();
     clear_keyboard();
 }