diff options
| author | tmk <nobody@nowhere> | 2013-11-21 13:00:08 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-11-21 13:00:08 +0900 |
| commit | a9c3f4750b3d703b8bbbc90db2566afd2aab0ec9 (patch) | |
| tree | fdc02b6f2d5a64ef1d25566084081329a004b023 | |
| parent | ccbc1dd8e74e89624b6ac4ce6cf474ce6e9fc7ed (diff) | |
Configure PS/2 mouse build options to onekey
| -rw-r--r-- | keyboard/onekey/Makefile.lufa | 2 | ||||
| -rw-r--r-- | keyboard/onekey/Makefile.pjrc | 4 | ||||
| -rw-r--r-- | keyboard/onekey/config.h | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/keyboard/onekey/Makefile.lufa b/keyboard/onekey/Makefile.lufa index 2a97aa63a8..60a84ba00d 100644 --- a/keyboard/onekey/Makefile.lufa +++ b/keyboard/onekey/Makefile.lufa @@ -93,7 +93,7 @@ ARCH = AVR8 F_USB = $(F_CPU) # Interrupt driven control endpoint task(+60) -#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT # Boot Section Size in *bytes* diff --git a/keyboard/onekey/Makefile.pjrc b/keyboard/onekey/Makefile.pjrc index 0f0f709725..24ade33505 100644 --- a/keyboard/onekey/Makefile.pjrc +++ b/keyboard/onekey/Makefile.pjrc @@ -87,8 +87,8 @@ CONSOLE_ENABLE = yes # Console for debug #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 -#PS2_USE_BUSYWAIT = yes # uses primitive reference code +PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support +PS2_USE_BUSYWAIT = yes # uses primitive reference code #PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin #PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened) diff --git a/keyboard/onekey/config.h b/keyboard/onekey/config.h index e99a64850c..1d2e052bf0 100644 --- a/keyboard/onekey/config.h +++ b/keyboard/onekey/config.h @@ -73,7 +73,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define PS2_CLOCK_PORT PORTD # define PS2_CLOCK_PIN PIND # define PS2_CLOCK_DDR DDRD -# define PS2_CLOCK_BIT 1 +# define PS2_CLOCK_BIT 5 # define PS2_DATA_PORT PORTD # define PS2_DATA_PIN PIND # define PS2_DATA_DDR DDRD @@ -81,12 +81,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #endif +/* PS/2 mouse interrupt version */ #ifdef PS2_USE_INT /* uses INT1 for clock line(ATMega32U4) */ #define PS2_CLOCK_PORT PORTD #define PS2_CLOCK_PIN PIND #define PS2_CLOCK_DDR DDRD -#define PS2_CLOCK_BIT 1 +#define PS2_CLOCK_BIT 5 #define PS2_DATA_PORT PORTD #define PS2_DATA_PIN PIND #define PS2_DATA_DDR DDRD @@ -106,6 +107,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #endif +/* PS/2 mouse USART version */ #ifdef PS2_USE_USART #if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) /* XCK for clock line and RXD for data line */ |