Skip to content

Commit

Permalink
Split up QWIIC_ENABLE to use QWIIC_DRIVERS as well, with yes/no for e…
Browse files Browse the repository at this point in the history
…nable flag. (#11426)
  • Loading branch information
tzarc authored Jan 3, 2021
1 parent b7d4a9d commit 34446b7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
9 changes: 5 additions & 4 deletions drivers/qwiic/qwiic.mk
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
ifneq ($(strip $(QWIIC_ENABLE)),)
ifeq ($(strip $(QWIIC_ENABLE)),yes)
COMMON_VPATH += $(DRIVER_PATH)/qwiic
OPT_DEFS += -DQWIIC_ENABLE
SRC += qwiic.c
QUANTUM_LIB_SRC += i2c_master.c
endif

ifneq ($(filter JOYSTIIC, $(QWIIC_ENABLE)),)
ifneq ($(filter JOYSTIIC, $(QWIIC_DRIVERS)),)
OPT_DEFS += -DQWIIC_JOYSTIIC_ENABLE
SRC += joystiic.c
endif

ifneq ($(filter MICRO_OLED, $(QWIIC_ENABLE)),)
ifneq ($(filter MICRO_OLED, $(QWIIC_DRIVERS)),)
OPT_DEFS += -DQWIIC_MICRO_OLED_ENABLE
SRC += micro_oled.c
endif

endif
3 changes: 2 additions & 1 deletion keyboards/boston_meetup/2019/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = no
RGB_MATRIX_DRIVER = WS2812
HAPTIC_ENABLE += DRV2605L
QWIIC_ENABLE += MICRO_OLED
QWIIC_ENABLE = yes
QWIIC_DRIVERS += MICRO_OLED
# SERIAL_LINK_ENABLE = yes
5 changes: 3 additions & 2 deletions keyboards/cannonkeys/satisfaction75/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover
CUSTOM_MATRIX = no # Custom matrix file
ENCODER_ENABLE = yes
QWIIC_ENABLE += MICRO_OLED
QWIIC_ENABLE = yes
QWIIC_DRIVERS += MICRO_OLED
#BACKLIGHT_ENABLE = yes

DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1

# Wildcard to allow APM32 MCU
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF

# Enter lower-power sleep mode when on the ChibiOS idle thread
Expand Down
3 changes: 2 additions & 1 deletion keyboards/hadron/ver3/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RGBLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
RGB_MATRIX_DRIVER = WS2812
HAPTIC_ENABLE += DRV2605L
QWIIC_ENABLE += MICRO_OLED
QWIIC_ENABLE = yes
QWIIC_DRIVERS += MICRO_OLED
ENCODER_ENABLER = yes
# SERIAL_LINK_ENABLE = yes

0 comments on commit 34446b7

Please sign in to comment.