X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fcommand.c;h=d2f8eb8320f0f07642201ac10de58cfb31208c07;hb=ac570686b6bde1e5066ea68636ae780392739cb4;hp=dc06c6da35d642d7d5ae42a940dfeed308ae68ac;hpb=c6d88d27956c4b76f8819fcdb076bf94a8f55868;p=max%2Ftmk_keyboard.git
diff --git a/common/command.c b/common/command.c
index dc06c6da..d2f8eb83 100644
--- a/common/command.c
+++ b/common/command.c
@@ -27,10 +27,12 @@ along with this program. If not, see .
#include "keyboard.h"
#include "bootloader.h"
#include "action_layer.h"
+#include "action_util.h"
#include "eeconfig.h"
#include "sleep_led.h"
#include "led.h"
#include "command.h"
+#include "backlight.h"
#ifdef MOUSEKEY_ENABLE
#include "mousekey.h"
@@ -106,11 +108,13 @@ static void command_common_help(void)
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
@@ -125,28 +129,36 @@ static void command_common_help(void)
}
#ifdef BOOTMAGIC_ENABLE
-static void print_eeprom_config(void)
+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;
- 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_default_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");
+
+#ifdef BACKLIGHT_ENABLE
+ backlight_config_t bc;
+ bc.raw = eeconfig_read_backlight();
+ print("backlight_config.raw: "); print_hex8(bc.raw); print("\n");
+ print(".enable: "); print_dec(bc.enable); print("\n");
+ print(".level: "); print_dec(bc.level); print("\n");
+#endif
}
#endif
@@ -154,16 +166,18 @@ 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:
@@ -238,10 +252,48 @@ static bool command_common(uint8_t code)
break;
case KC_V: // print version & information
print("\n\n----- Version -----\n");
- print(STR(DESCRIPTION) "\n");
- print(STR(MANUFACTURER) "(" STR(VENDOR_ID) ")/");
- print(STR(PRODUCT) "(" STR(PRODUCT_ID) ") ");
- print("VERSION: " STR(DEVICE_VER) "\n");
+ print("DESC: " STR(DESCRIPTION) "\n");
+ print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") "
+ "PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") "
+ "VER: " STR(DEVICE_VER) "\n");
+ print("BUILD: " STR(VERSION) " (" __TIME__ " " __DATE__ ")\n");
+ /* build options */
+ print("OPTIONS:"
+#ifdef PROTOCOL_PJRC
+ " PJRC"
+#endif
+#ifdef PROTOCOL_LUFA
+ " LUFA"
+#endif
+#ifdef PROTOCOL_VUSB
+ " VUSB"
+#endif
+#ifdef BOOTMAGIC_ENABLE
+ " BOOTMAGIC"
+#endif
+#ifdef MOUSEKEY_ENABLE
+ " MOUSEKEY"
+#endif
+#ifdef EXTRAKEY_ENABLE
+ " EXTRAKEY"
+#endif
+#ifdef CONSOLE_ENABLE
+ " CONSOLE"
+#endif
+#ifdef COMMAND_ENABLE
+ " COMMAND"
+#endif
+#ifdef NKRO_ENABLE
+ " NKRO"
+#endif
+#ifdef KEYMAP_SECTION_ENABLE
+ " KEYMAP_SECTION"
+#endif
+ " " STR(BOOTLOADER_SIZE) "\n");
+
+ print("GCC: " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__)
+ " AVR-LIBC: " __AVR_LIBC_VERSION_STRING__
+ " AVR_ARCH: avr" STR(__AVR_ARCH__) "\n");
break;
case KC_T: // print timer
print_val_hex32(timer_count);
@@ -249,13 +301,13 @@ static bool command_common(uint8_t code)
case KC_S:
print("\n\n----- Status -----\n");
print_val_hex8(host_keyboard_leds());
+ print_val_hex8(keyboard_protocol);
+ print_val_hex8(keyboard_idle);
#ifdef PROTOCOL_PJRC
print_val_hex8(UDCON);
print_val_hex8(UDIEN);
print_val_hex8(UDINT);
print_val_hex8(usb_keyboard_leds);
- print_val_hex8(usb_keyboard_protocol);
- print_val_hex8(usb_keyboard_idle_config);
print_val_hex8(usb_keyboard_idle_count);
#endif
@@ -574,7 +626,7 @@ static uint8_t numkey2num(uint8_t code)
static void switch_default_layer(uint8_t layer)
{
print("switch_default_layer: "); print_dec(biton32(default_layer_state));
- default_layer_set(layer);
- print(" to "); print_dec(biton32(default_layer_state)); print("\n");
+ print(" to "); print_dec(layer); print("\n");
+ default_layer_set(1UL<