tmk
11 years ago
3 changed files with 16 additions and 8 deletions
+ 6
- 3
keyboard/gh60/Makefile.lufa
View File
| @@ -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 | |||
+ 9
- 4
keyboard/gh60/Makefile.pjrc
View File
| @@ -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 | |||
+ 1
- 1
keyboard/gh60/matrix.c
View File
| @@ -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 | |||
Loading…