Skip to content

Commit

Permalink
Fix naming
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Nagel committed Sep 15, 2017
1 parent e6ac34e commit 7a0b3c0
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 31 deletions.
18 changes: 13 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion franka_control/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
6 changes: 3 additions & 3 deletions franka_control/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]">FRANKA EMIKA Research Interface Team</maintainer>
<description>franka_control provides a hardware node to control a Franka Emika research robot</description>
<maintainer email="[email protected]">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>

Expand Down
2 changes: 1 addition & 1 deletion franka_example_controllers/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
4 changes: 2 additions & 2 deletions franka_example_controllers/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<name>franka_example_controllers</name>
<version>0.0.1</version>
<description>The franka_example_controllers package</description>
<maintainer email="[email protected]">FRANKA EMIKA Research Interface Team</maintainer>
<maintainer email="[email protected]">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>

Expand Down
2 changes: 1 addition & 1 deletion franka_gripper/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
4 changes: 2 additions & 2 deletions franka_gripper/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]">FRANKA EMIKA Research Interface Team</maintainer>
<maintainer email="[email protected]">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>

Expand Down
2 changes: 1 addition & 1 deletion franka_hw/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
6 changes: 3 additions & 3 deletions franka_hw/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]">FRANKA EMIKA Research Interface Team</maintainer>
<description>franka_hw provides hardware interfaces for using Franka Emika research robots with ros_control</description>
<maintainer email="[email protected]">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>

Expand Down
2 changes: 1 addition & 1 deletion franka_msgs/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
6 changes: 3 additions & 3 deletions franka_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]">FRANKA EMIKA Research Interface Team</maintainer>
<description>franka_msgs provides messages specific to Franka Emika research robots</description>
<maintainer email="[email protected]">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>

Expand Down
2 changes: 1 addition & 1 deletion franka_ros/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
2 changes: 1 addition & 1 deletion franka_visualization/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
6 changes: 3 additions & 3 deletions franka_visualization/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]">FRANKA EMIKA Research Interface Team</maintainer>
<description>This package contains visualization tools for Franka Emika.</description>
<maintainer email="[email protected]">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>

Expand Down
2 changes: 1 addition & 1 deletion panda_moveit_config/mainpage.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
4 changes: 2 additions & 2 deletions panda_moveit_config/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]">FRANKA EMIKA Research Interface Team</maintainer>
<maintainer email="[email protected]">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>

Expand Down

0 comments on commit 7a0b3c0

Please sign in to comment.