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

Use QUANTUM_LIB_SRC for i2c_master.c inclusion (#5617) 

Using QUANTUM_LIB_SRC prevents the warning when multiple sources add the i2c_master.c file. Boards such as the Ergodox EZ Glow see this warning every time they compile because the board uses the file in general, and because the RGB LED Matrix requires it, as well.
This commit is contained in:
Drashna Jaelre 2019-07-09 07:57:14 -07:00 committed by MechMerlin
parent 3184303037
commit 6cccc22be9
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common_features.mk
View File

@ -133,7 +133,7 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), IS31FL3731)
OPT_DEFS += -DIS31FL3731 OPT_DEFS += -DIS31FL3731
COMMON_VPATH += $(DRIVER_PATH)/issi COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += is31fl3731-simple.c SRC += is31fl3731-simple.c
SRC += i2c_master.c QUANTUM_LIB_SRC += i2c_master.c
endif endif
RGB_MATRIX_ENABLE ?= no RGB_MATRIX_ENABLE ?= no
@ -157,21 +157,21 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3731)
OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/issi COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += is31fl3731.c SRC += is31fl3731.c
SRC += i2c_master.c QUANTUM_LIB_SRC += i2c_master.c
endif endif
ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3733) ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3733)
OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/issi COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += is31fl3733.c SRC += is31fl3733.c
SRC += i2c_master.c QUANTUM_LIB_SRC += i2c_master.c
endif endif
ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3737) ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3737)
OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/issi COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += is31fl3737.c SRC += is31fl3737.c
SRC += i2c_master.c QUANTUM_LIB_SRC += i2c_master.c
endif endif
ifeq ($(strip $(RGB_MATRIX_ENABLE)), WS2812) ifeq ($(strip $(RGB_MATRIX_ENABLE)), WS2812)
@ -271,7 +271,7 @@ ifeq ($(strip $(HAPTIC_ENABLE)), DRV2605L)
COMMON_VPATH += $(DRIVER_PATH)/haptic COMMON_VPATH += $(DRIVER_PATH)/haptic
SRC += haptic.c SRC += haptic.c
SRC += DRV2605L.c SRC += DRV2605L.c
SRC += i2c_master.c QUANTUM_LIB_SRC += i2c_master.c
OPT_DEFS += -DHAPTIC_ENABLE OPT_DEFS += -DHAPTIC_ENABLE
OPT_DEFS += -DDRV2605L OPT_DEFS += -DDRV2605L
endif endif

4
drivers/qwiic/qwiic.mk
View File

@ -2,9 +2,7 @@ ifneq ($(strip $(QWIIC_ENABLE)),)
COMMON_VPATH += $(DRIVER_PATH)/qwiic COMMON_VPATH += $(DRIVER_PATH)/qwiic
OPT_DEFS += -DQWIIC_ENABLE OPT_DEFS += -DQWIIC_ENABLE
SRC += qwiic.c SRC += qwiic.c
ifeq ($(filter "i2c_master.c", $(SRC)),) QUANTUM_LIB_SRC += i2c_master.c
SRC += i2c_master.c
endif
endif endif
ifneq ($(filter JOYSTIIC, $(QWIIC_ENABLE)),) ifneq ($(filter JOYSTIIC, $(QWIIC_ENABLE)),)

6
keyboards/ergodox_ez/rules.mk
View File

@ -16,6 +16,7 @@
# # project specific files # # project specific files
SRC += matrix.c SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c
# MCU name # MCU name
MCU = atmega32u4 MCU = atmega32u4
@ -85,9 +86,4 @@ RGBLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = no # enable later RGB_MATRIX_ENABLE = no # enable later
DEBOUNCE_TYPE = eager_pr DEBOUNCE_TYPE = eager_pr
ifeq ($(strip $(RGB_MATRIX_ENABLE)), no)
SRC += i2c_master.c
endif
LAYOUTS = ergodox LAYOUTS = ergodox

4
keyboards/model01/rules.mk
View File

@ -1,5 +1,5 @@
SRC += i2c_master.c \ QUANTUM_LIB_SRC += i2c_master.c
leds.c \ SRC += leds.c \
matrix.c matrix.c
# MCU name # MCU name