uORB move to PX4 platform layer

This commit is contained in:
Daniel Agar 2021-02-17 11:25:56 -05:00 committed by GitHub
parent 6bbb2faf8a
commit ab0d0fd0be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
156 changed files with 261 additions and 212 deletions

View File

@ -406,7 +406,6 @@ add_subdirectory(src/lib EXCLUDE_FROM_ALL)
add_subdirectory(platforms/${PX4_PLATFORM}/src/px4)
add_subdirectory(platforms EXCLUDE_FROM_ALL)
add_subdirectory(src/modules/uORB EXCLUDE_FROM_ALL) # TODO: platform layer
if(EXISTS "${PX4_BOARD_DIR}/CMakeLists.txt")
add_subdirectory(${PX4_BOARD_DIR})

View File

@ -30,13 +30,6 @@ sercon
#
ver all
#
# Start the ORB (first app to start)
# tone_alarm and tune_control
# is dependent.
#
uorb start
#
# Set the parameter file if mtd starts successfully.
#

View File

@ -20,7 +20,6 @@ module: replay
ignore_others: false
EOF
uorb start
param set SDLOG_DIRS_MAX 7
# apply all params before ekf starts, as some params cannot be changed after startup

View File

@ -53,8 +53,6 @@ else
fi
fi
uorb start
# Load parameters
set PARAM_FILE eeprom/parameters_"$REQUESTED_AUTOSTART"
param select $PARAM_FILE

View File

@ -73,13 +73,6 @@ sercon
#
ver all
#
# Start the ORB (first app to start)
# tone_alarm and tune_control
# is dependent.
#
uorb start
#
# Try to mount the microSD card.
#

View File

@ -5,9 +5,4 @@
echo "[i] doing standalone PX4FMU startup..."
#
# Start the ORB
#
uorb start
echo "[i] startup done"

View File

@ -8,8 +8,6 @@ set unit_test_failure 0
set BOARD_RC ${R}etc/init.d/rc.board
uorb start
if rgbled start -X
then
led_control on -c blue
@ -41,11 +39,6 @@ fi
# Start a minimal system
#
#
# Start the ORB (first app to start)
#
uorb start
#
# Load parameters
#

View File

@ -83,6 +83,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -105,6 +105,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -110,6 +110,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -108,6 +108,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -102,6 +102,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -79,6 +79,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -64,6 +64,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -61,6 +61,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -49,6 +49,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
ver
work_queue
)

View File

@ -109,6 +109,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -112,6 +112,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -113,6 +113,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -113,6 +113,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -112,6 +112,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -112,6 +112,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -79,6 +79,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -110,6 +110,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -72,6 +72,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -117,6 +117,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -88,6 +88,7 @@ px4_add_board(
top
#topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -87,6 +87,7 @@ px4_add_board(
top
#topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -104,6 +104,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -109,6 +109,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -109,6 +109,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -110,6 +110,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -111,6 +111,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -107,6 +107,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -106,6 +106,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -105,6 +105,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -106,6 +106,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -106,6 +106,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -105,6 +105,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -98,6 +98,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -93,6 +93,7 @@ px4_add_board(
top
#topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -123,6 +123,7 @@ px4_add_board(
top
#topic_listener
tune_control
#uorb
#usb_connected
#ver
#work_queue

View File

@ -82,6 +82,7 @@ px4_add_board(
top
#topic_listener
tune_control
#uorb
#usb_connected
ver
#work_queue

View File

@ -108,6 +108,7 @@ px4_add_board(
top
#topic_listener
tune_control
uorb
ver
work_queue

View File

@ -81,6 +81,7 @@ px4_add_board(
top
#topic_listener
tune_control
#uorb
#usb_connected
ver
#work_queue

View File

@ -75,6 +75,7 @@ px4_add_board(
top
#topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -116,6 +116,7 @@ px4_add_board(
top
#topic_listener
tune_control
#uorb
#usb_connected
ver
#work_queue

View File

@ -122,6 +122,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -120,6 +120,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -116,6 +116,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -111,6 +111,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -119,6 +119,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -118,6 +118,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -112,6 +112,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -112,6 +112,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -111,6 +111,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -117,6 +117,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -114,6 +114,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -111,6 +111,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -113,6 +113,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -122,6 +122,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -118,6 +118,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -120,6 +120,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -87,6 +87,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -114,6 +114,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -99,6 +99,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -111,6 +111,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -86,6 +86,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -114,6 +114,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -118,6 +118,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -120,6 +120,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -113,6 +113,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -117,6 +117,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -116,6 +116,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -116,6 +116,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -114,6 +114,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -114,6 +114,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -79,6 +79,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -82,6 +82,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -80,6 +80,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -80,6 +80,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -79,6 +79,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -78,6 +78,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -79,6 +79,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -79,6 +79,7 @@ px4_add_board(
#top
topic_listener
tune_control
uorb
ver
work_queue
EXAMPLES

View File

@ -107,6 +107,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -88,6 +88,7 @@ px4_add_board(
top
topic_listener
tune_control
uorb
usb_connected
ver
work_queue

View File

@ -92,7 +92,7 @@ function(px4_add_functional_gtest)
target_link_libraries(${TESTNAME} ${LINKLIBS} gtest_functional_main
px4_layer
px4_platform
modules__uORB
uORB
systemlib
cdev
px4_work_queue

View File

@ -180,7 +180,9 @@ function(px4_add_common_flags)
${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/src/px4/${PX4_CHIP_MANUFACTURER}/${PX4_CHIP}/include
${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/src/px4/common/include
${PX4_SOURCE_DIR}/platforms/common
${PX4_SOURCE_DIR}/platforms/common/include
${PX4_SOURCE_DIR}/src
${PX4_SOURCE_DIR}/src/include
${PX4_SOURCE_DIR}/src/lib

View File

@ -50,11 +50,12 @@ add_library(px4_platform
shutdown.cpp
spi.cpp
${SRCS}
)
)
add_dependencies(px4_platform prebuild_targets)
if (NOT "${PX4_PLATFORM}" MATCHES "qurt" AND NOT "${PX4_BOARD}" MATCHES "io-v2")
target_link_libraries(px4_platform PRIVATE modules__uORB) # px4_log awkward dependency with uORB, TODO: orb should part of the platform layer
if (NOT "${PX4_BOARD}" MATCHES "io-v2")
add_subdirectory(uORB)
target_link_libraries(px4_platform PRIVATE uORB)
endif()
add_subdirectory(px4_work_queue)

View File

@ -31,17 +31,10 @@
#
############################################################################
if(NOT PX4_BOARD MATCHES "px4_io") # TODO: fix this hack (move uORB to platform layer)
# this includes the generated topics directory
include_directories(${CMAKE_CURRENT_BINARY_DIR})
# this includes the generated topics directory
include_directories(${CMAKE_CURRENT_BINARY_DIR})
px4_add_module(
MODULE modules__uORB
MAIN uorb
COMPILE_FLAGS
${MAX_CUSTOM_OPT_LEVEL}
SRCS
px4_add_library(uORB
ORBSet.hpp
Publication.hpp
PublicationMulti.hpp
@ -58,17 +51,15 @@ if(NOT PX4_BOARD MATCHES "px4_io") # TODO: fix this hack (move uORB to platform
uORBDeviceMaster.hpp
uORBDeviceNode.cpp
uORBDeviceNode.hpp
uORBMain.cpp
uORBManager.cpp
uORBManager.hpp
uORBUtils.cpp
uORBUtils.hpp
DEPENDS
cdev
uorb_msgs
)
)
if(PX4_TESTING)
target_compile_options(uORB PRIVATE ${MAX_CUSTOM_OPT_LEVEL})
target_link_libraries(uORB PRIVATE cdev uorb_msgs)
if(PX4_TESTING)
add_subdirectory(uORB_tests)
endif()
endif()

View File

@ -143,4 +143,3 @@ private:
Node *_top;
Node *_end;
};

Some files were not shown because too many files have changed in this diff Show More