diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-08-23 18:40:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 11:40:24 +1000 |
| commit | 6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb (patch) | |
| tree | 8ce8291e910bce462c9b82fac312a9ed439f2be5 | |
| parent | d57d9aec4f1e00601e6664ef6c4cb0e3e7826fe2 (diff) | |
| download | qmk_firmware-6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb.tar.gz qmk_firmware-6fd20acf4be76e7a2bd82d3dfd0a9bcca8c507eb.zip | |
Fix Mouse Shared EP functionality (#14136)
Specifically, if you enable the shared endpoint for mouse reports (or keyboard, which force enables it for mouse), and you don't have mousekeys enabled, it does not properly enable shared mouse EP for pointing device (which uses mouse reports). This cause it to error out in compiling. This fixes up some of the logic to ensure that all use cases are supported, and consolidates some of the code.
| -rw-r--r-- | common_features.mk | 4 | ||||
| -rw-r--r-- | tmk_core/common.mk | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/common_features.mk b/common_features.mk index 09217c4698..3acc5307ac 100644 --- a/common_features.mk +++ b/common_features.mk @@ -117,13 +117,13 @@ endif ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) OPT_DEFS += -DMOUSEKEY_ENABLE - OPT_DEFS += -DMOUSE_ENABLE + MOUSE_ENABLE := yes SRC += $(QUANTUM_DIR)/mousekey.c endif ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes) OPT_DEFS += -DPOINTING_DEVICE_ENABLE - OPT_DEFS += -DMOUSE_ENABLE + MOUSE_ENABLE := yes SRC += $(QUANTUM_DIR)/pointing_device.c endif diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 69d27e6c0b..7f74200590 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -25,7 +25,8 @@ ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes) MOUSE_SHARED_EP = yes endif -ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) +ifeq ($(strip $(MOUSE_ENABLE)), yes) + OPT_DEFS += -DMOUSE_ENABLE ifeq ($(strip $(MOUSE_SHARED_EP)), yes) TMK_COMMON_DEFS += -DMOUSE_SHARED_EP SHARED_EP_ENABLE = yes |