diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-14 23:53:35 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-14 23:53:35 -0400 |
| commit | 43a4ffc25971b2aea94b65ca1db66371e653ec5f (patch) | |
| tree | 08d1b15e8370574c8893b711d007e6f888a5f103 /keyboard/planck | |
| parent | 2597fb7c508cf36704291cd48b2c752dd21f2b0d (diff) | |
| download | qmk_firmware-43a4ffc25971b2aea94b65ca1db66371e653ec5f.tar.gz qmk_firmware-43a4ffc25971b2aea94b65ca1db66371e653ec5f.zip | |
bootmagic somehow not getting enabled, so adding eeconfig to backlight src include cond
Diffstat (limited to 'keyboard/planck')
| -rw-r--r-- | keyboard/planck/Makefile | 11 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/default/keymap.c | 3 |
2 files changed, 4 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 | |||
| 107 | 107 | ||
| 108 | SRC := $(KEYMAP_FILE) $(SRC) | 108 | SRC := $(KEYMAP_FILE) $(SRC) |
| 109 | 109 | ||
| 110 | ifeq ($(BACKLIGHT_ENABLE), yes) | ||
| 111 | SRC := backlight.c $(SRC) | ||
| 112 | endif | ||
| 113 | |||
| 110 | CONFIG_H = config.h | 114 | CONFIG_H = config.h |
| 111 | 115 | ||
| 112 | # MCU name | 116 | # MCU name |
| @@ -126,7 +130,6 @@ MCU = atmega32u4 | |||
| 126 | # software delays. | 130 | # software delays. |
| 127 | F_CPU = 16000000 | 131 | F_CPU = 16000000 |
| 128 | 132 | ||
| 129 | |||
| 130 | # | 133 | # |
| 131 | # LUFA specific | 134 | # LUFA specific |
| 132 | # | 135 | # |
| @@ -158,12 +161,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
| 158 | # USBaspLoader 2048 | 161 | # USBaspLoader 2048 |
| 159 | OPT_DEFS += -DBOOTLOADER_SIZE=4096 | 162 | OPT_DEFS += -DBOOTLOADER_SIZE=4096 |
| 160 | 163 | ||
| 161 | |||
| 162 | ifeq ($(BACKLIGHT_ENABLE), yes) | ||
| 163 | SRC += backlight.c | ||
| 164 | endif | ||
| 165 | |||
| 166 | |||
| 167 | # Optimize size but this may cause error "relocation truncated to fit" | 164 | # Optimize size but this may cause error "relocation truncated to fit" |
| 168 | #EXTRALDFLAGS = -Wl,--relax | 165 | #EXTRALDFLAGS = -Wl,--relax |
| 169 | 166 | ||
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 @@ | |||
| 2 | // this is the style you want to emulate. | 2 | // this is the style you want to emulate. |
| 3 | 3 | ||
| 4 | #include "planck.h" | 4 | #include "planck.h" |
| 5 | #ifdef BACKLIGHT_ENABLE | ||
| 6 | #include "backlight.h" | ||
| 7 | #endif | ||
| 8 | #include "action_layer.h" | 5 | #include "action_layer.h" |
| 9 | #ifdef AUDIO_ENABLE | 6 | #ifdef AUDIO_ENABLE |
| 10 | #include "audio.h" | 7 | #include "audio.h" |
