localhots/qmk_firmware
1
0
Fork 0
Code Releases Activity

bootmagic somehow not getting enabled, so adding eeconfig to backlight src include cond

Browse Source
This commit is contained in:
Jack Humbert 2016-04-14 23:53:35 -04:00
parent 2597fb7c50
commit 43a4ffc259
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keyboard/planck/Makefile
View File

@ -107,6 +107,10 @@ endif
SRC := $(KEYMAP_FILE) $(SRC) SRC := $(KEYMAP_FILE) $(SRC)
ifeq ($(BACKLIGHT_ENABLE), yes)
SRC := backlight.c $(SRC)
endif
CONFIG_H = config.h CONFIG_H = config.h
# MCU name # MCU name
@ -126,7 +130,6 @@ MCU = atmega32u4
# software delays. # software delays.
F_CPU = 16000000 F_CPU = 16000000
# #
# LUFA specific # LUFA specific
# #
@ -158,12 +161,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# USBaspLoader 2048 # USBaspLoader 2048
OPT_DEFS += -DBOOTLOADER_SIZE=4096 OPT_DEFS += -DBOOTLOADER_SIZE=4096
ifeq ($(BACKLIGHT_ENABLE), yes)
SRC += backlight.c
endif
# Optimize size but this may cause error "relocation truncated to fit" # Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax #EXTRALDFLAGS = -Wl,--relax

3
keyboard/planck/keymaps/default/keymap.c
View File

@ -2,9 +2,6 @@
// this is the style you want to emulate. // this is the style you want to emulate.
#include "planck.h" #include "planck.h"
#ifdef BACKLIGHT_ENABLE
#include "backlight.h"
#endif
#include "action_layer.h" #include "action_layer.h"
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
#include "audio.h" #include "audio.h"

1
tmk_core/common.mk
View File

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