Skip to content

Commit 851e022

Browse files
committed
add formation_control_sitl
Signed-off-by: Qi <[email protected]>
1 parent 798a8d8 commit 851e022

File tree

6 files changed

+587
-1
lines changed

6 files changed

+587
-1
lines changed

CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,13 @@ target_link_libraries(payload_drop
234234
${catkin_LIBRARIES}
235235
)
236236

237+
add_executable(formation_control_sitl
238+
src/Application/formation_control_sitl.cpp
239+
)
240+
add_dependencies(formation_control_sitl px4_command_gencpp)
241+
target_link_libraries(formation_control_sitl
242+
${catkin_LIBRARIES}
243+
)
237244

238245
## Rename C++ executable without prefix
239246
## The above recommended prefix causes long target names, the following renames the
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
##sitl_gazebo
2+
gnome-terminal --window -e 'bash -c "roscore; exec bash"' \
3+
--tab -e 'bash -c "sleep 2; roslaunch px4 three_uav_mavros_sitl.launch; exec bash"' \
4+
--tab -e 'bash -c "sleep 5; rosrun px4_command formation_control_sitl; exec bash"' \
5+
--tab -e 'bash -c "sleep 5; rosrun px4_command move; exec bash"' \
6+

sh/sh_for_simulation/sitl_gazebo_pos_controller.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
##sitl_gazebo
22
gnome-terminal --window -e 'bash -c "roscore; exec bash"' \
3-
--tab -e 'bash -c "sleep 2; roslaunch px4_command SITL_ude.launch; exec bash"' \
3+
--tab -e 'bash -c "sleep 2; roslaunch px4_command SITL.launch; exec bash"' \
44
--tab -e 'bash -c "sleep 2; roslaunch mavros px4.launch fcu_url:="udp://:[email protected]:14557"; exec bash"' \
55
--tab -e 'bash -c "sleep 2; roslaunch px4_command px4_pos_controller.launch; exec bash"' \
66
--tab -e 'bash -c "sleep 5; rosrun px4_command move; exec bash"' \

sh/sh_for_simulation/sitl_test.sh

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
##sitl_gazebo
2+
gnome-terminal --window -e 'bash -c "roscore; exec bash"' \
3+
--tab -e 'bash -c "sleep 2; roslaunch px4_command SITL.launch; exec bash"' \
4+
--tab -e 'bash -c "sleep 2; roslaunch mavros px4.launch fcu_url:="udp://:[email protected]:14557"; exec bash"' \
5+
--tab -e 'bash -c "sleep 2; roslaunch px4_command px4_pos_controller.launch; exec bash"' \
6+
--tab -e 'bash -c "sleep 5; rosrun px4_command move; exec bash"' \
7+
--tab -e 'bash -c "sleep 2; rosrun px4_command set_mode; exec bash"' \
8+

0 commit comments

Comments
 (0)