Split up QWIIC_ENABLE to use QWIIC_DRIVERS as well, with yes/no for enable flag. (#11426)
This commit is contained in:
parent
b7d4a9dc25
commit
34446b79d7
@ -1,16 +1,17 @@
|
|||||||
ifneq ($(strip $(QWIIC_ENABLE)),)
|
ifeq ($(strip $(QWIIC_ENABLE)),yes)
|
||||||
COMMON_VPATH += $(DRIVER_PATH)/qwiic
|
COMMON_VPATH += $(DRIVER_PATH)/qwiic
|
||||||
OPT_DEFS += -DQWIIC_ENABLE
|
OPT_DEFS += -DQWIIC_ENABLE
|
||||||
SRC += qwiic.c
|
SRC += qwiic.c
|
||||||
QUANTUM_LIB_SRC += i2c_master.c
|
QUANTUM_LIB_SRC += i2c_master.c
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(filter JOYSTIIC, $(QWIIC_ENABLE)),)
|
ifneq ($(filter JOYSTIIC, $(QWIIC_DRIVERS)),)
|
||||||
OPT_DEFS += -DQWIIC_JOYSTIIC_ENABLE
|
OPT_DEFS += -DQWIIC_JOYSTIIC_ENABLE
|
||||||
SRC += joystiic.c
|
SRC += joystiic.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(filter MICRO_OLED, $(QWIIC_ENABLE)),)
|
ifneq ($(filter MICRO_OLED, $(QWIIC_DRIVERS)),)
|
||||||
OPT_DEFS += -DQWIIC_MICRO_OLED_ENABLE
|
OPT_DEFS += -DQWIIC_MICRO_OLED_ENABLE
|
||||||
SRC += micro_oled.c
|
SRC += micro_oled.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
endif
|
||||||
|
@ -19,5 +19,6 @@ RGBLIGHT_ENABLE = no
|
|||||||
RGB_MATRIX_ENABLE = no
|
RGB_MATRIX_ENABLE = no
|
||||||
RGB_MATRIX_DRIVER = WS2812
|
RGB_MATRIX_DRIVER = WS2812
|
||||||
HAPTIC_ENABLE += DRV2605L
|
HAPTIC_ENABLE += DRV2605L
|
||||||
QWIIC_ENABLE += MICRO_OLED
|
QWIIC_ENABLE = yes
|
||||||
|
QWIIC_DRIVERS += MICRO_OLED
|
||||||
# SERIAL_LINK_ENABLE = yes
|
# SERIAL_LINK_ENABLE = yes
|
||||||
|
@ -19,12 +19,13 @@ SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
|
|||||||
NKRO_ENABLE = yes # USB Nkey Rollover
|
NKRO_ENABLE = yes # USB Nkey Rollover
|
||||||
CUSTOM_MATRIX = no # Custom matrix file
|
CUSTOM_MATRIX = no # Custom matrix file
|
||||||
ENCODER_ENABLE = yes
|
ENCODER_ENABLE = yes
|
||||||
QWIIC_ENABLE += MICRO_OLED
|
QWIIC_ENABLE = yes
|
||||||
|
QWIIC_DRIVERS += MICRO_OLED
|
||||||
#BACKLIGHT_ENABLE = yes
|
#BACKLIGHT_ENABLE = yes
|
||||||
|
|
||||||
DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
|
DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
|
||||||
|
|
||||||
# Wildcard to allow APM32 MCU
|
# Wildcard to allow APM32 MCU
|
||||||
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
|
@ -19,6 +19,7 @@ RGBLIGHT_ENABLE = yes
|
|||||||
RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
|
RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
|
||||||
RGB_MATRIX_DRIVER = WS2812
|
RGB_MATRIX_DRIVER = WS2812
|
||||||
HAPTIC_ENABLE += DRV2605L
|
HAPTIC_ENABLE += DRV2605L
|
||||||
QWIIC_ENABLE += MICRO_OLED
|
QWIIC_ENABLE = yes
|
||||||
|
QWIIC_DRIVERS += MICRO_OLED
|
||||||
ENCODER_ENABLER = yes
|
ENCODER_ENABLER = yes
|
||||||
# SERIAL_LINK_ENABLE = yes
|
# SERIAL_LINK_ENABLE = yes
|
||||||
|
Loading…
Reference in New Issue
Block a user