From f6b52c3d294116baa33b4df98604166365692325 Mon Sep 17 00:00:00 2001 From: Felix Mauch Date: Mon, 30 Sep 2019 09:23:08 +0200 Subject: [PATCH] Documented launch files --- .../ur_rtde_driver/ros/hardware_interface.h | 1 + ur_rtde_driver/launch/ur10_bringup.launch | 21 +++++----- ur_rtde_driver/launch/ur10e_bringup.launch | 37 +++++++++--------- ur_rtde_driver/launch/ur3_bringup.launch | 21 +++++----- ur_rtde_driver/launch/ur3e_bringup.launch | 39 +++++++++---------- ur_rtde_driver/launch/ur5_bringup.launch | 21 +++++----- ur_rtde_driver/launch/ur5e_bringup.launch | 39 +++++++++---------- ur_rtde_driver/launch/ur_common.launch | 36 ++++++++--------- ur_rtde_driver/launch/ur_control.launch | 38 +++++++++--------- ur_rtde_driver/src/ros/hardware_interface.cpp | 8 ++-- 10 files changed, 124 insertions(+), 137 deletions(-) diff --git a/ur_rtde_driver/include/ur_rtde_driver/ros/hardware_interface.h b/ur_rtde_driver/include/ur_rtde_driver/ros/hardware_interface.h index f481b28..8ef0a80 100644 --- a/ur_rtde_driver/include/ur_rtde_driver/ros/hardware_interface.h +++ b/ur_rtde_driver/include/ur_rtde_driver/ros/hardware_interface.h @@ -245,6 +245,7 @@ protected: bool controllers_initialized_; std::string robot_ip_; + std::string tf_prefix_; }; } // namespace ur_driver diff --git a/ur_rtde_driver/launch/ur10_bringup.launch b/ur_rtde_driver/launch/ur10_bringup.launch index a450465..6111d51 100644 --- a/ur_rtde_driver/launch/ur10_bringup.launch +++ b/ur_rtde_driver/launch/ur10_bringup.launch @@ -1,17 +1,14 @@ - - - - - - - - - - - - + + + + + + + + + diff --git a/ur_rtde_driver/launch/ur10e_bringup.launch b/ur_rtde_driver/launch/ur10e_bringup.launch index bd8da33..feb898b 100644 --- a/ur_rtde_driver/launch/ur10e_bringup.launch +++ b/ur_rtde_driver/launch/ur10e_bringup.launch @@ -1,26 +1,25 @@ - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - diff --git a/ur_rtde_driver/launch/ur3_bringup.launch b/ur_rtde_driver/launch/ur3_bringup.launch index e31ddf3..05cbbbb 100644 --- a/ur_rtde_driver/launch/ur3_bringup.launch +++ b/ur_rtde_driver/launch/ur3_bringup.launch @@ -1,17 +1,14 @@ - - - - - - - - - - - - + + + + + + + + + diff --git a/ur_rtde_driver/launch/ur3e_bringup.launch b/ur_rtde_driver/launch/ur3e_bringup.launch index 3588a20..feb5dcd 100644 --- a/ur_rtde_driver/launch/ur3e_bringup.launch +++ b/ur_rtde_driver/launch/ur3e_bringup.launch @@ -1,26 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/ur_rtde_driver/launch/ur5_bringup.launch b/ur_rtde_driver/launch/ur5_bringup.launch index dd71af6..fb292e6 100644 --- a/ur_rtde_driver/launch/ur5_bringup.launch +++ b/ur_rtde_driver/launch/ur5_bringup.launch @@ -1,17 +1,14 @@ - - - - - - - - - - - - + + + + + + + + + diff --git a/ur_rtde_driver/launch/ur5e_bringup.launch b/ur_rtde_driver/launch/ur5e_bringup.launch index f324d0e..f2326b5 100644 --- a/ur_rtde_driver/launch/ur5e_bringup.launch +++ b/ur_rtde_driver/launch/ur5e_bringup.launch @@ -1,26 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/ur_rtde_driver/launch/ur_common.launch b/ur_rtde_driver/launch/ur_common.launch index f54d992..76e03f1 100644 --- a/ur_rtde_driver/launch/ur_common.launch +++ b/ur_rtde_driver/launch/ur_common.launch @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/ur_rtde_driver/launch/ur_control.launch b/ur_rtde_driver/launch/ur_control.launch index e8b8646..9da4898 100644 --- a/ur_rtde_driver/launch/ur_control.launch +++ b/ur_rtde_driver/launch/ur_control.launch @@ -2,28 +2,28 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/ur_rtde_driver/src/ros/hardware_interface.cpp b/ur_rtde_driver/src/ros/hardware_interface.cpp index 81a17a1..2cab893 100644 --- a/ur_rtde_driver/src/ros/hardware_interface.cpp +++ b/ur_rtde_driver/src/ros/hardware_interface.cpp @@ -64,6 +64,8 @@ bool HardwareInterface ::init(ros::NodeHandle& root_nh, ros::NodeHandle& robot_h return false; } + robot_hw_nh.param("tf_prefix", tf_prefix_, ""); + // Path to the urscript code that will be sent to the robot. This is a required parameter. if (!robot_hw_nh.getParam("script_file", script_filename)) { @@ -91,8 +93,8 @@ bool HardwareInterface ::init(ros::NodeHandle& root_nh, ros::NodeHandle& robot_h // message gets published here. So this is equivalent to the information whether the robot accepts // commands from ROS side. program_state_pub_ = robot_hw_nh.advertise("robot_program_running", 10, true); - tcp_transform_.header.frame_id = "base"; - tcp_transform_.child_frame_id = "tool0_controller"; + tcp_transform_.header.frame_id = tf_prefix_ + "base"; + tcp_transform_.child_frame_id = tf_prefix_ + "tool0_controller"; // Should the tool's RS485 interface be forwarded to the ROS machine? This is only available on // e-Series models. Setting this parameter to TRUE requires multiple other parameters to be set,as @@ -244,7 +246,7 @@ bool HardwareInterface ::init(ros::NodeHandle& root_nh, ros::NodeHandle& robot_h ur_controllers::SpeedScalingHandle("speed_scaling_factor", &speed_scaling_combined_)); fts_interface_.registerHandle(hardware_interface::ForceTorqueSensorHandle( - "wrench", "tool0_controller", fts_measurements_.begin(), fts_measurements_.begin() + 3)); + "wrench", tf_prefix_ + "tool0_controller", fts_measurements_.begin(), fts_measurements_.begin() + 3)); // Register interfaces registerInterface(&js_interface_);