merge upstream

This commit is contained in:
coderkun
2016-01-15 20:19:45 +01:00
parent 57bf227f6d
commit bd9aebc84a
16 changed files with 3838 additions and 2460 deletions
+2 -2
View File
@@ -94,13 +94,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"