darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity

Split up QWIIC_ENABLE to use QWIIC_DRIVERS as well, with yes/no for enable flag. (#11426)

Browse source
This commit is contained in:
Nick Brassel 2021-01-04 08:45:43 +11:00 committed by GitHub
parent b7d4a9dc25
commit 34446b79d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/qwiic/qwiic.mk
View file

@ -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

3
keyboards/boston_meetup/2019/rules.mk
View file

@ -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

5
keyboards/cannonkeys/satisfaction75/rules.mk
View file

@ -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

3
keyboards/hadron/ver3/rules.mk
View file

@ -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