Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preliminary mouse support for Logitech Unifying Receiver #589

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions converter/usb_usb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@

# Target file name (without extension).
TARGET ?= usb_usb

TMK_DIR ?= ../../tmk_core
TARGET_DIR ?= .

# Directory keyboard dependent files exist
TARGET_DIR ?= .
TMK_DIR ?= ../../tmk_core

# MCU name
MCU ?= atmega32u4
Expand Down Expand Up @@ -92,9 +91,14 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
#
MOUSEKEY_ENABLE ?= yes # Mouse keys
EXTRAKEY_ENABLE ?= yes # Media control and System control
CONSOLE_ENABLE ?= yes # Console for debug
#COMMAND_ENABLE ?= yes # Commands for debug and configuration
#NKRO_ENABLE ?= yes # USB Nkey Rollover
#CONSOLE_ENABLE ?= yes # Console for debug
#COMMAND_ENABLE ?= yes # Commands for debug and configuration
#NKRO_ENABLE ?= yes # USB Nkey Rollover

#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
#PS2_USE_BUSYWAIT = yes # uses primitive reference code
#PS2_USE_USART = yes # hardware USART engine for PS/2 signal receive
#PS2_MOUSE_DEBUG = yes

# Boot Section Size in bytes
# Teensy halfKay 512
Expand Down Expand Up @@ -142,7 +146,7 @@ VPATH += $(TMK_DIR)
PROGRAM_CMD = avrdude -p$(MCU) -cavr109 -b57600 -Uflash:w:$(TARGET).hex -P$(DEV)



#include $(TMK_DIR)/protocol.mk # Enables PS/2 Trackpoint
include $(TMK_DIR)/protocol/usb_hid.mk
include $(TMK_DIR)/protocol/lufa.mk
include $(TMK_DIR)/common.mk
Expand Down
2 changes: 1 addition & 1 deletion converter/usb_usb/Makefile.8mhz
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
F_CPU = 8000000
F_USB = 16000000
F_USB = 8000000
UNIMAP_ENABLE = yes
KEYMAP_SECTION_ENABLE = yes
include Makefile
8 changes: 8 additions & 0 deletions converter/usb_usb/Makefile.8mhz_debug
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
F_CPU = 8000000
F_USB = 8000000
TARGET = usb_usb_debug
UNIMAP_ENABLE = yes
#KEYMAP_SECTION_ENABLE = yes
#LUFA_DEBUG = yes
OPT_DEFS += -DDEBUG_USB_HOST
include Makefile
8 changes: 8 additions & 0 deletions converter/usb_usb/Makefile.8mhz_unimap
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
TARGET ?= usb_usb_8mhz_unimap
F_CPU = 8000000
F_USB = 8000000
UNIMAP_ENABLE ?= yes
KEYMAP_SECTION_ENABLE ?= yes
MULTI_KBD_ENABLE ?= yes
USBHUB_ENABLE ?= yes
include Makefile
21 changes: 21 additions & 0 deletions converter/usb_usb/Makefile.8mhz_unimap.unifying
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
TARGET = usb_usb_8mhz_unimap_unifying
UNIMAP_ENABLE = yes
KEYMAP_SECTION_ENABLE = no
MULTI_KBD_ENABLE = no
COMPOSITE_ENABLE = no
USBHUB_ENABLE = yes

ifeq (yes,$(strip $(MULTI_KBD_ENABLE)))
OPT_DEFS += -DMULTI_KBD_ENABLE
endif

ifeq (yes,$(strip $(COMPOSITE_ENABLE)))
OPT_DEFS += -DCOMPOSITE_ENABLE
endif

ifeq (yes,$(strip $(USBHUB_ENABLE)))
OPT_DEFS += -DUSBHUB_ENABLE
endif

SRC = usb_usb_c.cpp
include Makefile.8mhz_unimap
7 changes: 4 additions & 3 deletions converter/usb_usb/Makefile.unimap
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
F_CPU = 16000000
F_USB = 16000000
TARGET = usb_usb_unimap
UNIMAP_ENABLE = yes
KEYMAP_SECTION_ENABLE = yes
#LUFA_DEBUG = yes
UNIMAP_ENABLE ?= yes
KEYMAP_SECTION_ENABLE ?= yes
include Makefile
21 changes: 21 additions & 0 deletions converter/usb_usb/Makefile.unimap.unifying
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
TARGET = usb_usb_unimap_unifying
UNIMAP_ENABLE = yes
KEYMAP_SECTION_ENABLE = no
MULTI_KBD_ENABLE = no
COMPOSITE_ENABLE = no
USBHUB_ENABLE = yes

ifeq (yes,$(strip $(MULTI_KBD_ENABLE)))
OPT_DEFS += -DMULTI_KBD_ENABLE
endif

ifeq (yes,$(strip $(COMPOSITE_ENABLE)))
OPT_DEFS += -DCOMPOSITE_ENABLE
endif

ifeq (yes,$(strip $(USBHUB_ENABLE)))
OPT_DEFS += -DUSBHUB_ENABLE
endif

SRC = usb_usb_c.cpp
include Makefile.unimap
Loading