diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-01-23 20:32:51 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-01-23 20:32:51 -0500 |
| commit | c753bfcc144e4158a1e683c2c93b32667dc08388 (patch) | |
| tree | 25d405cd0afe4810965f5edeaec86c0d1eb4170e /keyboard/ergodox_ez/Makefile | |
| parent | eb61700912f1713ba27d34c23d7f07be66ee6513 (diff) | |
| parent | e5aee62e54d0b6f02ff170f4e9bf1e738d36fb4c (diff) | |
| download | qmk_firmware-c753bfcc144e4158a1e683c2c93b32667dc08388.tar.gz qmk_firmware-c753bfcc144e4158a1e683c2c93b32667dc08388.zip | |
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into audio
Diffstat (limited to 'keyboard/ergodox_ez/Makefile')
| -rw-r--r-- | keyboard/ergodox_ez/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/keyboard/ergodox_ez/Makefile b/keyboard/ergodox_ez/Makefile index 3b70258402..8066c7bb4b 100644 --- a/keyboard/ergodox_ez/Makefile +++ b/keyboard/ergodox_ez/Makefile @@ -31,15 +31,14 @@ SRC = ergodox_ez.c \ matrix.c ifdef KEYMAP - SRC := keymaps/keymap_$(KEYMAP).c $(SRC) + SRC := keymaps/$(KEYMAP)/keymap.c $(SRC) else - SRC := keymaps/keymap_default.c $(SRC) + SRC := keymaps/default/keymap.c $(SRC) endif CONFIG_H = config.h # MCU name -#MCU = at90usb1287 MCU = atmega32u4 # Processor frequency. @@ -94,13 +93,13 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512 BOOTMAGIC_ENABLE = yes # 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) +CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration CUSTOM_MATRIX = yes # Custom matrix file for the ErgoDox EZ SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work # MIDI_ENABLE = yes # MIDI controls -# uNICODE_ENABLE = yes # Unicode +# UNICODE_ENABLE = yes # Unicode # Optimize size but this may cause error "relocation truncated to fit" |