summaryrefslogtreecommitdiffstats
path: root/tmk_core/common
diff options
context:
space:
mode:
authorcbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>2016-09-19 17:13:53 +0200
committercbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info>2016-09-19 17:13:53 +0200
commit2c3fcc6c08bf03aef17f7ed74394539187a9c734 (patch)
tree350f2e3317a1c1bce6f8a9a12df732fe4bcb04ef /tmk_core/common
parentcc7604d11670cf3155d53f0019557b249b1192c0 (diff)
parent5f9c2f63ffb2c58db73e67442134be58bfe2c129 (diff)
downloadqmk_firmware-2c3fcc6c08bf03aef17f7ed74394539187a9c734.tar.gz
qmk_firmware-2c3fcc6c08bf03aef17f7ed74394539187a9c734.tar.xz
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/command.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index 54d6117fd..fc5aad5c1 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -261,7 +261,10 @@ static void print_status(void)
#ifdef BOOTMAGIC_ENABLE
static void print_eeconfig(void)
{
-#ifndef NO_PRINT
+
+// Print these variables if NO_PRINT or USER_PRINT are not defined.
+#if !defined(NO_PRINT) && !defined(USER_PRINT)
+
print("default_layer: "); print_dec(eeconfig_read_default_layer()); print("\n");
debug_config_t dc;
@@ -571,7 +574,8 @@ static uint8_t mousekey_param = 0;
static void mousekey_param_print(void)
{
-#ifndef NO_PRINT
+// Print these variables if NO_PRINT or USER_PRINT are not defined.
+#if !defined(NO_PRINT) && !defined(USER_PRINT)
print("\n\t- Values -\n");
print("1: delay(*10ms): "); pdec(mk_delay); print("\n");
print("2: interval(ms): "); pdec(mk_interval); print("\n");