Skip to content
Snippets Groups Projects
Commit e116961c authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[wip/openhrp3-hrp2] Add launch files for various simulations setup.

Allows to perform simulation with and without the bush rubbers.
parent 4bffa691
No related branches found
No related tags found
No related merge requests found
......@@ -22,6 +22,9 @@ share/customizer/HRP2_bush_customizer_param.conf
share/openhrp3_hrp2/cmake/openhrp3_hrp2Config-version.cmake
share/openhrp3_hrp2/cmake/openhrp3_hrp2Config.cmake
share/openhrp3_hrp2/launch/openhrp3_hrp2.launch
share/openhrp3_hrp2/launch/openhrp3_hrp2_bush.launch
share/openhrp3_hrp2/launch/openhrp3_hrp2_nobush.launch
share/openhrp3_hrp2/launch/openhrp3_hrp2_nobush_seq.launch
share/openhrp3_hrp2/package.xml
share/openhrp3_hrp2/project/simulationMode.xml
share/openhrp3_hrp2/project/simulationModeNoBush.xml
......
......@@ -3,3 +3,4 @@ RMD160 (openhrp3_hrp2-1.0.7.tar.gz) = 27acd69fe196790559679d5d11dd9724830d7e5a
Size (openhrp3_hrp2-1.0.7.tar.gz) = 955213 bytes
SHA1 (patch-aa) = 05cf80df6a9633dbe202cbd29a1ab95e37df6147
SHA1 (patch-ab) = 85f358fd741d85a48e63372b287141357b403dee
SHA1 (patch-ac) = 0b1567371fbe13437bf8bc64536c6f92e01d87d4
diff --git launch/CMakeLists.txt launch/CMakeLists.txt
index d751ad1..4f513a7 100644
--- launch/CMakeLists.txt
+++ launch/CMakeLists.txt
@@ -1,3 +1,9 @@
# Generate the configure file for openhrp2_launch
configure_file( ${CMAKE_SOURCE_DIR}/launch/openhrp3_hrp2.launch.in ${CMAKE_BINARY_DIR}/launch/openhrp3_hrp2.launch)
-install(FILES ${CMAKE_BINARY_DIR}/launch/openhrp3_hrp2.launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch)
\ No newline at end of file
+install(FILES
+ ${CMAKE_BINARY_DIR}/launch/openhrp3_hrp2.launch
+ openhrp3_hrp2_bush.launch
+ openhrp3_hrp2_nobush.launch
+ openhrp3_hrp2_nobush_seq.launch
+ DESTINATION
+ ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch)
\ No newline at end of file
diff --git launch/openhrp3_hrp2.launch.in launch/openhrp3_hrp2.launch.in
index 2aa0232..6b6e9f6 100644
--- launch/openhrp3_hrp2.launch.in
+++ launch/openhrp3_hrp2.launch.in
@@ -1,4 +1,6 @@
<launch>
+ <arg name="openhrpprojectname" default="simulationMode"/>
+
<machine
name="localmachine"
address="localhost"
@@ -16,10 +18,10 @@
<node name="hrpsys_viewer" pkg="openhrp3_simulator_wo_rtm" type="start_hrpsys_viewer" />
<node name="controller_hrp2" pkg="openhrp3_hrp2" type="controller-hrp2"
- args="@SOT_HRP2_LIBDIR@/libsot-hrp2-14-controller.so @CMAKE_INSTALL_PREFIX@/example/openhrp3-hrp2/scheduler/etc/PIDgains.dat"
+ args="@SOT_HRP2_LIBDIR@/libsot-hrp2-14-controller.so @CMAKE_INSTALL_PREFIX@/example/openhrp3_hrp2/scheduler/etc/PIDgains.dat"
/>
<node name="scheduler_project" pkg="openhrp3_simulator_wo_rtm" type="schedulerproject"
- args="-url @CMAKE_INSTALL_PREFIX@/share/openhrp3-hrp2/project/simulationMode.xml"
+ args="-url @CMAKE_INSTALL_PREFIX@/share/openhrp3_hrp2/project/$(arg openhrpprojectname).xml"
/>
</launch>
\ No newline at end of file
diff --git launch/openhrp3_hrp2_bush.launch launch/openhrp3_hrp2_bush.launch
new file mode 100644
index 0000000..df0747f
--- /dev/null
+++ launch/openhrp3_hrp2_bush.launch
@@ -0,0 +1,5 @@
+<launch>
+ <include file="$(find openhrp3_hrp2)/launch/openhrp3_hrp2.launch" >
+ <arg name="openhrpprojectname" value="simulationMode"/>
+ </include>
+</launch>
diff --git launch/openhrp3_hrp2_nobush.launch launch/openhrp3_hrp2_nobush.launch
new file mode 100644
index 0000000..84573c2
--- /dev/null
+++ launch/openhrp3_hrp2_nobush.launch
@@ -0,0 +1,5 @@
+<launch>
+ <include file="$(find openhrp3_hrp2)/launch/openhrp3_hrp2.launch" >
+ <arg name="openhrpprojectname" value="simulationModeNoBush"/>
+ </include>
+</launch>
diff --git launch/openhrp3_hrp2_nobush_seq.launch launch/openhrp3_hrp2_nobush_seq.launch
new file mode 100644
index 0000000..4aede55
--- /dev/null
+++ launch/openhrp3_hrp2_nobush_seq.launch
@@ -0,0 +1,6 @@
+<launch>
+ <include file="$(find openhrp3_hrp2)/launch/openhrp3_hrp2.launch" >
+ <arg name="openhrpprojectname" value="simulationModeNoBushSeq"/>
+ </include>
+
+</launch>
--
1.9.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment