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

[roscontrol_sot_talos] Fix talos_ prefix

parent c2ddac0a
No related branches found
No related tags found
No related merge requests found
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 2.8.3)
project(talos_roscontrol_sot_talos) project(roscontrol_sot_talos)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
...@@ -35,7 +35,7 @@ catkin_package() ...@@ -35,7 +35,7 @@ catkin_package()
# include_directories(include) # include_directories(include)
include_directories( include_directories(
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
) )
## Add cmake target dependencies of the executable ## Add cmake target dependencies of the executable
......
<launch> <launch>
<!-- Sot Controller configuration --> <!-- Sot Controller configuration -->
<rosparam command="load" file="$(find talos_roscontrol_sot_talos)/config/sot_talos_params_effort.yaml"/> <rosparam command="load" file="$(find roscontrol_sot_talos)/config/sot_talos_params_effort.yaml"/>
<rosparam command="load" file="$(find talos_roscontrol_sot_talos)/config/sot_talos_controller.yaml" /> <rosparam command="load" file="$(find roscontrol_sot_talos)/config/sot_talos_controller.yaml" />
<rosparam command="load" file="$(find talos_roscontrol_sot_talos)/config/pids.yaml" /> <rosparam command="load" file="$(find roscontrol_sot_talos)/config/pids.yaml" />
<env name="PYTHONPATH" value="/opt/pal/dubnium/lib/python2.7/dist-packages:/opt/ros/indigo/lib/python2.7/dist-packages:/opt/openrobots/lib/python2.7/dist-packages:/opt/openrobots/lib/python2.7/site-packages" /> <env name="PYTHONPATH" value="/opt/pal/dubnium/lib/python2.7/dist-packages:/opt/ros/indigo/lib/python2.7/dist-packages:/opt/openrobots/lib/python2.7/dist-packages:/opt/openrobots/lib/python2.7/site-packages" />
<!-- Spawn walking controller --> <!-- Spawn walking controller -->
......
<launch> <launch>
<!-- Sot Controller configuration --> <!-- Sot Controller configuration -->
<rosparam command="load" file="$(find talos_roscontrol_sot_talos)/config/sot_talos_params_gazebo.yaml"/> <rosparam command="load" file="$(find roscontrol_sot_talos)/config/sot_talos_params_gazebo.yaml"/>
<rosparam command="load" file="$(find talos_roscontrol_sot_talos)/config/sot_talos_controller.yaml" /> <rosparam command="load" file="$(find roscontrol_sot_talos)/config/sot_talos_controller.yaml" />
<!-- Spawn walking controller --> <!-- Spawn walking controller -->
<node name="sot_controller_spawner" <node name="sot_controller_spawner"
pkg="talos_controller_manager" type="spawner" output="screen" pkg="controller_manager" type="spawner" output="screen"
args="sot_controller" /> args="sot_controller" />
</launch> </launch>
......
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