Rebase changes on upstream master

This brings in many of the changes from the PX4 fork on ATLFLight.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2016-02-19 16:59:41 +01:00
committed by Julian Oes
parent efe9344fc2
commit 9f3bf8e9f4
71 changed files with 2734 additions and 564 deletions
+5
View File
@@ -41,6 +41,11 @@ ifeq ($(PX4_TARGET_OS),qurt)
SRCS = \
px4muorb.cpp \
uORBFastRpcChannel.cpp
SRCS = param/param.c
endif
endif
SRCS += perf_counter.c \
INCLUDE_DIRS += \
${PX4_BASE}/src/modules/uORB
+3 -3
View File
@@ -30,9 +30,9 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
if("${DSPAL_STUBS_ENABLE}" STREQUAL "1")
include_directories(../krait-stubs)
endif()
#if("${DSPAL_STUBS_ENABLE}" STREQUAL "1")
# include_directories(../krait-stubs)
#endif()
px4_add_module(
MODULE modules__muorb__krait