Skip to main content
Sign in
Snippets Groups Projects
Commit c3a67e7c authored by Florian Walch's avatar Florian Walch
Browse files

Merge pull request #77 in SWDEV/franka_ros from remove-default-robot-ip to develop

* commit 'acf00b59':
  Bump version
  Remove default robot_ip from launchfiles
parents d29d459e acf00b59
Branches
No related tags found
No related merge requests found
Showing
with 22 additions and 20 deletions
# CHANGELOG # CHANGELOG
## 0.4.0 - UNRELEASED
* Removed default `robot_ip` from launchfiles
## 0.3.0 - 2018-02-22 ## 0.3.0 - 2018-02-22
Requires `libfranka` >= 0.3.0 Requires `libfranka` >= 0.3.0
... ...
......
...@@ -6,6 +6,4 @@ joint_names: ...@@ -6,6 +6,4 @@ joint_names:
- panda_joint5 - panda_joint5
- panda_joint6 - panda_joint6
- panda_joint7 - panda_joint7
arm_id: panda arm_id: panda
robot_ip: 127.0.0.1
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" default="panda" /> <arg name="arm_id" default="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
... ...
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>franka_control</name> <name>franka_control</name>
<version>0.3.0</version> <version>0.4.0</version>
<description>franka_control provides a hardware node to control a Franka Emika research robot</description> <description>franka_control provides a hardware node to control a Franka Emika research robot</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer> <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<license>Apache 2.0</license> <license>Apache 2.0</license>
... ...
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>franka_description</name> <name>franka_description</name>
<version>0.3.0</version> <version>0.4.0</version>
<description>franka_description contains URDF files and meshes of Franka Emika robots</description> <description>franka_description contains URDF files and meshes of Franka Emika robots</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer> <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<license>Apache 2.0</license> <license>Apache 2.0</license>
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" value="panda" /> <arg name="arm_id" value="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
<include file="$(find franka_control)/launch/franka_control.launch" > <include file="$(find franka_control)/launch/franka_control.launch" >
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" value="panda" /> <arg name="arm_id" value="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
<include file="$(find franka_control)/launch/franka_control.launch" > <include file="$(find franka_control)/launch/franka_control.launch" >
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" value="panda" /> <arg name="arm_id" value="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
<include file="$(find franka_control)/launch/franka_control.launch" > <include file="$(find franka_control)/launch/franka_control.launch" >
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" value="panda" /> <arg name="arm_id" value="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
<include file="$(find franka_control)/launch/franka_control.launch" > <include file="$(find franka_control)/launch/franka_control.launch" >
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" value="panda" /> <arg name="arm_id" value="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
<include file="$(find franka_control)/launch/franka_control.launch" > <include file="$(find franka_control)/launch/franka_control.launch" >
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" value="panda" /> <arg name="arm_id" value="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
<include file="$(find franka_control)/launch/franka_control.launch" > <include file="$(find franka_control)/launch/franka_control.launch" >
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" value="panda" /> <arg name="arm_id" value="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
<include file="$(find franka_control)/launch/franka_control.launch" > <include file="$(find franka_control)/launch/franka_control.launch" >
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" value="panda" /> <arg name="arm_id" value="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
<include file="$(find franka_control)/launch/franka_control.launch" > <include file="$(find franka_control)/launch/franka_control.launch" >
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" default="panda" /> <arg name="arm_id" default="panda" />
<arg name="load_gripper" default="true" /> <arg name="load_gripper" default="true" />
... ...
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>franka_example_controllers</name> <name>franka_example_controllers</name>
<version>0.3.0</version> <version>0.4.0</version>
<description>franka_example_controllers provides example code for controlling Franka Emika research robots with ros_control</description> <description>franka_example_controllers provides example code for controlling Franka Emika research robots with ros_control</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer> <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<license>Apache 2.0</license> <license>Apache 2.0</license>
... ...
......
<?xml version="1.0" ?> <?xml version="1.0" ?>
<launch> <launch>
<arg name="robot_ip" default="robot.franka.de" /> <arg name="robot_ip" />
<arg name="arm_id" default="panda" /> <arg name="arm_id" default="panda" />
<group ns="$(arg arm_id)"> <group ns="$(arg arm_id)">
<node name="franka_gripper_node" pkg="franka_gripper" type="franka_gripper_node" output="screen"> <node name="franka_gripper_node" pkg="franka_gripper" type="franka_gripper_node" output="screen">
... ...
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>franka_gripper</name> <name>franka_gripper</name>
<version>0.3.0</version> <version>0.4.0</version>
<description>This package implements the franka gripper of type Franka Hand for the use in ros</description> <description>This package implements the franka gripper of type Franka Hand for the use in ros</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer> <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<license>Apache 2.0</license> <license>Apache 2.0</license>
... ...
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>franka_hw</name> <name>franka_hw</name>
<version>0.3.0</version> <version>0.4.0</version>
<description>franka_hw provides hardware interfaces for using Franka Emika research robots with ros_control</description> <description>franka_hw provides hardware interfaces for using Franka Emika research robots with ros_control</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer> <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<license>Apache 2.0</license> <license>Apache 2.0</license>
... ...
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>franka_msgs</name> <name>franka_msgs</name>
<version>0.3.0</version> <version>0.4.0</version>
<description>franka_msgs provides messages specific to Franka Emika research robots</description> <description>franka_msgs provides messages specific to Franka Emika research robots</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer> <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<license>Apache 2.0</license> <license>Apache 2.0</license>
... ...
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="2"> <package format="2">
<name>franka_ros</name> <name>franka_ros</name>
<version>0.3.0</version> <version>0.4.0</version>
<description>franka_ros is a metapackage for all Franka Emika ROS packages</description> <description>franka_ros is a metapackage for all Franka Emika ROS packages</description>
<maintainer email="support@franka.de">Franka Emika GmbH</maintainer> <maintainer email="support@franka.de">Franka Emika GmbH</maintainer>
<license>Apache 2.0</license> <license>Apache 2.0</license>
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment