boards: px4/sitl sync all build variants and fix none default package

This commit is contained in:
Daniel Agar 2020-09-15 16:55:01 -04:00
parent 5e4e4a4573
commit 0e9a4cc65f
5 changed files with 29 additions and 9 deletions

View File

@ -17,6 +17,7 @@ px4_add_board(
gps
#imu # all available imu drivers
#magnetometer # all available magnetometer drivers
#protocol_splitter
pwm_out_sim
rpm/rpm_simulator
#telemetry # all available telemetry drivers
@ -43,6 +44,7 @@ px4_add_board(
mc_hover_thrust_estimator
mc_pos_control
mc_rate_control
#micrortps_bridge
navigator
rc_update
replay
@ -51,10 +53,9 @@ px4_add_board(
#sih
simulator
temperature_compensation
uuv_att_control
vmount
vtol_att_control
uuv_att_control
SYSTEMCMDS
#dumpfile
dyn
@ -102,5 +103,9 @@ set(REPLAY_FILE "$ENV{replay}")
if(REPLAY_FILE)
message(STATUS "Building with uorb publisher rules support")
add_definitions(-DORB_USE_PUBLISHER_RULES)
message(STATUS "Building without lockstep for replay")
set(ENABLE_LOCKSTEP_SCHEDULER no)
else()
set(ENABLE_LOCKSTEP_SCHEDULER yes)
endif()
set(ENABLE_LOCKSTEP_SCHEDULER yes)

View File

@ -5,6 +5,7 @@ px4_add_board(
MODEL sitl
ROMFSROOT px4fmu_common
LABEL nolockstep
EMBEDDED_METADATA parameters
TESTING
DRIVERS
#barometer # all available barometer drivers
@ -16,11 +17,14 @@ px4_add_board(
gps
#imu # all available imu drivers
#magnetometer # all available magnetometer drivers
#protocol_splitter
pwm_out_sim
rpm/rpm_simulator
#telemetry # all available telemetry drivers
tone_alarm
#uavcan
MODULES
airship_att_control
airspeed_selector
attitude_estimator_q
camera_feedback
@ -40,6 +44,7 @@ px4_add_board(
mc_hover_thrust_estimator
mc_pos_control
mc_rate_control
#micrortps_bridge
navigator
rc_update
replay
@ -48,12 +53,10 @@ px4_add_board(
#sih
simulator
temperature_compensation
uuv_att_control
vmount
vtol_att_control
uuv_att_control
SYSTEMCMDS
#config
#dumpfile
dyn
esc_calib
@ -76,6 +79,7 @@ px4_add_board(
work_queue
EXAMPLES
dyn_hello # dynamically loading modules example
fake_magnetometer
fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
hello
#hwtest # Hardware test
@ -84,6 +88,7 @@ px4_add_board(
px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html
rover_steering_control # Rover example app
uuv_example_app
work_item
)
message(STATUS "Building without lockstep")

View File

@ -5,6 +5,7 @@ px4_add_board(
MODEL sitl
ROMFSROOT px4fmu_common
LABEL rtps
EMBEDDED_METADATA parameters
TESTING
DRIVERS
#barometer # all available barometer drivers
@ -18,10 +19,12 @@ px4_add_board(
#magnetometer # all available magnetometer drivers
#protocol_splitter
pwm_out_sim
rpm/rpm_simulator
#telemetry # all available telemetry drivers
tone_alarm
#uavcan
MODULES
airship_att_control
airspeed_selector
attitude_estimator_q
camera_feedback
@ -43,13 +46,14 @@ px4_add_board(
mc_rate_control
micrortps_bridge
navigator
replay
rc_update
replay
rover_pos_control
sensors
#sih
simulator
temperature_compensation
uuv_att_control
vmount
vtol_att_control
SYSTEMCMDS
@ -75,6 +79,7 @@ px4_add_board(
work_queue
EXAMPLES
dyn_hello # dynamically loading modules example
fake_magnetometer
fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
hello
#hwtest # Hardware test

View File

@ -5,6 +5,7 @@ px4_add_board(
MODEL sitl
ROMFSROOT px4fmu_common
LABEL test
EMBEDDED_METADATA parameters
TESTING
DRIVERS
#barometer # all available barometer drivers
@ -17,10 +18,12 @@ px4_add_board(
#imu # all available imu drivers
#magnetometer # all available magnetometer drivers
pwm_out_sim
rpm/rpm_simulator
#telemetry # all available telemetry drivers
tone_alarm
#uavcan
MODULES
airship_att_control
airspeed_selector
attitude_estimator_q
camera_feedback
@ -48,6 +51,7 @@ px4_add_board(
#sih
simulator
temperature_compensation
uuv_att_control
vmount
vtol_att_control
SYSTEMCMDS
@ -73,6 +77,7 @@ px4_add_board(
work_queue
EXAMPLES
dyn_hello # dynamically loading modules example
fake_magnetometer
fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
hello
#hwtest # Hardware test

View File

@ -165,7 +165,7 @@ elseif("${PX4_BOARD}" MATCHES "sitl")
# ROMFS files
install(
DIRECTORY
${PROJECT_SOURCE_DIR}/build/px4_sitl_default/etc
${PX4_BINARY_DIR}/etc
DESTINATION
${PROJECT_NAME}/build/px4_sitl_default
)
@ -173,7 +173,7 @@ elseif("${PX4_BOARD}" MATCHES "sitl")
# sitl_gazebo built plugins
install(
DIRECTORY
${PROJECT_SOURCE_DIR}/build/px4_sitl_default/build_gazebo
${PX4_BINARY_DIR}/build_gazebo
DESTINATION
${PROJECT_NAME}/build/px4_sitl_default
FILES_MATCHING