From 7a0b3c0950f69d8a72b56df29b371c780010d22d Mon Sep 17 00:00:00 2001 From: Sebastian Nagel <sebastian.nagel@franka.de> Date: Fri, 15 Sep 2017 23:25:43 +0200 Subject: [PATCH] Fix naming --- README.md | 18 +++++++++++++----- franka_control/mainpage.dox | 2 +- franka_control/package.xml | 6 +++--- franka_example_controllers/mainpage.dox | 2 +- franka_example_controllers/package.xml | 4 ++-- franka_gripper/mainpage.dox | 2 +- franka_gripper/package.xml | 4 ++-- franka_hw/mainpage.dox | 2 +- franka_hw/package.xml | 6 +++--- franka_msgs/mainpage.dox | 2 +- franka_msgs/package.xml | 6 +++--- franka_ros/mainpage.dox | 2 +- franka_visualization/mainpage.dox | 2 +- franka_visualization/package.xml | 6 +++--- panda_moveit_config/mainpage.dox | 2 +- panda_moveit_config/package.xml | 4 ++-- 16 files changed, 39 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 2418d29..17face7 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,25 @@ -# ROS integration for FRANKA EMIKA research robots +# ROS integration for Franka Emika research robots -See the [FRANKA Control Interface documentation][fci-docs] for more information. +See the [Franka Control Interface (FCI) documentation][fci-docs] for more information. ## MoveIt! quickstart for Panda research 1. Launch the joint trajectory controller - roslaunch franka_control franka_control.launch robot_ip:=<ip> +``` +roslaunch franka_control franka_control.launch robot_ip:=<ip> +``` 2. Launch MoveIt! - roslaunch panda_moveit_config panda_moveit.launch +``` +roslaunch panda_moveit_config panda_moveit.launch +``` 3. Launch RViz - roslaunch panda_moveit_config moveit_rviz.launch +``` +roslaunch panda_moveit_config moveit_rviz.launch +``` + +[fci-docs]: https://frankaemika.github.io/docs diff --git a/franka_control/mainpage.dox b/franka_control/mainpage.dox index 5b0dc0a..941d0bf 100644 --- a/franka_control/mainpage.dox +++ b/franka_control/mainpage.dox @@ -2,5 +2,5 @@ * @mainpage * @htmlinclude "manifest.html" * - * Overview page for FRANKA EMIKA research robots: https://frankaemika.github.io + * Overview page for Franka Emika research robots: https://frankaemika.github.io */ diff --git a/franka_control/package.xml b/franka_control/package.xml index 636e596..69e6421 100644 --- a/franka_control/package.xml +++ b/franka_control/package.xml @@ -2,14 +2,14 @@ <package format="2"> <name>franka_control</name> <version>0.0.1</version> - <description>franka_control provides a hardware node to control a FRANKA EMIKA research robot</description> - <maintainer email="info@franka.de">FRANKA EMIKA Research Interface Team</maintainer> + <description>franka_control provides a hardware node to control a Franka Emika research robot</description> + <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>NONE</license> <url type="website">http://wiki.ros.org/franka_control</url> <url type="repository">https://github.com/frankaemika/franka_ros</url> <url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url> - <author>FRANKA EMIKA Research Interface Team</author> + <author>Franka Emika GmbH</author> <buildtool_depend>catkin</buildtool_depend> diff --git a/franka_example_controllers/mainpage.dox b/franka_example_controllers/mainpage.dox index 5b0dc0a..941d0bf 100644 --- a/franka_example_controllers/mainpage.dox +++ b/franka_example_controllers/mainpage.dox @@ -2,5 +2,5 @@ * @mainpage * @htmlinclude "manifest.html" * - * Overview page for FRANKA EMIKA research robots: https://frankaemika.github.io + * Overview page for Franka Emika research robots: https://frankaemika.github.io */ diff --git a/franka_example_controllers/package.xml b/franka_example_controllers/package.xml index 130286a..49f5a21 100644 --- a/franka_example_controllers/package.xml +++ b/franka_example_controllers/package.xml @@ -3,13 +3,13 @@ <name>franka_example_controllers</name> <version>0.0.1</version> <description>The franka_example_controllers package</description> - <maintainer email="info@franka.de">FRANKA EMIKA Research Interface Team</maintainer> + <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>NONE</license> <url type="website">http://wiki.ros.org/franka_example_controllers</url> <url type="repository">https://github.com/frankaemika/franka_ros</url> <url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url> - <author>FRANKA EMIKA Research Interface Team</author> + <author>Franka Emika GmbH</author> <buildtool_depend>catkin</buildtool_depend> diff --git a/franka_gripper/mainpage.dox b/franka_gripper/mainpage.dox index 5b0dc0a..941d0bf 100644 --- a/franka_gripper/mainpage.dox +++ b/franka_gripper/mainpage.dox @@ -2,5 +2,5 @@ * @mainpage * @htmlinclude "manifest.html" * - * Overview page for FRANKA EMIKA research robots: https://frankaemika.github.io + * Overview page for Franka Emika research robots: https://frankaemika.github.io */ diff --git a/franka_gripper/package.xml b/franka_gripper/package.xml index b37053f..3ba378b 100644 --- a/franka_gripper/package.xml +++ b/franka_gripper/package.xml @@ -3,13 +3,13 @@ <name>franka_gripper</name> <version>0.0.1</version> <description>This package implements the franka gripper of type Franka Hand for the use in ros</description> - <maintainer email="info@franka.de">FRANKA EMIKA Research Interface Team</maintainer> + <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>NONE</license> <url type="website">http://wiki.ros.org/franka_gripper</url> <url type="repository">https://github.com/frankaemika/franka_ros</url> <url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url> - <author>FRANKA EMIKA Research Interface Team</author> + <author>Franka Emika GmbH</author> <buildtool_depend>catkin</buildtool_depend> diff --git a/franka_hw/mainpage.dox b/franka_hw/mainpage.dox index 5b0dc0a..941d0bf 100644 --- a/franka_hw/mainpage.dox +++ b/franka_hw/mainpage.dox @@ -2,5 +2,5 @@ * @mainpage * @htmlinclude "manifest.html" * - * Overview page for FRANKA EMIKA research robots: https://frankaemika.github.io + * Overview page for Franka Emika research robots: https://frankaemika.github.io */ diff --git a/franka_hw/package.xml b/franka_hw/package.xml index afbc4db..23a6a3e 100644 --- a/franka_hw/package.xml +++ b/franka_hw/package.xml @@ -2,14 +2,14 @@ <package format="2"> <name>franka_hw</name> <version>0.0.1</version> - <description>franka_hw provides hardware interfaces for using FRANKA EMIKA research robots with ros_control</description> - <maintainer email="info@franka.de">FRANKA EMIKA Research Interface Team</maintainer> + <description>franka_hw provides hardware interfaces for using Franka Emika research robots with ros_control</description> + <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>NONE</license> <url type="website">http://wiki.ros.org/franka_hw</url> <url type="repository">https://github.com/frankaemika/franka_ros</url> <url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url> - <author>FRANKA EMIKA Research Interface Team</author> + <author>Franka Emika GmbH</author> <buildtool_depend>catkin</buildtool_depend> diff --git a/franka_msgs/mainpage.dox b/franka_msgs/mainpage.dox index 5b0dc0a..941d0bf 100644 --- a/franka_msgs/mainpage.dox +++ b/franka_msgs/mainpage.dox @@ -2,5 +2,5 @@ * @mainpage * @htmlinclude "manifest.html" * - * Overview page for FRANKA EMIKA research robots: https://frankaemika.github.io + * Overview page for Franka Emika research robots: https://frankaemika.github.io */ diff --git a/franka_msgs/package.xml b/franka_msgs/package.xml index 9cc1bbf..efe8ee5 100644 --- a/franka_msgs/package.xml +++ b/franka_msgs/package.xml @@ -2,14 +2,14 @@ <package format="2"> <name>franka_msgs</name> <version>0.0.1</version> - <description>franka_msgs provides messages specific to FRANKA EMIKA research robots</description> - <maintainer email="info@franka.de">FRANKA EMIKA Research Interface Team</maintainer> + <description>franka_msgs provides messages specific to Franka Emika research robots</description> + <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>NONE</license> <url type="website">http://wiki.ros.org/franka_msgs</url> <url type="repository">https://github.com/frankaemika/franka_ros</url> <url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url> - <author>FRANKA EMIKA Research Interface Team</author> + <author>Franka Emika GmbH</author> <buildtool_depend>catkin</buildtool_depend> diff --git a/franka_ros/mainpage.dox b/franka_ros/mainpage.dox index 5b0dc0a..941d0bf 100644 --- a/franka_ros/mainpage.dox +++ b/franka_ros/mainpage.dox @@ -2,5 +2,5 @@ * @mainpage * @htmlinclude "manifest.html" * - * Overview page for FRANKA EMIKA research robots: https://frankaemika.github.io + * Overview page for Franka Emika research robots: https://frankaemika.github.io */ diff --git a/franka_visualization/mainpage.dox b/franka_visualization/mainpage.dox index 5b0dc0a..941d0bf 100644 --- a/franka_visualization/mainpage.dox +++ b/franka_visualization/mainpage.dox @@ -2,5 +2,5 @@ * @mainpage * @htmlinclude "manifest.html" * - * Overview page for FRANKA EMIKA research robots: https://frankaemika.github.io + * Overview page for Franka Emika research robots: https://frankaemika.github.io */ diff --git a/franka_visualization/package.xml b/franka_visualization/package.xml index 24ff6b0..db4aef4 100644 --- a/franka_visualization/package.xml +++ b/franka_visualization/package.xml @@ -2,14 +2,14 @@ <package format="2"> <name>franka_visualization</name> <version>0.0.1</version> - <description>This package contains visualization tools for FRANKA EMIKA.</description> - <maintainer email="info@franka.de">FRANKA EMIKA Research Interface Team</maintainer> + <description>This package contains visualization tools for Franka Emika.</description> + <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>NONE</license> <url type="website">http://wiki.ros.org/franka_visualization</url> <url type="repository">https://github.com/frankaemika/franka_ros</url> <url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url> - <author>FRANKA EMIKA Research Interface Team</author> + <author>Franka Emika GmbH</author> <buildtool_depend>catkin</buildtool_depend> diff --git a/panda_moveit_config/mainpage.dox b/panda_moveit_config/mainpage.dox index 5b0dc0a..941d0bf 100644 --- a/panda_moveit_config/mainpage.dox +++ b/panda_moveit_config/mainpage.dox @@ -2,5 +2,5 @@ * @mainpage * @htmlinclude "manifest.html" * - * Overview page for FRANKA EMIKA research robots: https://frankaemika.github.io + * Overview page for Franka Emika research robots: https://frankaemika.github.io */ diff --git a/panda_moveit_config/package.xml b/panda_moveit_config/package.xml index 0d07bf3..6c026ae 100644 --- a/panda_moveit_config/package.xml +++ b/panda_moveit_config/package.xml @@ -3,13 +3,13 @@ <name>panda_moveit_config</name> <version>0.0.1</version> <description> A partly automatically generated package with all the configuration and launch files for using Panda research with MoveIt!</description> - <maintainer email="info@franka.de">FRANKA EMIKA Research Interface Team</maintainer> + <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>NONE</license> <url type="website">http://wiki.ros.org/panda_moveit_config</url> <url type="repository">https://github.com/frankaemika/franka_ros</url> <url type="bugtracker">https://github.com/frankaemika/franka_ros/issues</url> - <author>FRANKA EMIKA Research Interface Team</author> + <author>Franka Emika GmbH</author> <buildtool_depend>catkin</buildtool_depend> -- GitLab