rekahsoft
/
qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix enables for Haptic Feedback (#6707) 

* Fix enables for Haptic Feedback

If you enabled bothe DRV2605 and SOLENOID, it would only enable one of these, not both. 

This fixes the check so that you can enable both options.

* Fix check for haptic feature
This commit is contained in:
Drashna Jaelre 2019-09-14 19:57:07 -07:00 committed by GitHub
parent d13e0b5cfc
commit 265d8abee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common_features.mk
View File

@ -267,20 +267,21 @@ ifeq ($(strip $(ENCODER_ENABLE)), yes)
OPT_DEFS += -DENCODER_ENABLE OPT_DEFS += -DENCODER_ENABLE
endif endif
ifeq ($(strip $(HAPTIC_ENABLE)), DRV2605L) HAPTIC_ENABLE ?= no
COMMON_VPATH += $(DRIVER_PATH)/haptic ifneq ($(strip $(HAPTIC_ENABLE)),no)
SRC += haptic.c COMMON_VPATH += $(DRIVER_PATH)/haptic
SRC += haptic.c
OPT_DEFS += -DHAPTIC_ENABLE
endif
ifneq ($(filter DRV2605L, $(HAPTIC_ENABLE)), )
SRC += DRV2605L.c SRC += DRV2605L.c
QUANTUM_LIB_SRC += i2c_master.c QUANTUM_LIB_SRC += i2c_master.c
OPT_DEFS += -DHAPTIC_ENABLE
OPT_DEFS += -DDRV2605L OPT_DEFS += -DDRV2605L
endif endif
ifeq ($(strip $(HAPTIC_ENABLE)), SOLENOID) ifneq ($(filter SOLENOID, $(HAPTIC_ENABLE)), )
COMMON_VPATH += $(DRIVER_PATH)/haptic
SRC += haptic.c
SRC += solenoid.c SRC += solenoid.c
OPT_DEFS += -DHAPTIC_ENABLE
OPT_DEFS += -DSOLENOID_ENABLE OPT_DEFS += -DSOLENOID_ENABLE
endif endif