diff --git a/CMakeLists.txt b/CMakeLists.txt index ca30d0903056b9cd2f0ce63139d88c76fbdea45b..da5c99b354c37ab10f5838923a8f50bdbbce3cc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(model_car_control) +project(iri_model_car_control) ## Find catkin macros and libraries find_package(catkin REQUIRED) diff --git a/README.md b/README.md index 68033c53e7483b5ab53538a472e8bd0e180f581c..819231482e600e7474acf718921a20f3ce9d6955 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Description -The model_car_control project description +The iri_model_car_control project description # ROS Interface ### Topic publishers @@ -37,7 +37,7 @@ catkin_make - Standalone test - `roslaunch model_car_control test.launch` + `roslaunch iri_model_car_control test.launch` ## Disclaimer @@ -48,4 +48,4 @@ This package is distributed in the hope that it will be useful, but without any In no event unless required by applicable law the author will be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sustained by you or third parties or a failure of the program to operate with any other programs), even if the author has been advised of the possibility of such damages. -You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/> \ No newline at end of file +You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/> diff --git a/cfg/ModelCarControl.cfg b/cfg/ModelCarControl.cfg index 8ab66e65b7c9a17724ca0fa031526768d08c3c39..984ef73a15326241bd81955fee613513bdcfe2f5 100755 --- a/cfg/ModelCarControl.cfg +++ b/cfg/ModelCarControl.cfg @@ -31,7 +31,7 @@ # Author: -PACKAGE='model_car_control' +PACKAGE='iri_model_car_control' from dynamic_reconfigure.parameter_generator_catkin import * diff --git a/launch/node.launch b/launch/node.launch index d6f3d2ed60d139597d65f7dc6f19af2ae020ae04..a3b3c482f6586c66bd32fd15ce6c2accab69d5ea 100644 --- a/launch/node.launch +++ b/launch/node.launch @@ -4,14 +4,14 @@ <arg name="node_name" default="model_car_control"/> <arg name="output" default="screen"/> <arg name="launch_prefix" default=""/> - <arg name="config_file" default="$(find model_car_control)/config/params.yaml"/> + <arg name="config_file" default="$(find iri_model_car_control)/config/params.yaml"/> <arg name="cmd_vel_topic" default="/cmd_vel"/> <arg name="odom_topic" default="/odom"/> <arg name="control_topic" default="/control"/> <node name="$(arg node_name)" - pkg ="model_car_control" - type="model_car_control" + pkg ="iri_model_car_control" + type="iri_model_car_control" output="$(arg output)" launch-prefix="$(arg launch_prefix)"> <rosparam file="$(arg config_file)" command="load"/> diff --git a/launch/test.launch b/launch/test.launch index 6a056dae546fdd321e1ed216d96ef4fa8f708b4d..3f422a6654e788b3f3f6b9eff82350c9258a64df 100644 --- a/launch/test.launch +++ b/launch/test.launch @@ -4,13 +4,13 @@ <arg name="output" default="screen"/> <arg name="launch_prefix" default=""/> <arg name="dr" default="true"/> - <arg name="config_file" default="$(find model_car_control)/config/params.yaml"/> + <arg name="config_file" default="$(find iri_model_car_control)/config/params.yaml"/> <arg name="cmd_vel_topic" default="/cmd_vel"/> <arg name="odom_topic" default="/odom"/> <arg name="control_topic" default="/control"/> - <include file="$(find model_car_control)/launch/node.launch"> + <include file="$(find iri_model_car_control)/launch/node.launch"> <arg name="node_name" value="model_car_control"/> <arg name="output" value="$(arg output)"/> <arg name="launch_prefix" value="$(arg launch_prefix)"/> @@ -24,7 +24,7 @@ pkg ="rqt_reconfigure" type="rqt_reconfigure" if ="$(arg dr)" - args="model_car_control"> + args="iri_model_car_control"> </node> </launch> diff --git a/package.xml b/package.xml index 3e820a970d85ca62d93ae8fa8b2d9454ae2a6f16..08c414de1c233375e1322d8808a2032daaa0aacd 100644 --- a/package.xml +++ b/package.xml @@ -1,8 +1,8 @@ <?xml version="1.0"?> <package format="2"> - <name>model_car_control</name> + <name>iri_model_car_control</name> <version>0.0.0</version> - <description>The model_car_control package</description> + <description>The iri_model_car_control package</description> <!-- One maintainer tag required, multiple allowed, one person per tag --> <!-- Example: --> @@ -19,7 +19,7 @@ <!-- Url tags are optional, but multiple are allowed, one per tag --> <!-- Optional attribute type can be: website, bugtracker, or repository --> <!-- Example: --> - <!-- <url type="website">http://wiki.ros.org/model_car_control</url> --> + <!-- <url type="website">http://wiki.ros.org/iri_model_car_control</url> --> <!-- Author tags are optional, multiple are allowed, one per tag -->