summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Rogers <r2d2rogers@gmail.com>2017-10-31 15:07:53 -0500
committerJack Humbert <jack.humb@gmail.com>2017-10-31 20:59:55 -0400
commit2d77f9cbb9ea13b7f967917e8d0559856be36046 (patch)
treecb602298471198831dd526021fa9ca796a6740f0
parentc9a0436422a8884fd8b5bd706ffc70020c3437be (diff)
Fix pointing device feature
-rw-r--r--common_features.mk5
-rw-r--r--tmk_core/protocol/iwrap/iwrap.c2
-rw-r--r--tmk_core/protocol/pjrc.mk5
3 files changed, 9 insertions, 3 deletions
diff --git a/common_features.mk b/common_features.mk
index 3c77f588ed..319834b5e5 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -70,8 +70,9 @@ ifeq ($(strip $(FAUXCLICKY_ENABLE)), yes)
endif
ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
- OPT_DEFS += -DPOINTING_DEVICE_ENABLE
- SRC += $(QUANTUM_DIR)/pointing_device.c
+ OPT_DEFS += -DPOINTING_DEVICE_ENABLE
+ OPT_DEFS += -DMOUSE_ENABLE
+ SRC += $(QUANTUM_DIR)/pointing_device.c
endif
ifeq ($(strip $(UCIS_ENABLE)), yes)
diff --git a/tmk_core/protocol/iwrap/iwrap.c b/tmk_core/protocol/iwrap/iwrap.c
index 6a404116a1..71ccc493e2 100644
--- a/tmk_core/protocol/iwrap/iwrap.c
+++ b/tmk_core/protocol/iwrap/iwrap.c
@@ -349,7 +349,7 @@ static void send_keyboard(report_keyboard_t *report)
static void send_mouse(report_mouse_t *report)
{
-#if defined(MOUSEKEY_ENABLE) || defined(PS2_MOUSE_ENABLE)
+#if defined(MOUSEKEY_ENABLE) || defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE)
if (!iwrap_connected() && !iwrap_check_connection()) return;
MUX_HEADER(0x01, 0x09);
// HID raw mode header
diff --git a/tmk_core/protocol/pjrc.mk b/tmk_core/protocol/pjrc.mk
index 2b1ba2cbfb..7c0c1fa851 100644
--- a/tmk_core/protocol/pjrc.mk
+++ b/tmk_core/protocol/pjrc.mk
@@ -23,6 +23,11 @@ ifdef EXTRAKEY_ENABLE
SRC += $(PJRC_DIR)/usb_extra.c
endif
+
+ifdef POINTING_DEVICE_ENABLE
+ SRC += $(PJRC_DIR)/usb_mouse.c
+endif
+
# Search Path
VPATH += $(TMK_DIR)/$(PJRC_DIR)