~ruther/qmk_firmware

cb1ac2a3edf637a3e2ecb53f0627212d1f5abb08 — IBNobody 9 years ago e9a0934
Fixed NO_PRINT / USER_PRINT conflict warning.
2 files changed, 7 insertions(+), 3 deletions(-)

M keyboards/atomic/keymaps/pvc/Makefile
M tmk_core/common/command.c
M keyboards/atomic/keymaps/pvc/Makefile => keyboards/atomic/keymaps/pvc/Makefile +1 -1
@@ 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)

M tmk_core/common/command.c => tmk_core/common/command.c +6 -2
@@ 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");