aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PX4: fixed build with uavcan as submodule

Browse Source
This commit is contained in:
Andrew Tridgell 2015-06-12 18:24:25 +10:00
parent d45f6e8f1d
commit c9e04cb98d
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/PX4/config_px4fmu-v2_APM.mk
View File

@ -7,9 +7,5 @@ MODULES += drivers/lsm303d
MODULES += drivers/l3gd20
MODULES += drivers/boards/px4fmu-v2
MODULES += drivers/pwm_input
ifneq ($(wildcard $(SKETCHBOOK)/../uavcan),)
MODULES += modules/uavcan
MODULES += lib/mathlib
#LIBRARIES += lib/mathlib/CMSIS
endif

4
mk/px4_targets.mk
View File

@ -34,9 +34,7 @@ PX4_GIT_VERSION := $(shell cd $(PX4_ROOT) && git rev-parse HEAD | cut -c1-8)
EXTRAFLAGS += -DNUTTX_GIT_VERSION="\"$(NUTTX_GIT_VERSION)\""
EXTRAFLAGS += -DPX4_GIT_VERSION="\"$(PX4_GIT_VERSION)\""
ifneq ($(wildcard $(SKETCHBOOK)/modules/uavcan),)
EXTRAFLAGS += -DUAVCAN=1
endif
# we have different config files for V1 and V2
PX4_V1_CONFIG_FILE=$(MK_DIR)/PX4/config_px4fmu-v1_APM.mk
@ -63,9 +61,7 @@ endif
ifneq ($(wildcard $(NUTTX_SRC)/..),)
HASHADDER_FLAGS += --nuttx "$(NUTTX_SRC)/.."
endif
ifneq ($(wildcard $(UAVCAN_DIR)),)
HASHADDER_FLAGS += --uavcan "$(UAVCAN_DIR)"
endif
.PHONY: module_mk
module_mk: