]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Fix pointing device feature
authorRob Rogers <r2d2rogers@gmail.com>
Tue, 31 Oct 2017 20:07:53 +0000 (15:07 -0500)
committerJack Humbert <jack.humb@gmail.com>
Wed, 1 Nov 2017 00:59:55 +0000 (20:59 -0400)
common_features.mk
tmk_core/protocol/iwrap/iwrap.c
tmk_core/protocol/pjrc.mk

index 3c77f588edecdc816dfe275d94f64e3ac9ae1456..319834b5e524d328e5fe7db0e573ea9340990be5 100644 (file)
@@ -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)
index 6a404116a15cccff2724c779e952b7c1133c7589..71ccc493e2f3b7f02dbc7e45394ebd32a024a8a1 100644 (file)
@@ -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
index 2b1ba2cbfbb9f4a79bda474eacfd7268fda555aa..7c0c1fa851b821b9abbbfaeed92e04754bca86fe 100644 (file)
@@ -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)