From: flabbergast <s3+flabbergast@sdfeu.org>
Date: Mon, 12 Oct 2015 05:55:37 +0000 (+0100)
Subject: Merge branch 'master' into chibios
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=b388269407881b101c13cbeef68f84b714aa9dc9;p=max%2Ftmk_keyboard.git

Merge branch 'master' into chibios
---

b388269407881b101c13cbeef68f84b714aa9dc9
diff --cc tmk_core/common/command.c
index 8fb6db56,d59bb01b..4ef0b077
--- a/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);
+ #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);