mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-19 09:43:33 +08:00
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:
committed by
Julian Oes
parent
2938d23c6c
commit
014f15d8b0
@@ -42,6 +42,10 @@ SRCS = \
|
||||
px4muorb.cpp \
|
||||
uORBFastRpcChannel.cpp
|
||||
endif
|
||||
=======
|
||||
SRCS = param/param.c
|
||||
|
||||
SRCS += perf_counter.c \
|
||||
|
||||
INCLUDE_DIRS += \
|
||||
${PX4_BASE}/src/modules/uORB
|
||||
|
||||
@@ -46,4 +46,4 @@ px4_add_module(
|
||||
DEPENDS
|
||||
platforms__common
|
||||
)
|
||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
|
||||
|
||||
Reference in New Issue
Block a user