Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use QUANTUM_LIB_SRC for i2c_master.c inclusion #5617

Merged
merged 1 commit into from
Jul 9, 2019
Merged

Use QUANTUM_LIB_SRC for i2c_master.c inclusion #5617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions common_features.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), IS31FL3731)
OPT_DEFS += -DIS31FL3731
COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += is31fl3731-simple.c
SRC += i2c_master.c
QUANTUM_LIB_SRC += i2c_master.c
drashna marked this conversation as resolved.
Show resolved Hide resolved
endif

RGB_MATRIX_ENABLE ?= no
Expand All @@ -157,21 +157,21 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3731)
OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += is31fl3731.c
SRC += i2c_master.c
QUANTUM_LIB_SRC += i2c_master.c
drashna marked this conversation as resolved.
Show resolved Hide resolved
endif

ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3733)
OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += is31fl3733.c
SRC += i2c_master.c
QUANTUM_LIB_SRC += i2c_master.c
drashna marked this conversation as resolved.
Show resolved Hide resolved
endif

ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3737)
OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE
COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += is31fl3737.c
SRC += i2c_master.c
QUANTUM_LIB_SRC += i2c_master.c
drashna marked this conversation as resolved.
Show resolved Hide resolved
endif

ifeq ($(strip $(RGB_MATRIX_ENABLE)), WS2812)
Expand Down Expand Up @@ -271,7 +271,7 @@ ifeq ($(strip $(HAPTIC_ENABLE)), DRV2605L)
COMMON_VPATH += $(DRIVER_PATH)/haptic
SRC += haptic.c
SRC += DRV2605L.c
SRC += i2c_master.c
QUANTUM_LIB_SRC += i2c_master.c
drashna marked this conversation as resolved.
Show resolved Hide resolved
OPT_DEFS += -DHAPTIC_ENABLE
OPT_DEFS += -DDRV2605L
endif
Expand Down
4 changes: 1 addition & 3 deletions drivers/qwiic/qwiic.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ ifneq ($(strip $(QWIIC_ENABLE)),)
COMMON_VPATH += $(DRIVER_PATH)/qwiic
OPT_DEFS += -DQWIIC_ENABLE
SRC += qwiic.c
ifeq ($(filter "i2c_master.c", $(SRC)),)
SRC += i2c_master.c
endif
QUANTUM_LIB_SRC += i2c_master.c
endif

ifneq ($(filter JOYSTIIC, $(QWIIC_ENABLE)),)
Expand Down
6 changes: 1 addition & 5 deletions keyboards/ergodox_ez/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

# # project specific files
SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c

# MCU name
MCU = atmega32u4
Expand Down Expand Up @@ -85,9 +86,4 @@ RGBLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = no # enable later
DEBOUNCE_TYPE = eager_pr

ifeq ($(strip $(RGB_MATRIX_ENABLE)), no)
SRC += i2c_master.c
endif


LAYOUTS = ergodox
4 changes: 2 additions & 2 deletions keyboards/model01/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SRC += i2c_master.c \
leds.c \
QUANTUM_LIB_SRC += i2c_master.c
SRC += leds.c \
matrix.c

# MCU name
Expand Down