diff --git a/CHANGELOG.md b/CHANGELOG.md index f1723150187846044a768f8c333735207620fd9a..8b13b4b63ec145d7ddce4c881b4993c8e98909b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 0.4.0 - UNRELEASED + + * Removed default `robot_ip` from launchfiles + ## 0.3.0 - 2018-02-22 Requires `libfranka` >= 0.3.0 diff --git a/franka_control/config/franka_control.yaml b/franka_control/config/franka_control.yaml index 52e2e2871912654af44dcecdd1f26c75401cd791..f61ffb3bdc9b221ce6ccbdac7d78bfc7e9d2eb76 100644 --- a/franka_control/config/franka_control.yaml +++ b/franka_control/config/franka_control.yaml @@ -6,6 +6,4 @@ joint_names: - panda_joint5 - panda_joint6 - panda_joint7 - arm_id: panda -robot_ip: 127.0.0.1 diff --git a/franka_control/launch/franka_control.launch b/franka_control/launch/franka_control.launch index 1b2fe028515f3a31e33037665c0e09f0020c99ae..536a3db16e1cb688420eb33e044a7c95a2ef9ff7 100644 --- a/franka_control/launch/franka_control.launch +++ b/franka_control/launch/franka_control.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" default="panda" /> <arg name="load_gripper" default="true" /> diff --git a/franka_example_controllers/launch/cartesian_impedance_example_controller.launch b/franka_example_controllers/launch/cartesian_impedance_example_controller.launch index a1417a072444683c39a080d544f7d480a0d6c196..d144a7c46a4c56b91181d883c1d62b6468e6b4e2 100644 --- a/franka_example_controllers/launch/cartesian_impedance_example_controller.launch +++ b/franka_example_controllers/launch/cartesian_impedance_example_controller.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" value="panda" /> <arg name="load_gripper" default="true" /> <include file="$(find franka_control)/launch/franka_control.launch" > diff --git a/franka_example_controllers/launch/cartesian_pose_example_controller.launch b/franka_example_controllers/launch/cartesian_pose_example_controller.launch index ddc2184e303c2e78c77d9427664fd77471a96c11..d21eefd4e4b417be69a8406d552489029d4e11b9 100644 --- a/franka_example_controllers/launch/cartesian_pose_example_controller.launch +++ b/franka_example_controllers/launch/cartesian_pose_example_controller.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" value="panda" /> <arg name="load_gripper" default="true" /> <include file="$(find franka_control)/launch/franka_control.launch" > diff --git a/franka_example_controllers/launch/cartesian_velocity_example_controller.launch b/franka_example_controllers/launch/cartesian_velocity_example_controller.launch index e1df8cda955ea91ac9039aaeaa03be94ba3b5662..baec6d69d6939007525bf53abac120823dc56611 100644 --- a/franka_example_controllers/launch/cartesian_velocity_example_controller.launch +++ b/franka_example_controllers/launch/cartesian_velocity_example_controller.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" value="panda" /> <arg name="load_gripper" default="true" /> <include file="$(find franka_control)/launch/franka_control.launch" > diff --git a/franka_example_controllers/launch/force_example_controller.launch b/franka_example_controllers/launch/force_example_controller.launch index 0187bbda9c8e5f501cab2865a6a4f69a9e73e652..c46ca4e50126280217983815c6e2c383eebf318a 100644 --- a/franka_example_controllers/launch/force_example_controller.launch +++ b/franka_example_controllers/launch/force_example_controller.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" value="panda" /> <arg name="load_gripper" default="true" /> <include file="$(find franka_control)/launch/franka_control.launch" > diff --git a/franka_example_controllers/launch/joint_impedance_example_controller.launch b/franka_example_controllers/launch/joint_impedance_example_controller.launch index 310789644061dd75835a0bb3083f557d6c590d5e..5238e0effbe0d6dfd354e4c74c11856025d41fd2 100644 --- a/franka_example_controllers/launch/joint_impedance_example_controller.launch +++ b/franka_example_controllers/launch/joint_impedance_example_controller.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" value="panda" /> <arg name="load_gripper" default="true" /> <include file="$(find franka_control)/launch/franka_control.launch" > diff --git a/franka_example_controllers/launch/joint_position_example_controller.launch b/franka_example_controllers/launch/joint_position_example_controller.launch index f68b812fd0f15632c725d6966f7eed466f96bc42..3fd04458309f07e93597fc5ca761ac8f2999921f 100644 --- a/franka_example_controllers/launch/joint_position_example_controller.launch +++ b/franka_example_controllers/launch/joint_position_example_controller.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" value="panda" /> <arg name="load_gripper" default="true" /> <include file="$(find franka_control)/launch/franka_control.launch" > diff --git a/franka_example_controllers/launch/joint_velocity_example_controller.launch b/franka_example_controllers/launch/joint_velocity_example_controller.launch index ed8925f19d5cd321226ece8a08261642912aeaed..bbab9a104f60bc34941bc15dabccb3b4cd3f94f7 100644 --- a/franka_example_controllers/launch/joint_velocity_example_controller.launch +++ b/franka_example_controllers/launch/joint_velocity_example_controller.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" value="panda" /> <arg name="load_gripper" default="true" /> <include file="$(find franka_control)/launch/franka_control.launch" > diff --git a/franka_example_controllers/launch/model_example_controller.launch b/franka_example_controllers/launch/model_example_controller.launch index e7475bdc480adac14f423c07015af6eb268dc772..459372655db45567dff4cbd1b99a0c7b66c49ed5 100644 --- a/franka_example_controllers/launch/model_example_controller.launch +++ b/franka_example_controllers/launch/model_example_controller.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" value="panda" /> <arg name="load_gripper" default="true" /> <include file="$(find franka_control)/launch/franka_control.launch" > diff --git a/franka_example_controllers/launch/move_to_start.launch b/franka_example_controllers/launch/move_to_start.launch index ed8accb2b7fd8bc9d4e7636b08fc210e5c2f7601..b7032a3f183d287833d5a93eb7b3110412768d37 100644 --- a/franka_example_controllers/launch/move_to_start.launch +++ b/franka_example_controllers/launch/move_to_start.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" default="panda" /> <arg name="load_gripper" default="true" /> diff --git a/franka_gripper/launch/franka_gripper.launch b/franka_gripper/launch/franka_gripper.launch index d990574d4c8511c770b9612fe60a074a25fbb1ad..cf3c53f0ab37eb9e860c80d1f228bbd6f7905c7f 100644 --- a/franka_gripper/launch/franka_gripper.launch +++ b/franka_gripper/launch/franka_gripper.launch @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <launch> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="arm_id" default="panda" /> <group ns="$(arg arm_id)"> <node name="franka_gripper_node" pkg="franka_gripper" type="franka_gripper_node" output="screen"> diff --git a/franka_visualization/launch/franka_visualization.launch b/franka_visualization/launch/franka_visualization.launch index a713f4fd5963bbe88cad4a795130220b08ab10d0..99410e4aee2e86a5b4b6f107739441a6a8b52037 100644 --- a/franka_visualization/launch/franka_visualization.launch +++ b/franka_visualization/launch/franka_visualization.launch @@ -2,7 +2,7 @@ <launch> <arg name="load_gripper" default="true" /> - <arg name="robot_ip" default="robot.franka.de" /> + <arg name="robot_ip" /> <arg name="publish_rate" default="30" /> <param unless="$(arg load_gripper)" name="robot_description" command="$(find xacro)/xacro --inorder $(find franka_description)/robots/panda_arm.urdf.xacro" />