From 26d3ad18b8b94e2ad6951bb885b63f9f0301aea7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 14 Nov 2014 16:08:52 +1100
Subject: [PATCH] Revert "PX4: enabled support for UAVCAN"
This reverts commit 71b2306aa95efa5f1f4f066df75233dc7e021954.
This broke the build due to git submodules. We need to work out how
ArduPilot is going to handle the external uavcan module dependency
before we enable this again
---
mk/PX4/ROMFS/init.d/rc.APM | 7 -------
mk/PX4/config_px4fmu-v2_APM.mk | 4 ----
mk/px4_targets.mk | 1 -
3 files changed, 12 deletions(-)
diff --git a/mk/PX4/ROMFS/init.d/rc.APM b/mk/PX4/ROMFS/init.d/rc.APM
index c86bffc77..2c34d569b 100644
--- a/mk/PX4/ROMFS/init.d/rc.APM
+++ b/mk/PX4/ROMFS/init.d/rc.APM
@@ -345,13 +345,6 @@ else
sh /etc/init.d/rc.error
fi
-if uavcan start 1
-then
- echo "started uavcan OK"
-else
- echo "failed to start uavcan"
-fi
-
if mtd readtest /fs/mtd
then
echo "mtd readtest OK"
diff --git a/mk/PX4/config_px4fmu-v2_APM.mk b/mk/PX4/config_px4fmu-v2_APM.mk
index 3822953ae..f285e0e4a 100644
--- a/mk/PX4/config_px4fmu-v2_APM.mk
+++ b/mk/PX4/config_px4fmu-v2_APM.mk
@@ -74,10 +74,6 @@ MODULES += modules/libtomcrypt
endif
MODULES += lib/conversion
-MODULES += modules/uavcan
-MODULES += lib/mathlib
-LIBRARIES += lib/mathlib/CMSIS
-
#
# Transitional support - add commands from the NuttX export archive.
#
diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk
index 7794ccfee..bb6c00533 100644
--- a/mk/px4_targets.mk
+++ b/mk/px4_targets.mk
@@ -31,7 +31,6 @@ 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)\""
-EXTRAFLAGS += -DUAVCAN=1
# we have different config files for V1 and V2
PX4_V1_CONFIG_FILE=$(MK_DIR)/PX4/config_px4fmu-v1_APM.mk
--
GitLab