diff options
| author | IBNobody <ibnobody@gmail.com> | 2016-09-13 03:20:31 +0200 |
|---|---|---|
| committer | IBNobody <ibnobody@gmail.com> | 2016-09-13 03:20:31 +0200 |
| commit | cb1ac2a3edf637a3e2ecb53f0627212d1f5abb08 (patch) | |
| tree | bb2632801e4459b5d8bd21f5e110b70d902990b8 | |
| parent | e9a093451ea13b18b5dc60d427244efeba593da5 (diff) | |
| download | qmk_firmware-cb1ac2a3edf637a3e2ecb53f0627212d1f5abb08.tar.gz qmk_firmware-cb1ac2a3edf637a3e2ecb53f0627212d1f5abb08.tar.xz | |
Fixed NO_PRINT / USER_PRINT conflict warning.
| -rw-r--r-- | keyboards/atomic/keymaps/pvc/Makefile | 2 | ||||
| -rw-r--r-- | tmk_core/common/command.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/keyboards/atomic/keymaps/pvc/Makefile b/keyboards/atomic/keymaps/pvc/Makefile index ebd75e313..c7c04485f 100644 --- a/keyboards/atomic/keymaps/pvc/Makefile +++ b/keyboards/atomic/keymaps/pvc/Makefile @@ -1,4 +1,4 @@ -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) 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"); |