diff options
| author | Joel Challis <git@zvecr.com> | 2021-02-07 13:56:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 13:56:08 +0000 |
| commit | 02881427692b682287d19fe533c3b84aa7b42a26 (patch) | |
| tree | b64dfc778cf652a04b337f8067dac1cd2a1cfe05 | |
| parent | 0c44aa950334a4956dbe1d3f1e4830c13eb38b45 (diff) | |
| download | qmk_firmware-02881427692b682287d19fe533c3b84aa7b42a26.tar.gz qmk_firmware-02881427692b682287d19fe533c3b84aa7b42a26.zip | |
Migrate mousekey to quantum (#11804)
| -rw-r--r-- | common_features.mk | 6 | ||||
| -rw-r--r-- | quantum/mousekey.c (renamed from tmk_core/common/mousekey.c) | 0 | ||||
| -rw-r--r-- | quantum/mousekey.h (renamed from tmk_core/common/mousekey.h) | 2 | ||||
| -rw-r--r-- | tmk_core/common.mk | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/common_features.mk b/common_features.mk index 6365955a7..7c956cbf2 100644 --- a/common_features.mk +++ b/common_features.mk | |||
| @@ -79,6 +79,12 @@ ifeq ($(strip $(FAUXCLICKY_ENABLE)), yes) | |||
| 79 | SRC += $(QUANTUM_DIR)/fauxclicky.c | 79 | SRC += $(QUANTUM_DIR)/fauxclicky.c |
| 80 | endif | 80 | endif |
| 81 | 81 | ||
| 82 | ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) | ||
| 83 | OPT_DEFS += -DMOUSEKEY_ENABLE | ||
| 84 | OPT_DEFS += -DMOUSE_ENABLE | ||
| 85 | SRC += $(QUANTUM_DIR)/mousekey.c | ||
| 86 | endif | ||
| 87 | |||
| 82 | ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes) | 88 | ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes) |
| 83 | OPT_DEFS += -DPOINTING_DEVICE_ENABLE | 89 | OPT_DEFS += -DPOINTING_DEVICE_ENABLE |
| 84 | OPT_DEFS += -DMOUSE_ENABLE | 90 | OPT_DEFS += -DMOUSE_ENABLE |
diff --git a/tmk_core/common/mousekey.c b/quantum/mousekey.c index 63e74baa9..63e74baa9 100644 --- a/tmk_core/common/mousekey.c +++ b/quantum/mousekey.c | |||
diff --git a/tmk_core/common/mousekey.h b/quantum/mousekey.h index 52b8fe10e..70dc4bb5c 100644 --- a/tmk_core/common/mousekey.h +++ b/quantum/mousekey.h | |||
| @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | 17 | ||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | #include <stdbool.h> | 20 | #include <stdint.h> |
| 21 | #include "host.h" | 21 | #include "host.h" |
| 22 | 22 | ||
| 23 | #ifndef MK_3_SPEED | 23 | #ifndef MK_3_SPEED |
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 05839824c..0e189962b 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
| @@ -68,10 +68,6 @@ ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes) | |||
| 68 | endif | 68 | endif |
| 69 | 69 | ||
| 70 | ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) | 70 | ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) |
| 71 | TMK_COMMON_SRC += $(COMMON_DIR)/mousekey.c | ||
| 72 | TMK_COMMON_DEFS += -DMOUSEKEY_ENABLE | ||
| 73 | TMK_COMMON_DEFS += -DMOUSE_ENABLE | ||
| 74 | |||
| 75 | ifeq ($(strip $(MOUSE_SHARED_EP)), yes) | 71 | ifeq ($(strip $(MOUSE_SHARED_EP)), yes) |
| 76 | TMK_COMMON_DEFS += -DMOUSE_SHARED_EP | 72 | TMK_COMMON_DEFS += -DMOUSE_SHARED_EP |
| 77 | SHARED_EP_ENABLE = yes | 73 | SHARED_EP_ENABLE = yes |
