From b7784a14390efdab1b1002185d9db7e12b492727 Mon Sep 17 00:00:00 2001 From: Nico van Duijn Date: Thu, 14 Mar 2019 13:30:00 +0100 Subject: [PATCH] Add MAVLink stream and cmake sitl target --- ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid | 1 + ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid.post | 2 ++ Tools/sitl_gazebo | 2 +- platforms/posix/cmake/sitl_target.cmake | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid.post diff --git a/ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid b/ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid index 3a32eceb0d..bae5b458fd 100644 --- a/ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid +++ b/ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid @@ -10,4 +10,5 @@ sh /etc/init.d-posix/10016_iris if [ $AUTOCNF = yes ] then param set COM_OBS_AVOID 1 + param set MPC_XY_CRUISE 5.0 fi diff --git a/ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid.post b/ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid.post new file mode 100644 index 0000000000..240f5d3740 --- /dev/null +++ b/ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid.post @@ -0,0 +1,2 @@ +# shellcheck disable=SC2154 +mavlink start -x -u 14558 -r 4000000 -m onboard -o 14541 # add mavlink stream for SDK diff --git a/Tools/sitl_gazebo b/Tools/sitl_gazebo index 09b20e62df..055e0af4f3 160000 --- a/Tools/sitl_gazebo +++ b/Tools/sitl_gazebo @@ -1 +1 @@ -Subproject commit 09b20e62df749b027b4741d6c001f8b36da06288 +Subproject commit 055e0af4f3ecee70befc42708c4f3461441d28b6 diff --git a/platforms/posix/cmake/sitl_target.cmake b/platforms/posix/cmake/sitl_target.cmake index 524131c8d4..0d0af29a02 100644 --- a/platforms/posix/cmake/sitl_target.cmake +++ b/platforms/posix/cmake/sitl_target.cmake @@ -51,7 +51,7 @@ ExternalProject_Add_Step(sitl_gazebo forceconfigure # create targets for each viewer/model/debugger combination set(viewers none jmavsim gazebo) set(debuggers none ide gdb lldb ddd valgrind callgrind) -set(models none shell iris iris_opt_flow iris_vision iris_rplidar iris_irlock standard_vtol plane solo tailsitter typhoon_h480 rover hippocampus tiltrotor) +set(models none shell iris iris_opt_flow iris_vision iris_rplidar iris_irlock iris_obs_avoid standard_vtol plane solo tailsitter typhoon_h480 rover hippocampus tiltrotor) set(all_posix_vmd_make_targets) foreach(viewer ${viewers}) foreach(debugger ${debuggers})