Merge branch 'master' into chibios

diff --cc tmk_core/common/command.c
index 8fb6db5638c3bee4bbbc5b853366a8e8a32f9b5b,d59bb01bbcbd9151430fdf79444a84636a5cd9c9..4ef0b077d6e63ce594ec69d7078088b5a7332f4e
--- 1/tmk_core/common/command.c
--- 2/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@@ -327,7 -315,10 +327,10 @@@ static bool command_common(uint8_t code
              print_val_hex8(host_keyboard_leds());
              print_val_hex8(keyboard_protocol);
              print_val_hex8(keyboard_idle);
 -            print_val_hex32(timer_count);
+ #ifdef NKRO_ENABLE
+             print_val_hex8(keyboard_nkro);
+ #endif
 +            print_val_hex32(timer_read32());
  
  #ifdef PROTOCOL_PJRC
              print_val_hex8(UDCON);

diff --cc tmk_core/common/keymap.c
Simple merge