X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=inline;f=tmk_core%2Fcommon%2Fcommand.c;h=54050bd950bb83113b00069a98aa7f04167d0cac;hb=83b90f4b6fe6744cababc153e3fee5ed42ee4322;hp=d59bb01bbcbd9151430fdf79444a84636a5cd9c9;hpb=77afc5a76f5d299d606ab5b6d870a40aee9cb0e3;p=max%2Ftmk_keyboard.git
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index d59bb01b..54050bd9 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -16,7 +16,7 @@ along with this program. If not, see .
*/
#include
#include
-#include
+#include "wait.h"
#include "keycode.h"
#include "host.h"
#include "keymap.h"
@@ -57,9 +57,10 @@ static void command_console_help(void);
#ifdef MOUSEKEY_ENABLE
static bool mousekey_console(uint8_t code);
static void mousekey_console_help(void);
+static uint8_t numkey2num(uint8_t code);
#endif
-static uint8_t numkey2num(uint8_t code);
+
static void switch_default_layer(uint8_t layer);
@@ -97,12 +98,14 @@ bool command_proc(uint8_t code)
bool command_extra(uint8_t code) __attribute__ ((weak));
bool command_extra(uint8_t code)
{
+ (void)code;
return false;
}
bool command_console_extra(uint8_t code) __attribute__ ((weak));
bool command_console_extra(uint8_t code)
{
+ (void)code;
return false;
}
@@ -178,14 +181,24 @@ static void print_eeconfig(void)
static bool command_common(uint8_t code)
{
+#ifdef KEYBOARD_LOCK_ENABLE
static host_driver_t *host_driver = 0;
+#endif
+#ifdef SLEEP_LED_ENABLE
+ static bool sleep_led_test = false;
+#endif
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());
+ if (sleep_led_test) {
+ sleep_led_disable();
+ led_set(host_keyboard_leds());
+ } else {
+ sleep_led_enable();
+ }
+ sleep_led_test = !sleep_led_test;
break;
#endif
#ifdef BOOTMAGIC_ENABLE
@@ -223,7 +236,7 @@ static bool command_common(uint8_t code)
case KC_PAUSE:
clear_keyboard();
print("\n\nbootloader... ");
- _delay_ms(1000);
+ wait_ms(1000);
bootloader_jump(); // not return
break;
case KC_D:
@@ -271,7 +284,7 @@ static bool command_common(uint8_t code)
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");
+ print("BUILD: " STR(TMK_VERSION) " (" __TIME__ " " __DATE__ ")\n");
/* build options */
print("OPTIONS:"
#ifdef PROTOCOL_PJRC
@@ -283,6 +296,9 @@ static bool command_common(uint8_t code)
#ifdef PROTOCOL_VUSB
" VUSB"
#endif
+#ifdef PROTOCOL_CHIBIOS
+ " CHIBIOS"
+#endif
#ifdef BOOTMAGIC_ENABLE
" BOOTMAGIC"
#endif
@@ -307,8 +323,13 @@ static bool command_common(uint8_t code)
" " STR(BOOTLOADER_SIZE) "\n");
print("GCC: " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__)
+#if defined(__AVR__)
" AVR-LIBC: " __AVR_LIBC_VERSION_STRING__
" AVR_ARCH: avr" STR(__AVR_ARCH__) "\n");
+#elif defined(__arm__)
+ // TODO
+ );
+#endif
break;
case KC_S:
print("\n\t- Status -\n");
@@ -318,7 +339,7 @@ static bool command_common(uint8_t code)
#ifdef NKRO_ENABLE
print_val_hex8(keyboard_nkro);
#endif
- print_val_hex32(timer_count);
+ print_val_hex32(timer_read32());
#ifdef PROTOCOL_PJRC
print_val_hex8(UDCON);
@@ -338,10 +359,11 @@ static bool command_common(uint8_t code)
case KC_N:
clear_keyboard(); //Prevents stuck keys.
keyboard_nkro = !keyboard_nkro;
- if (keyboard_nkro)
+ if (keyboard_nkro) {
print("NKRO: on\n");
- else
+ } else {
print("NKRO: off\n");
+ }
break;
#endif
case KC_ESC:
@@ -595,10 +617,11 @@ static bool mousekey_console(uint8_t code)
print("?");
return false;
}
- if (mousekey_param)
+ if (mousekey_param) {
xprintf("M%d> ", mousekey_param);
- else
+ } else {
print("M>" );
+ }
return true;
}
#endif
@@ -607,6 +630,7 @@ static bool mousekey_console(uint8_t code)
/***********************************************************
* Utilities
***********************************************************/
+#if MOUSEKEY_ENABLE
static uint8_t numkey2num(uint8_t code)
{
switch (code) {
@@ -623,6 +647,7 @@ static uint8_t numkey2num(uint8_t code)
}
return 0;
}
+#endif
static void switch_default_layer(uint8_t layer)
{