~ruther/qmk_firmware

43a4ffc25971b2aea94b65ca1db66371e653ec5f — Jack Humbert 9 years ago 2597fb7
bootmagic somehow not getting enabled, so adding eeconfig to backlight src include cond
3 files changed, 5 insertions(+), 10 deletions(-)

M keyboard/planck/Makefile
M keyboard/planck/keymaps/default/keymap.c
M tmk_core/common.mk
M keyboard/planck/Makefile => keyboard/planck/Makefile +4 -7
@@ 107,6 107,10 @@ endif

SRC := $(KEYMAP_FILE) $(SRC)

ifeq ($(BACKLIGHT_ENABLE), yes)
	SRC := backlight.c $(SRC)
endif

CONFIG_H = config.h

# MCU name


@@ 126,7 130,6 @@ MCU = atmega32u4
#     software delays.
F_CPU = 16000000


#
# LUFA specific
#


@@ 158,12 161,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
#   USBaspLoader     2048
OPT_DEFS += -DBOOTLOADER_SIZE=4096


ifeq ($(BACKLIGHT_ENABLE), yes)
	SRC += backlight.c
endif


# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax


M keyboard/planck/keymaps/default/keymap.c => keyboard/planck/keymaps/default/keymap.c +0 -3
@@ 2,9 2,6 @@
// this is the style you want to emulate.

#include "planck.h"
#ifdef BACKLIGHT_ENABLE
  #include "backlight.h"
#endif
#include "action_layer.h"
#ifdef AUDIO_ENABLE
  #include "audio.h"

M tmk_core/common.mk => tmk_core/common.mk +1 -0
@@ 69,6 69,7 @@ endif

ifeq ($(BACKLIGHT_ENABLE), yes)
    SRC += $(COMMON_DIR)/backlight.c
    SRC += $(COMMON_DIR)/avr/eeconfig.c
    OPT_DEFS += -DBACKLIGHT_ENABLE
endif