zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

sbg
Daniel Agar 4 years ago
parent
5e4e4a4573
commit
0e9a4cc65f
5 changed files with 29 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      boards/px4/sitl/default.cmake
  2. 11
      boards/px4/sitl/nolockstep.cmake
  3. 7
      boards/px4/sitl/rtps.cmake
  4. 5
      boards/px4/sitl/test.cmake
  5. 4
      platforms/posix/CMakeLists.txt

11
boards/px4/sitl/default.cmake
Unescape View File

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

11
boards/px4/sitl/nolockstep.cmake
Unescape View File

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

7
boards/px4/sitl/rtps.cmake
Unescape View File

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

5
boards/px4/sitl/test.cmake
Unescape View File

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

4
platforms/posix/CMakeLists.txt
Unescape View File

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

Write Preview
Loading…
Cancel
Save