Merge branch 'serial-mouse' of git://github.com/rhaberkorn/tmk_keyboard into rhaberko...

[max/tmk_keyboard.git] / converter / ps2_usb / Makefile

diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile
index 04bf28a00c5c995c020654a9ce3d71502089fd73..f20039c6f07c9f70b8f2a896166700f227b63cd8 100644 (file)
--- a/converter/ps2_usb/Makefile
+++ b/converter/ps2_usb/Makefile
@@ -1,3 +1,6 @@
+# 
+# Makefile for Teensy
+#
 # Target file name (without extension).
 TARGET = ps2_usb_lufa
 
@@ -59,7 +62,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*
@@ -68,7 +71,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
 #   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
+OPT_DEFS += -DBOOTLOADER_SIZE=512
 
 
 # Build Options
@@ -84,10 +87,23 @@ NKRO_ENABLE = yes   # USB Nkey Rollover - not yet supported in LUFA
 
 # PS/2 Options
 #
-#PS2_USE_USART = yes   # uses hardware USART engine for PS/2 signal receive(recomened)
+PS2_USE_USART = yes    # uses hardware USART engine for PS/2 signal receive(recomened)
 #PS2_USE_INT = yes     # uses external interrupt for falling edge of PS/2 clock pin
-PS2_USE_BUSYWAIT = yes # uses primitive reference code
+#PS2_USE_BUSYWAIT = yes        # uses primitive reference code
 
+# Serial Mouse Options
+#   You can choose a mouse protocol and the implementation of
+#   the underlying serial connection.
+#
+#SERIAL_MOUSE_MICROSOFT_ENABLE = yes   # Enable support for Microsoft-compatible mice
+#SERIAL_MOUSE_MOUSESYSTEMS_ENABLE = yes        # Enable support for Mousesystems-compatible mice
+#SERIAL_MOUSE_USE_UART = yes           # use hardware UART for serial connection
+#SERIAL_MOUSE_USE_SOFT = yes           # use software serial implementation
+
+# Optional serial mouse driver features
+# Support scrolling while holding the middle mouse button
+# (currently only supported for Mousesystems mice):
+#OPT_DEFS += -DSERIAL_MOUSE_CENTER_SCROLL
 
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax