diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-15 05:53:35 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-15 05:53:35 +0200 |
| commit | 43a4ffc25971b2aea94b65ca1db66371e653ec5f (patch) | |
| tree | 08d1b15e8370574c8893b711d007e6f888a5f103 | |
| parent | 2597fb7c508cf36704291cd48b2c752dd21f2b0d (diff) | |
| download | qmk_firmware-43a4ffc25971b2aea94b65ca1db66371e653ec5f.tar.gz qmk_firmware-43a4ffc25971b2aea94b65ca1db66371e653ec5f.tar.xz | |
bootmagic somehow not getting enabled, so adding eeconfig to backlight src include cond
| -rw-r--r-- | keyboard/planck/Makefile | 11 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/default/keymap.c | 3 | ||||
| -rw-r--r-- | tmk_core/common.mk | 1 |
3 files changed, 5 insertions, 10 deletions
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index dc6e46df2..693e9c8aa 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -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 diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c index 97ba5d285..151a6b4f4 100644 --- a/keyboard/planck/keymaps/default/keymap.c +++ b/keyboard/planck/keymaps/default/keymap.c @@ -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" diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 8d028d52a..030767cc3 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -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 |