summaryrefslogtreecommitdiffstats
path: root/tmk_core
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-09-19 07:21:25 +0200
committerGitHub <noreply@github.com>2016-09-19 07:21:25 +0200
commitc678676e415c20d78ee3e026a96a2d5c4853c250 (patch)
treea1751dd35d225e55cf255d08870fa6e779d9bab3 /tmk_core
parent6282fc8dc11a04dde5e340491ad42c99a161897c (diff)
parentbbf06d516a2946816e2ad53798dac7ee901ad25b (diff)
downloadqmk_firmware-c678676e415c20d78ee3e026a96a2d5c4853c250.tar.gz
qmk_firmware-c678676e415c20d78ee3e026a96a2d5c4853c250.tar.xz
Merge pull request #755 from IBNobody/master
Fix USER PRINT/NO PRINT warning w/ Bootmagic
Diffstat (limited to 'tmk_core')
-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");