diff options
| author | tmk <nobody@nowhere> | 2013-03-09 22:23:32 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-03-09 22:23:32 +0900 |
| commit | 1385058fc21f80347c7afd2b818e38795ce9d55a (patch) | |
| tree | 976ede371f981edd1a84c91b07738e22bf083144 | |
| parent | 4d64fd8faa8b1a0ceb9019446ba6915aaf1812ea (diff) | |
| download | firmware-1385058fc21f80347c7afd2b818e38795ce9d55a.tar.gz firmware-1385058fc21f80347c7afd2b818e38795ce9d55a.tar.bz2 firmware-1385058fc21f80347c7afd2b818e38795ce9d55a.zip | |
Fix gh60/matrix.c and Makefile
| -rw-r--r-- | keyboard/gh60/Makefile.lufa | 9 | ||||
| -rw-r--r-- | keyboard/gh60/Makefile.pjrc | 13 | ||||
| -rw-r--r-- | keyboard/gh60/matrix.c | 2 |
3 files changed, 16 insertions, 8 deletions
diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa index 7a8303296..65b6240ef 100644 --- a/keyboard/gh60/Makefile.lufa +++ b/keyboard/gh60/Makefile.lufa @@ -93,13 +93,16 @@ ARCH = AVR8 # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. F_USB = $(F_CPU) +# Interrupt driven control endpoint task(+60) +#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + # Build Options # comment out to disable the options. # -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug +MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +EXTRAKEY_ENABLE = yes # Audio control and System control(+450) +CONSOLE_ENABLE = yes # Console for debug(+400) #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc index af6ef63ec..2538c0c6b 100644 --- a/keyboard/gh60/Makefile.pjrc +++ b/keyboard/gh60/Makefile.pjrc @@ -70,15 +70,20 @@ MCU = atmega32u4 # Teensy 2.0 # 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. # -MOUSEKEY_ENABLE = yes # Mouse keys -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -EXTRAKEY_ENABLE = yes # Audio control and System control -NKRO_ENABLE = yes # USB Nkey Rollover +MOUSEKEY_ENABLE = yes # Mouse keys(+5000) +EXTRAKEY_ENABLE = yes # Audio control and System control(+600) +NKRO_ENABLE = yes # USB Nkey Rollover(+500) CONSOLE_ENABLE = yes # Console for debug +#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support # Search Path diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c index 85e58fe36..09a051aa6 100644 --- a/keyboard/gh60/matrix.c +++ b/keyboard/gh60/matrix.c @@ -120,7 +120,7 @@ bool matrix_has_ghost(void) inline bool matrix_is_on(uint8_t row, uint8_t col) { - return (matrix[row] & (1<<col)); + return (matrix[row] & ((matrix_row_t)1<<col)); } inline |