diff options
| author | Stefan Kerkmann <karlk90@pm.me> | 2022-07-14 11:50:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-14 11:50:00 +0200 |
| commit | 3c58f989295e17d03b66db9a154e02cde7336ece (patch) | |
| tree | f1e205d8cdc2d28d750bf0545261e9f5cbe609a2 /builddefs | |
| parent | 82685fc2acb0055b56fd57e9a842412a3e3a246c (diff) | |
[Core] PMW33XX drivers overhaul (#17613)
* PMW33XX drivers overhaul
This combines the PMW3389 and PM3360 drivers as they only differ in the
firmware blobs and CPI get and set functions. The following changes have
been made:
* PMW3389 now gets the same multi-sensor feature that is already available on the
PMW3360.
* Introduced a shared pmw33xx_report_t struct is now directly readable via SPI
transactions instead of individual byte-sized reads, saving multiple
copies and bitshift operations.
* pmw33(89/60)_get_report functions had unreachable branches in their motion
detection logic these have been simplied as much as possible.
* The fast firmware upload option has been removed as this becomes obsolete by
the newly introduced polled waiting functions for ChibiOS polled waiting
* PMW33(60/89)_SPI_LSBFIRST and PMW33(60/89)_SPI_MODE config options
have been removed as they don't need to be configurable.
* All PMW3389 and PMW3360 defines have been unified to a PMW33XX prefix
to reduce code duplication and make the defines interchangeable
* Adjust keyboards to PMW33XX naming scheme
Diffstat (limited to 'builddefs')
| -rw-r--r-- | builddefs/common_features.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 01dbdc3330..d7a00ba944 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -161,11 +161,9 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes) else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball) OPT_DEFS += -DSTM32_SPI -DHAL_USE_I2C=TRUE QUANTUM_LIB_SRC += i2c_master.c - else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pmw3360) - OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE - QUANTUM_LIB_SRC += spi_master.c - else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pmw3389) + else ifneq ($(filter $(strip $(POINTING_DEVICE_DRIVER)),pmw3360 pmw3389),) OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE + SRC += drivers/sensors/pmw33xx_common.c QUANTUM_LIB_SRC += spi_master.c endif endif |