diff --git a/roscontrol_sot_talos/launch/sot_talos_controller_gazebo_effort.launch b/roscontrol_sot_talos/launch/sot_talos_controller_gazebo_effort.launch index 17d90171fd9862847e2b6498c8dd9f4223f77a12..c0603d7a803eade2164c03d9d1434e1ebef071bd 100644 --- a/roscontrol_sot_talos/launch/sot_talos_controller_gazebo_effort.launch +++ b/roscontrol_sot_talos/launch/sot_talos_controller_gazebo_effort.launch @@ -1,13 +1,13 @@ <launch> <!-- Sot Controller configuration --> - <rosparam command="load" file="$(find talos_roscontrol_sot_talos)/config/sot_talos_params_gazebo_effort.yaml"/> - <rosparam command="load" ns="/sot_controller/effort_control_pd_motor_init" file="$(find talos_hardware_gazebo)/config/pids.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_effort.yaml"/> + <rosparam command="load" ns="/sot_controller/effort_control_pd_motor_init" file="$(find hardware_gazebo)/config/pids.yaml"/> + <rosparam command="load" file="$(find roscontrol_sot_talos)/config/sot_talos_controller.yaml" /> <!-- Spawn sot 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> diff --git a/roscontrol_sot_talos/package.xml b/roscontrol_sot_talos/package.xml index 9074e626db2a2be0baa3117f42aa43a73827e9cd..ffbc4e46ade21dc8ae1f41139df272a5f6c1a995 100644 --- a/roscontrol_sot_talos/package.xml +++ b/roscontrol_sot_talos/package.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <package> - <name>talos_roscontrol_sot_talos</name> + <name>roscontrol_sot_talos</name> <version>0.0.7</version> <description>Wrapping Stack-of-tasks for Talos in ros-control</description> @@ -42,6 +42,7 @@ <build_depend>realtime_tools</build_depend> <build_depend>cmake_modules</build_depend> <build_depend>roscontrol_sot</build_depend> + <build_depend>controller_interface</build_depend> <run_depend>roscpp</run_depend> <run_depend>control_msgs</run_depend> @@ -51,5 +52,6 @@ <run_depend>std_msgs</run_depend> <run_depend>cmake_modules</run_depend> <run_depend>roscontrol_sot</run_depend> + <run_depend>controller_interface</run_depend> <!-- The export tag contains other, unspecified, tags --> </package>