X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fcommand.c;h=7bb2a23f1909ec21629aa375303f7c43fb24670a;hb=6215727b0bd827a18456b21a26d6175abe365ada;hp=85cc05733a4a8dce5b5157ab5e16117ae4e2fbc9;hpb=ad24858e4fec8bb9af9d89ebf42cda3fffcfdff5;p=max%2Ftmk_keyboard.git
diff --git a/common/command.c b/common/command.c
index 85cc0573..7bb2a23f 100644
--- a/common/command.c
+++ b/common/command.c
@@ -19,6 +19,7 @@ along with this program. If not, see .
#include
#include "keycode.h"
#include "host.h"
+#include "keymap.h"
#include "print.h"
#include "debug.h"
#include "util.h"
@@ -53,7 +54,6 @@ static void mousekey_console_help(void);
static uint8_t numkey2num(uint8_t code);
static void switch_layer(uint8_t layer);
-static void clear_keyboard(void);
typedef enum { ONESHOT, CONSOLE, MOUSEKEY } cmdstate_t;
@@ -164,9 +164,6 @@ static bool command_common(uint8_t code)
debug_enable = false;
} else {
print("\nDEBUG: enabled.\n");
- debug_matrix = true;
- debug_keyboard = true;
- debug_mouse = true;
debug_enable = true;
}
break;
@@ -205,7 +202,7 @@ static bool command_common(uint8_t code)
print("VERSION: " STR(DEVICE_VER) "\n");
break;
case KC_T: // print timer
- pv_hex32(timer_count);
+ print_val_hex32(timer_count);
break;
case KC_P: // print toggle
if (print_enable) {
@@ -218,25 +215,26 @@ static bool command_common(uint8_t code)
break;
case KC_S:
print("\n\n----- Status -----\n");
- pv_hex8(host_keyboard_leds());
+ print_val_hex8(host_keyboard_leds());
#ifdef HOST_PJRC
- pv_hex8(UDCON);
- pv_hex8(UDIEN);
- pv_hex8(UDINT);
- pv_hex8(usb_keyboard_leds);
- pv_hex8(usb_keyboard_protocol);
- pv_hex8(usb_keyboard_idle_config);
- pv_hex8(usb_keyboard_idle_count);
+ 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
#ifdef HOST_VUSB
# if USB_COUNT_SOF
- pv_hex8(usbSofCount);
+ print_val_hex8(usbSofCount);
# endif
#endif
break;
#ifdef NKRO_ENABLE
case KC_N:
+ clear_keyboard(); //Prevents stuck keys.
keyboard_nkro = !keyboard_nkro;
if (keyboard_nkro)
print("NKRO: enabled\n");
@@ -265,23 +263,16 @@ static bool command_common(uint8_t code)
#endif
case KC_0:
case KC_F10:
+ clear_keyboard();
switch_layer(0);
break;
- case KC_1:
- case KC_F1:
- switch_layer(1);
- break;
- case KC_2:
- case KC_F2:
- switch_layer(2);
- break;
- case KC_3:
- case KC_F3:
- switch_layer(3);
+ case KC_1 ... KC_9:
+ clear_keyboard();
+ switch_layer((code - KC_1) + 1);
break;
- case KC_4:
- case KC_F4:
- switch_layer(4);
+ case KC_F1 ... KC_F9:
+ clear_keyboard();
+ switch_layer((code - KC_F1) + 1);
break;
default:
print("?");
@@ -350,7 +341,7 @@ static void mousekey_param_print(void)
print("6: mk_wheel_time_to_max: "); pdec(mk_wheel_time_to_max); print("\n");
}
-#define PRINT_SET_VAL(v) print(#v " = "); print_dec8(v); print("\n");
+#define PRINT_SET_VAL(v) print(#v " = "); print_dec(v); print("\n");
static void mousekey_param_inc(uint8_t param, uint8_t inc)
{
switch (param) {
@@ -552,24 +543,9 @@ static uint8_t numkey2num(uint8_t code)
static void switch_layer(uint8_t layer)
{
- pv_hex8(current_layer);
- pv_hex8(default_layer);
+ print_val_hex8(current_layer);
+ print_val_hex8(default_layer);
current_layer = layer;
default_layer = layer;
- print("switch to "); pv_hex8(layer);
-}
-
-static void clear_keyboard(void)
-{
- host_clear_keys();
- host_clear_mods();
- host_send_keyboard_report();
-
- host_system_send(0);
- host_consumer_send(0);
-
-#ifdef MOUSEKEY_ENABLE
- mousekey_clear();
- mousekey_send();
-#endif
+ print("switch to "); print_val_hex8(layer);
}