From 9aeb53c0f8fb2b6e7dd51cf4012204dc8b1154a1 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 7 May 2018 13:53:13 +0200
Subject: [PATCH] [roscontrol_sot_talos] Fix talos_ prefix
---
roscontrol_sot_talos/CMakeLists.txt | 4 ++--
.../launch/sot_talos_controller_effort.launch | 6 +++---
.../launch/sot_talos_controller_gazebo.launch | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/roscontrol_sot_talos/CMakeLists.txt b/roscontrol_sot_talos/CMakeLists.txt
index 3600b5a..ad93878 100644
--- a/roscontrol_sot_talos/CMakeLists.txt
+++ b/roscontrol_sot_talos/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
-project(talos_roscontrol_sot_talos)
+project(roscontrol_sot_talos)
find_package(PkgConfig REQUIRED)
@@ -35,7 +35,7 @@ catkin_package()
# include_directories(include)
include_directories(
${catkin_INCLUDE_DIRS}
- )
+)
## Add cmake target dependencies of the executable
diff --git a/roscontrol_sot_talos/launch/sot_talos_controller_effort.launch b/roscontrol_sot_talos/launch/sot_talos_controller_effort.launch
index 3930105..50760de 100644
--- a/roscontrol_sot_talos/launch/sot_talos_controller_effort.launch
+++ b/roscontrol_sot_talos/launch/sot_talos_controller_effort.launch
@@ -1,9 +1,9 @@
<launch>
<!-- Sot Controller configuration -->
- <rosparam command="load" file="$(find talos_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 talos_roscontrol_sot_talos)/config/pids.yaml" />
+ <rosparam command="load" file="$(find roscontrol_sot_talos)/config/sot_talos_params_effort.yaml"/>
+ <rosparam command="load" file="$(find roscontrol_sot_talos)/config/sot_talos_controller.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" />
<!-- Spawn walking controller -->
diff --git a/roscontrol_sot_talos/launch/sot_talos_controller_gazebo.launch b/roscontrol_sot_talos/launch/sot_talos_controller_gazebo.launch
index c141507..eba7749 100644
--- a/roscontrol_sot_talos/launch/sot_talos_controller_gazebo.launch
+++ b/roscontrol_sot_talos/launch/sot_talos_controller_gazebo.launch
@@ -1,12 +1,12 @@
<launch>
<!-- Sot Controller configuration -->
- <rosparam command="load" file="$(find talos_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_params_gazebo.yaml"/>
+ <rosparam command="load" file="$(find roscontrol_sot_talos)/config/sot_talos_controller.yaml" />
<!-- Spawn walking controller -->
<node name="sot_controller_spawner"
- pkg="talos_controller_manager" type="spawner" output="screen"
+ pkg="controller_manager" type="spawner" output="screen"
args="sot_controller" />
</launch>
--
GitLab