diff options
| author | Drashna Jaelre <drashna@live.com> | 2022-07-20 09:32:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-20 17:32:00 +0100 |
| commit | ee17ffadea41241fc2b397e0bbea8903591dd21c (patch) | |
| tree | cad8fb55bf28bdb6fa457a787a5392d75ec9377a | |
| parent | adfa36fee4a9c37977412522cddec78e6eecd977 (diff) | |
| download | qmk_firmware-ee17ffadea41241fc2b397e0bbea8903591dd21c.tar.gz qmk_firmware-ee17ffadea41241fc2b397e0bbea8903591dd21c.zip | |
Move Pointing Device code to a subdirectory (#17684)
| -rw-r--r-- | builddefs/common_features.mk | 9 | ||||
| -rw-r--r-- | quantum/pointing_device/pointing_device.c (renamed from quantum/pointing_device.c) | 0 | ||||
| -rw-r--r-- | quantum/pointing_device/pointing_device.h (renamed from quantum/pointing_device.h) | 0 | ||||
| -rw-r--r-- | quantum/pointing_device/pointing_device_drivers.c (renamed from quantum/pointing_device_drivers.c) | 0 | ||||
| -rw-r--r-- | quantum/pointing_device/pointing_device_gestures.c (renamed from quantum/pointing_device_gestures.c) | 0 | ||||
| -rw-r--r-- | quantum/pointing_device/pointing_device_gestures.h (renamed from quantum/pointing_device_gestures.h) | 0 |
6 files changed, 5 insertions, 4 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 9ee51149ef..8d31f694a7 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -133,8 +133,9 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes) else OPT_DEFS += -DPOINTING_DEVICE_ENABLE MOUSE_ENABLE := yes - SRC += $(QUANTUM_DIR)/pointing_device.c - SRC += $(QUANTUM_DIR)/pointing_device_drivers.c + VPATH += $(QUANTUM_DIR)/pointing_device + SRC += $(QUANTUM_DIR)/pointing_device/pointing_device.c + SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_drivers.c ifneq ($(strip $(POINTING_DEVICE_DRIVER)), custom) SRC += drivers/sensors/$(strip $(POINTING_DEVICE_DRIVER)).c OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(shell echo $(POINTING_DEVICE_DRIVER) | tr '[:lower:]' '[:upper:]')) @@ -150,13 +151,13 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes) OPT_DEFS += -DSTM32_I2C -DHAL_USE_I2C=TRUE SRC += drivers/sensors/cirque_pinnacle.c SRC += drivers/sensors/cirque_pinnacle_gestures.c - SRC += $(QUANTUM_DIR)/pointing_device_gestures.c + SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c QUANTUM_LIB_SRC += i2c_master.c else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), cirque_pinnacle_spi) OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE SRC += drivers/sensors/cirque_pinnacle.c SRC += drivers/sensors/cirque_pinnacle_gestures.c - SRC += $(QUANTUM_DIR)/pointing_device_gestures.c + SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c QUANTUM_LIB_SRC += spi_master.c else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball) OPT_DEFS += -DSTM32_SPI -DHAL_USE_I2C=TRUE diff --git a/quantum/pointing_device.c b/quantum/pointing_device/pointing_device.c index 3aa4941687..3aa4941687 100644 --- a/quantum/pointing_device.c +++ b/quantum/pointing_device/pointing_device.c diff --git a/quantum/pointing_device.h b/quantum/pointing_device/pointing_device.h index 77db5471ea..77db5471ea 100644 --- a/quantum/pointing_device.h +++ b/quantum/pointing_device/pointing_device.h diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device/pointing_device_drivers.c index d0b545d22d..d0b545d22d 100644 --- a/quantum/pointing_device_drivers.c +++ b/quantum/pointing_device/pointing_device_drivers.c diff --git a/quantum/pointing_device_gestures.c b/quantum/pointing_device/pointing_device_gestures.c index 02b11ebe3f..02b11ebe3f 100644 --- a/quantum/pointing_device_gestures.c +++ b/quantum/pointing_device/pointing_device_gestures.c diff --git a/quantum/pointing_device_gestures.h b/quantum/pointing_device/pointing_device_gestures.h index d2ea44971b..d2ea44971b 100644 --- a/quantum/pointing_device_gestures.h +++ b/quantum/pointing_device/pointing_device_gestures.h |