diff options
| author | tmk <nobody@nowhere> | 2013-03-27 15:23:57 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-03-27 15:23:57 +0900 |
| commit | 969cc4f812e3f86213f97adf340e3c7160fc639e (patch) | |
| tree | ad3719c0dd8cce043c235fd2d7e30c8bcd65f7af /keyboard | |
| parent | 1f19176867b1b1f760c0ec41cd78fbb6832d29ad (diff) | |
| parent | ac509aa079bb090017886b5d7e32240ef16a1196 (diff) | |
| download | qmk_firmware-969cc4f812e3f86213f97adf340e3c7160fc639e.tar.gz qmk_firmware-969cc4f812e3f86213f97adf340e3c7160fc639e.zip | |
Merge branch 'suspend_fix'
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/gh60/Makefile.lufa | 9 | ||||
| -rw-r--r-- | keyboard/gh60/Makefile.pjrc | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa index f153bc311d..278f966def 100644 --- a/keyboard/gh60/Makefile.lufa +++ b/keyboard/gh60/Makefile.lufa @@ -48,7 +48,7 @@ TOP_DIR = ../.. TARGET_DIR = . # project specific files -SRC += keymap.c \ +SRC = keymap.c \ matrix.c \ led.c @@ -96,6 +96,13 @@ F_USB = $(F_CPU) #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT +# Boot Section Size in bytes +# Teensy halfKay 512 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +OPT_DEFS += -DBOOT_SIZE=4096 + + # Build Options # comment out to disable the options. # diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc index 290f7cb877..c12334fcaf 100644 --- a/keyboard/gh60/Makefile.pjrc +++ b/keyboard/gh60/Makefile.pjrc @@ -68,12 +68,14 @@ MCU = atmega32u4 # examples use this variable to calculate timings. Do not add a "UL" here. F_CPU = 16000000 + # Boot Section Size in bytes # Teensy halfKay 512 # Atmel DFU loader 4096 # LUFA bootloader 4096 OPT_DEFS += -DBOOT_SIZE=4096 + # Build Options # comment out to disable the options. # @@ -82,6 +84,7 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+5000) EXTRAKEY_ENABLE = yes # Audio control and System control(+600) CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration +SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover(+500) #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support |